bcsfe-wrapper-python 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

bcsfe_wrapper/wrapper.py

@@ -7,43 +7,68 @@ from bcsfe import core
 from bcsfe.cli import edits
 
 class BCSFEWrapper:
-    def __init__(self, save_path_or_data: Union[str, bytes], cc: str = "jp", gv: str = "13.1.0"):
+    def __init__(self, save_path_or_data: Union[str, bytes, core.Data], cc: str = "jp", gv: str = "13.4.0"):
         self._init_core()
         self.cc = core.CountryCode.from_code(cc)
         self.gv = core.GameVersion.from_string(gv)
         
+        if not save_path_or_data:
+            self.save_path = None
+            self.save_file = None
+            return
+
         if isinstance(save_path_or_data, str):
             self.save_path = core.Path(save_path_or_data)
             self.save_file = core.SaveFile(self.save_path.read(), cc=self.cc, gv=self.gv)
             self.save_file.save_path = self.save_path
-        else:
+        elif isinstance(save_path_or_data, bytes):
             self.save_file = core.SaveFile(core.Data(save_path_or_data), cc=self.cc, gv=self.gv)
             self.save_path = None
+        elif isinstance(save_path_or_data, core.Data):
+            self.save_file = core.SaveFile(save_path_or_data, cc=self.cc, gv=self.gv)
+            self.save_path = None
+        else:
+            # すでにSaveFileオブジェクトなどが渡された場合
+            self.save_file = save_path_or_data
+            self.save_path = getattr(save_path_or_data, "save_path", None)
 
     def _init_core(self):
         data_folder = core.Path.get_data_folder()
         core.set_config_path(data_folder.add("config.yaml"))
         core.set_log_path(data_folder.add("log.txt"))
         core.core_data.init_data()
-        core.core_data.config.set(core.ConfigKey.STRICT_UPGRADE, False)
-        try:
-            core.core_data.config.set(core.ConfigKey.UPDATE_TO_BETAS, False)
-        except AttributeError:
-            # 最新バージョンではUPDATE_TO_BETAに変更されている可能性がある
+        
+        # 設定項目の安全な設定
+        def safe_set(key_name, value):
             try:
-                core.core_data.config.set(core.ConfigKey.UPDATE_TO_BETA, False)
-            except (AttributeError, ValueError):
+                if hasattr(core.ConfigKey, key_name):
+                    core.core_data.config.set(getattr(core.ConfigKey, key_name), value)
+            except:
                 pass
+
+        safe_set("STRICT_UPGRADE", False)
+        safe_set("UPDATE_TO_BETAS", False)
+        safe_set("UPDATE_TO_BETA", False)
+        safe_set("SHOW_LOGS", False)
+        
         core.print_config_err = False
 
     @classmethod
-    def from_server(cls, transfer_code: str, confirmation_code: str, cc: str = "jp", gv: str = "13.1.0") -> 'BCSFEWrapper':
-        dummy = cls(b"", cc=cc, gv=gv)
+    def from_server(cls, transfer_code: str, confirmation_code: str, cc: str = "jp", gv: str = "13.4.0") -> 'BCSFEWrapper':
+        # coreの初期化のみ行う
+        dummy = cls(None, cc=cc, gv=gv)
+        dummy._init_core()
+        
         server_handler, result = core.ServerHandler.from_codes(
             transfer_code, confirmation_code, core.CountryCode.from_code(cc), core.GameVersion.from_string(gv), print=False
         )
-        if server_handler is None: raise RuntimeError("Download failed.")
-        return cls(server_handler.save_file.to_data().get_bytes(), cc=cc, gv=gv)
+        if server_handler is None:
+            raise RuntimeError(f"Download failed: {result}")
+        
+        # ダウンロードしたデータから実体を生成
+        instance = cls(server_handler.save_file.to_data(), cc=cc, gv=gv)
+        instance.save_file = server_handler.save_file
+        return instance
 
     def save(self, output_path: Optional[str] = None):
         path = core.Path(output_path) if output_path else self.save_path

{bcsfe_wrapper_python-0.1.14.dist-info → bcsfe_wrapper_python-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe-wrapper-python
-Version: 0.1.14
+Version: 0.1.16
 Summary: A Python wrapper for BCSFE-Python to easily interact with Battle Cats save files.
 Home-page: https://github.com/fieryhenry/BCSFE-Python
 Author: Manus AI

{bcsfe_wrapper_python-0.1.14.dist-info → bcsfe_wrapper_python-0.1.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bcsfe_wrapper/__init__.py,sha256=o2LbyVJjuRV1gap8wDbsv39kEUJM1rt8Lq49u1RYYXA,268
-bcsfe_wrapper/wrapper.py,sha256=1h0xNylAdNTdwVHjtTxHrz7gDT10BcpVQAhm0e8axcQ,9727
+bcsfe_wrapper/wrapper.py,sha256=-IVObsK-kElqXYEVuThJFZWZKadUi3hLKpilxb8HiNU,10532
 bcsfe_wrapper/bcsfe/__init__.py,sha256=vCHjSoJq5u684HLQXahhtA64MZWffNHFdhweP7RM0f4,144
 bcsfe_wrapper/bcsfe/__main__.py,sha256=Dam14Fv6L-tRRufIkIRpr69dM0b2ybU1eALJxIw_eFI,2091
 bcsfe_wrapper/bcsfe/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -198,7 +198,7 @@ bcsfe_wrapper/bcsfe/files/locales/vi/edits/treasures.properties,sha256=U9uKsF4y0
 bcsfe_wrapper/bcsfe/files/locales/vi/edits/user_rank.properties,sha256=FcldhzKM0UmuhmGzI3dGzxstuKcw-t-gkbmKLZT4VKg,603
 bcsfe_wrapper/bcsfe/files/themes/default.json,sha256=w8eqqd9ATIFwUcvOWTdJjyd1T3LGgUm3iVkJhT5wfEo,392
 bcsfe_wrapper/bcsfe/files/themes/discord.json,sha256=W1dtEev6tap_waHOxvSqENDcMRA9jfBvjW7t-ssdGs4,370
-bcsfe_wrapper_python-0.1.14.dist-info/METADATA,sha256=MAzwxSA81C5kpS_hgEjlB84Jf_Q1XsHdF_QEytwr5IA,4327
-bcsfe_wrapper_python-0.1.14.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-bcsfe_wrapper_python-0.1.14.dist-info/top_level.txt,sha256=kqyMKpAdNg39_kGGtqsxOSLPIb-qx7R1mQj1hReUsYM,14
-bcsfe_wrapper_python-0.1.14.dist-info/RECORD,,
+bcsfe_wrapper_python-0.1.16.dist-info/METADATA,sha256=a8UgOyJbKSzGwbOwbTvoA9SqD-hyVRUJNK_rVWL2fkI,4327
+bcsfe_wrapper_python-0.1.16.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+bcsfe_wrapper_python-0.1.16.dist-info/top_level.txt,sha256=kqyMKpAdNg39_kGGtqsxOSLPIb-qx7R1mQj1hReUsYM,14
+bcsfe_wrapper_python-0.1.16.dist-info/RECORD,,