diff --git a/find_dart_files.py b/find_dart_files.py index a182daaa..e71babd5 100644 --- a/find_dart_files.py +++ b/find_dart_files.py @@ -10,18 +10,16 @@ Ref: https://github.com/flutter/flutter/issues/27997 from pathlib import Path -if __name__ == '__main__': - - dart_files = Path('lib').rglob('*.dart') +if __name__ == "__main__": + dart_files = Path("lib").rglob("*.dart") with open("test/coverage_helper_test.dart", "w") as f: - f.write("// ignore_for_file: unused_import\n\n") skips = [ - 'generated', - 'l10n', - 'dsn.dart', + "generated", + "l10n", + "dsn.dart", ] for path in dart_files: @@ -32,15 +30,18 @@ if __name__ == '__main__': # Remove leading 'lib\' text path = path[4:] - path = path.replace('\\', '/') + path = path.replace("\\", "/") f.write(f'import "package:inventree/{path}";\n') f.write("\n\n") - f.write("// DO NOT EDIT THIS FILE - it has been auto-generated by 'find_dart_files.py'\n") - f.write("// It has been created to ensure that *all* source file are included in coverage data\n") - - f.write('import "package:test/test.dart";\n\n'); + f.write( + "// DO NOT EDIT THIS FILE - it has been auto-generated by 'find_dart_files.py'\n" + ) + f.write( + "// It has been created to ensure that *all* source file are included in coverage data\n" + ) + f.write('import "package:test/test.dart";\n\n') f.write("// Do not actually test anything!\n") f.write("void main() {}\n") diff --git a/lib/l10n/collect_translations.py b/lib/l10n/collect_translations.py index 03148a69..a768632b 100644 --- a/lib/l10n/collect_translations.py +++ b/lib/l10n/collect_translations.py @@ -16,6 +16,7 @@ from posixpath import dirname import shutil import re + def process_locale_file(filename, locale_name): """ Process a locale file after copying @@ -26,21 +27,20 @@ def process_locale_file(filename, locale_name): # TODO: Use JSON processing instead of manual # Need to work out unicode issues for this to work - with open(filename, 'r', encoding='utf-8') as input_file: - + with open(filename, "r", encoding="utf-8") as input_file: lines = input_file.readlines() - with open(filename, 'w', encoding='utf-8') as output_file: + with open(filename, "w", encoding="utf-8") as output_file: # Using JSON processing would be simpler here, # but it does not preserve unicode data! for line in lines: - if '@@locale' in line: + if "@@locale" in line: new_line = f' "@@locale": "{locale_name}"' - if ',' in line: - new_line += ',' - - new_line += '\n' + if "," in line: + new_line += "," + + new_line += "\n" line = new_line @@ -55,12 +55,10 @@ def copy_locale_file(path): here = os.path.abspath(os.path.dirname(__file__)) for f in os.listdir(path): - src = os.path.join(path, f) - dst = os.path.join(here, 'collected', f) - - if os.path.exists(src) and os.path.isfile(src) and f.endswith('.arb'): + dst = os.path.join(here, "collected", f) + if os.path.exists(src) and os.path.isfile(src) and f.endswith(".arb"): shutil.copyfile(src, dst) print(f"Copied file '{f}'") @@ -73,7 +71,7 @@ def copy_locale_file(path): locale = r.groups()[0] fallback = f"app_{locale}.arb" - fallback_file = os.path.join(here, 'collected', fallback) + fallback_file = os.path.join(here, "collected", fallback) if not os.path.exists(fallback_file): print(f"Creating fallback file:", fallback_file) @@ -87,18 +85,18 @@ def generate_locale_list(locales): Generate a .dart file which contains all the supported locales, for importing into the project """ - - with open("supported_locales.dart", "w") as output: - output.write("// This file is auto-generated by the 'collect_translations.py' script - do not edit it directly!\n\n") + with open("supported_locales.dart", "w") as output: + output.write( + "// This file is auto-generated by the 'collect_translations.py' script - do not edit it directly!\n\n" + ) output.write('import "package:flutter/material.dart";\n\n') output.write("const List supported_locales = [\n") locales = sorted(locales) for locale in locales: - - if locale.startswith('.'): + if locale.startswith("."): continue splt = locale.split("_") @@ -107,19 +105,21 @@ def generate_locale_list(locales): lc, cc = splt else: lc = locale - cc = '' - - output.write(f' Locale("{lc}", "{cc}"), // Translations available in app_{locale}.arb\n') + cc = "" + + output.write( + f' Locale("{lc}", "{cc}"), // Translations available in app_{locale}.arb\n' + ) output.write("];\n") output.write("") -if __name__ == '__main__': +if __name__ == "__main__": here = os.path.abspath(os.path.dirname(__file__)) # Ensure the 'collected' output directory exists - output_dir = os.path.join(here, 'collected') + output_dir = os.path.join(here, "collected") os.makedirs(output_dir, exist_ok=True) # Remove existing .arb files from output directory @@ -128,12 +128,11 @@ if __name__ == '__main__': for arb in arbs: os.remove(arb) - locales = ['en'] + locales = ["en"] for locale in os.listdir(here): - # Ignore the output directory - if locale == 'collected': + if locale == "collected": continue f = os.path.join(here, locale) @@ -144,8 +143,8 @@ if __name__ == '__main__': # Ensure the translation source file ('app_en.arb') is copied also # Note that this does not require any further processing - src = os.path.join(here, 'app_en.arb') - dst = os.path.join(here, 'collected', 'app_en.arb') + src = os.path.join(here, "app_en.arb") + dst = os.path.join(here, "collected", "app_en.arb") shutil.copyfile(src, dst)