Adjust the processing order of tfm tables (#251)

This PR adjusts the processing order of tfm tables to bring it closer to Veda and adds `model.data_modules` to enable #240 .
Contribute to #41

xl2times/__main__.py

@@ -15,7 +15,7 @@
 from xl2times.utils import max_workers
 
 from . import excel, transforms, utils
-from .datatypes import Config, EmbeddedXlTable, TimesModel
+from .datatypes import Config, DataModule, EmbeddedXlTable, TimesModel
 
 logger = utils.get_logger()
 
@@ -485,6 +485,20 @@ def run(args: argparse.Namespace) -> str | None:
 
     model.files.update([Path(path).stem for path in input_files])
 
+    processing_order = ["base", "subres", "trade", "demand", "scen", "syssettings"]
+    for data_module in processing_order:
+        model.data_modules = model.data_modules + sorted(
+            [
+                item
+                for item in {
+                    DataModule.module_name(path)
+                    for path in input_files
+                    if DataModule.module_type(path) == data_module
+                }
+                if item is not None
+            ]
+        )
+
     if args.only_read:
         tables = convert_xl_to_times(
             input_files,

xl2times/datatypes.py

@@ -119,13 +119,15 @@ def module_name(cls, path: str) -> str | None:
         module_type = cls.determine_type(path)
         match module_type:
             case DataModule.base | DataModule.sets | DataModule.lma | DataModule.demand | DataModule.trade | DataModule.syssettings:
-                return module_type.name
+                return module_type.name.upper()
             case DataModule.subres:
-                return re.sub("_trans$", "", PurePath(path).stem.lower())
+                return re.sub(
+                    "^SUBRES_", "", re.sub("_TRANS$", "", PurePath(path).stem.upper())
+                )
+            case DataModule.scen:
+                return re.sub("^SCEN_", "", PurePath(path).stem.upper())
             case None:
                 return None
-            case _:
-                return PurePath(path).stem
 
 
 @dataclass
@@ -234,6 +236,7 @@ class TimesModel:
     units: DataFrame = field(default_factory=DataFrame)
     start_year: int = field(default_factory=int)
     files: set[str] = field(default_factory=set)
+    data_modules: list[str] = field(default_factory=list)
 
     @property
     def external_regions(self) -> set[str]: