Fix passed parameters, move load_ko_csv to common

#26

src/common.py

@@ -295,3 +295,14 @@ def write(obj: Any, basename: str, yaml: YAML, logger: logging.Logger) -> None:
     logger.info(f"Write: {basename}.json")
     with open(f"{basename}.json", mode="w", encoding="utf-8") as out:
         json.dump(obj, out)
+
+
+def load_ko_csv(key: str, filename: Optional[str]) -> Dict[int, Dict[str, str]] | None:
+    if not filename:
+        return
+    with open(filename, encoding="utf8") as f:
+        reader = DictReader(f)
+        return {
+            int(row[key]): row
+            for row in reader
+        }

src/job_ocgtcg.py

@@ -10,7 +10,7 @@
 from ruamel.yaml import YAML
 from ruamel.yaml.scalarstring import LiteralScalarString
 
-from common import annotate_shared, initial_parse, int_or_none, int_or_og, transform_image, transform_names, transform_sets, transform_texts, write
+from common import annotate_shared, initial_parse, int_or_none, int_or_og, transform_image, transform_names, transform_sets, transform_texts, write, load_ko_csv
 
 module_logger = logging.getLogger(__name__)
 
@@ -221,6 +221,8 @@ def job(
     assignments = load_assignments(yaml, assignment_file) if assignment_file else None
     ko_overrides = load_ko_overrides(ko_file) if ko_file else None
     ko_official = load_ko_official(ko_official_csv) if ko_official_csv else None
+    ko_override = load_ko_csv("konami_id", ko_override_csv)
+    ko_prerelease = load_ko_csv("yugipedia_page_id", ko_prerelease_csv)
     results = []
     for i, filename in enumerate(filenames):
         filepath = os.path.join(wikitext_dir, filename)

src/job_rush.py

@@ -10,7 +10,7 @@
 from ruamel.yaml import YAML
 
 from common import int_or_og, initial_parse, int_or_none, transform_names, transform_texts, annotate_shared, \
-    transform_sets, transform_image, transform_multilanguage, write
+    transform_sets, transform_image, transform_multilanguage, write, load_ko_csv
 
 module_logger = logging.getLogger(__name__)
 
@@ -54,17 +54,6 @@ def write_output(yaml: YAML, logger: logging.Logger, document: Dict[str, Any]) -
     write(document, basename, yaml, logger)
 
 
-def load_ko_csv(key: str, filename: Optional[str]) -> Dict[int, Dict[str, str]] | None:
-    if not filename:
-        return
-    with open(filename, encoding="utf8") as f:
-        reader = DictReader(f)
-        return {
-            int(row[key]): row
-            for row in reader
-        }
-
-
 def job(
     wikitext_dir: str,
     filenames: List[str],

src/main_ocgtcg.py

@@ -56,6 +56,8 @@ def main() -> None:
         ocg,
         args.ko,
         args.ko_official,
+        args.ko_override,
+        args.ko_prerelease,
         args.aggregate is not None,
     )
     if processes == 1: