maps4fs 2.7.6__py3-none-any.whl → 2.7.7__py3-none-any.whl

maps4fs/generator/config.py

@@ -37,6 +37,11 @@ logger.info(
     MFS_GSETTINGS_DEFAULTS_DIR,
 )
 
+TEMPLATES_STRUCTURE = {
+    "fs25": ["texture_schemas", "tree_schemas", "map_templates"],
+    "fs22": ["texture_schemas", "map_templates"],
+}
+
 
 def ensure_templates():
     """Ensure templates directory exists and is populated with data.
@@ -122,7 +127,19 @@ def ensure_templates():
         raise
 
 
+def ensure_template_subdirs() -> None:
+    """Ensure that all expected subdirectories exist in the templates directory."""
+    for game_version, subdirs in TEMPLATES_STRUCTURE.items():
+        for subdir in subdirs:
+            dir_path = os.path.join(MFS_TEMPLATES_DIR, game_version, subdir)
+            if not os.path.exists(dir_path):
+                logger.debug("Expected template subdirectory missing: %s", dir_path)
+                os.makedirs(dir_path, exist_ok=True)
+    logger.info("Templates directory is ready at: %s", MFS_TEMPLATES_DIR)
+
+
 ensure_templates()
+ensure_template_subdirs()
 
 MFS_ROOT_DIR = os.getenv("MFS_ROOT_DIRECTORY", os.path.join(os.getcwd(), "mfsrootdir"))
 MFS_CACHE_DIR = os.path.join(MFS_ROOT_DIR, "cache")

maps4fs/generator/map.py

@@ -129,8 +129,22 @@ class Map:
         # endregion
 
         # region prepare map working directory
+        custom_template_path = kwargs.get("custom_template_path", None)
+        if custom_template_path:
+            self.logger.info("Using custom map template: %s", custom_template_path)
+            if not os.path.isfile(custom_template_path):
+                self.logger.error(
+                    "Custom map template file %s does not exist.", custom_template_path
+                )
+                raise FileNotFoundError(
+                    f"Custom map template file {custom_template_path} does not exist."
+                )
+            template_path = custom_template_path
+        else:
+            self.logger.info("Using default map template: %s", game.template_path)
+            template_path = game.template_path
         try:
-            shutil.unpack_archive(game.template_path, self.map_directory)
+            shutil.unpack_archive(template_path, self.map_directory)
             self.logger.debug("Map template unpacked to %s", self.map_directory)
         except Exception as e:
             raise RuntimeError(f"Can not unpack map template due to error: {e}") from e

{maps4fs-2.7.6.dist-info → maps4fs-2.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.7.6
+Version: 2.7.7
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: GNU Affero General Public License v3.0

{maps4fs-2.7.6.dist-info → maps4fs-2.7.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
 maps4fs/__init__.py,sha256=5ixsCA5vgcIV0OrF9EJBm91Mmc_KfMiDRM-QyifMAvo,386
 maps4fs/logger.py,sha256=6sem0aFKQqtVjQ_yNu9iGcc-hqzLQUhfxco05K6nqow,763
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/config.py,sha256=iCrxIRkETUwL-VVq8eskIekPnA8YD09b-I9gWPxsvqQ,6401
+maps4fs/generator/config.py,sha256=KwYYWM5wrMB_tKn3Fls6WpEurZJxmrBH5AgAXPGHTJE,7122
 maps4fs/generator/game.py,sha256=nf6iuYNA5NJc-ir_WOgkw-MdJVgetVHeEtxbWJYt3Vo,14462
-maps4fs/generator/map.py,sha256=T-oVU9aNSgFwqell_FglFlNu8EJJ1e8CQRtaSpznVAE,13315
+maps4fs/generator/map.py,sha256=IC72Mr_04wm5kby4J0m-Bw32UrcE6qn2KwaX9vLEzn4,14036
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
 maps4fs/generator/settings.py,sha256=oDs_bgvqHMJfKGK7uVVkm6MykAL3dVkvm5L3-hvZx2c,13044
 maps4fs/generator/statistics.py,sha256=Dp1-NS-DWv0l0UdmhOoXeQs_N-Hs7svYUnmziSW5Z9I,2098
@@ -22,8 +22,8 @@ maps4fs/generator/component/base/component.py,sha256=lf0V9CLUXMg88Nm2yI3rP5taVYY
 maps4fs/generator/component/base/component_image.py,sha256=WTGC6v1KuS5sLNCC95Z48nCspvATKKNOuhTNYzTWXr4,8315
 maps4fs/generator/component/base/component_mesh.py,sha256=3hC-qDT8Vde6SmRMqs9USAkrF-gL2dDTYW71ATpxUS4,9130
 maps4fs/generator/component/base/component_xml.py,sha256=MT-VhU2dEckLFxAgmxg6V3gnv11di_94Qq6atfpOLdc,5342
-maps4fs-2.7.6.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
-maps4fs-2.7.6.dist-info/METADATA,sha256=ADAop0VKLnkMSu_aAT_oa5LlEW025DLz6K3N-c8KoOI,9425
-maps4fs-2.7.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maps4fs-2.7.6.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-2.7.6.dist-info/RECORD,,
+maps4fs-2.7.7.dist-info/licenses/LICENSE.md,sha256=Ptw8AkqJ60c4tRts6yuqGP_8B0dxwOGmJsp6YJ8dKqM,34328
+maps4fs-2.7.7.dist-info/METADATA,sha256=Ep85HwMO8zs0SizzYeypwSQkBUfdEHDZStbICYQOMo0,9425
+maps4fs-2.7.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maps4fs-2.7.7.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-2.7.7.dist-info/RECORD,,