🧑‍💻 Py scripts refinements

buildroot/share/scripts/languageExport.py

@@ -17,7 +17,7 @@ LANGHOME = "Marlin/src/lcd/language"
 
 # Write multiple sheets if true, otherwise write one giant sheet
 MULTISHEET = '--single' not in argv[1:]
-OUTDIR = 'out-csv'
+OUTDIR = Path('out-csv')
 
 # Check for the path to the language files
 if not Path(LANGHOME).is_dir():
@@ -125,10 +125,10 @@ if MULTISHEET:
     #
     # Export a separate sheet for each language
     #
-    Path.mkdir(Path(OUTDIR), exist_ok=True)
+    OUTDIR.mkdir(exist_ok=True)
 
     for lang in langcodes:
-        with open("%s/language_%s.csv" % (OUTDIR, lang), 'w', encoding='utf-8') as f:
+        with open(OUTDIR / f"language_{lang}.csv", 'w', encoding='utf-8') as f:
             lname = lang + ' ' + namebyid(lang)
             header = ['name', lname, lname + ' (wide)', lname + ' (tall)']
             f.write('"' + '","'.join(header) + '"\n')

buildroot/share/scripts/languageImport.py

@@ -18,9 +18,10 @@ TODO: Use the defines and comments above the namespace from existing language fi
 
 import sys, re, requests, csv, datetime
 #from languageUtil import namebyid
+from pathlib import Path
 
 LANGHOME = "Marlin/src/lcd/language"
-OUTDIR = 'out-language'
+OUTDIR = Path('out-language')
 
 # Get the file path from the command line
 FILEPATH = sys.argv[1] if len(sys.argv) > 1 else None
@@ -51,7 +52,7 @@ if download:
     exit(0)
 
 lines = csvdata.splitlines()
-print(lines)
+#print(lines)
 reader = csv.reader(lines, delimiter=',')
 gothead = False
 columns = ['']
@@ -82,8 +83,7 @@ for row in reader:
             strings_per_lang[col['lang']][col['style']][name] = str_key
 
 # Create a folder for the imported language outfiles
-from pathlib import Path
-Path.mkdir(Path(OUTDIR), exist_ok=True)
+OUTDIR.mkdir(exist_ok=True)
 
 FILEHEADER = '''
 /**
@@ -142,8 +142,8 @@ for i in range(1, numcols):
     if not lang in gotlang:
         gotlang[lang] = {}
         if f: f.close()
-        fn = "%s/language_%s.h" % (OUTDIR, lang)
-        f = open(fn, 'w', encoding='utf-8')
+        fn = OUTDIR / f"language_{lang}.h"
+        f = open(fn, 'w', encoding='utf-8', newline='')
         if not f:
             print("Failed to open %s." % fn)
             exit(1)
@@ -199,9 +199,9 @@ for i in range(1, numcols):
         comm = ''
         if lang != 'en' and 'en' in strings_per_lang:
             en = strings_per_lang['en']
-            if name in en[style]: str_key = en[style][name]
-            elif name in en['Narrow']: str_key = en['Narrow'][name]
-            if str_key:
+            if name in en[style]: str_key = en[style][name].strip()
+            elif name in en['Narrow']: str_key = en['Narrow'][name].strip()
+            if str_key and str_key != "English":
                 cfmt = '%%%ss// %%s' % (50 - len(val) if len(val) < 50 else 1)
                 comm = cfmt % (' ', str_key)
 

buildroot/share/scripts/linesformat.py

@@ -51,7 +51,8 @@ def format_text(argv):
             return
 
         # Open and read the file src_file
-        with open(src_file, 'r', encoding='utf-8') as rf: file_text = rf.read()
+        with open(src_file, 'r', encoding='utf-8') as rf:
+            file_text = rf.read()
 
     if len(file_text) == 0:
         print('No text to process')
@@ -60,7 +61,8 @@ def format_text(argv):
     # Read from file or STDIN until it terminates
     filtered = re.sub(r'\s+$', '', file_text) + '\n'
     if dst_file:
-        with open(dst_file, 'w', encoding='utf-8') as wf: wf.write(filtered)
+        with open(dst_file, 'w', encoding='utf-8', newline='') as wf:
+            wf.write(filtered)
     else:
         print(filtered)