bcsfe-wrapper-python 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

bcsfe_wrapper/wrapper.py

@@ -2,29 +2,48 @@ import os
 import sys
 from typing import Any, List, Optional, Tuple, Dict, Union
 
-# 内部のbcsfeを優先的にインポート
 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"):
+        # パスの初期化
+        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()
+        
+        self.cc = core.CountryCode.from_code(cc)
+        self.gv = core.GameVersion.from_string(gv)
+        
         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())
+            self.save_file = core.SaveFile(self.save_path.read(), cc=self.cc, gv=self.gv)
             self.save_file.save_path = self.save_path
         else:
-            self.save_file = core.SaveFile(save_path_or_data)
+            self.save_file = core.SaveFile(core.Data(save_path_or_data), cc=self.cc, gv=self.gv)
             self.save_path = None
 
     @classmethod
-    def from_server(cls, transfer_code: str, confirmation_code: str, cc: str = "jp") -> 'BCSFEWrapper':
+    def from_server(cls, transfer_code: str, confirmation_code: str, cc: str = "jp", gv: str = "13.1.0") -> 'BCSFEWrapper':
+        # サーバーからダウンロードする前に初期化が必要
+        data_folder = core.Path.get_data_folder()
+        core.set_config_path(data_folder.add("config.yaml"))
+        core.core_data.init_data()
+        
         country_code = core.CountryCode.from_code(cc)
-        handler = core.ServerHandler(country_code)
-        save_data, error = handler.download_save(transfer_code, confirmation_code)
-        if save_data is None:
-            raise RuntimeError(f"Download failed: {error}")
-        return cls(save_data.to_data().get_bytes(), cc=cc)
+        game_version = core.GameVersion.from_string(gv)
+        
+        server_handler, result = core.ServerHandler.from_codes(
+            transfer_code, confirmation_code, country_code, game_version, print=False
+        )
+        
+        if server_handler is None:
+            raise RuntimeError(f"Download failed. Check your codes or internet connection.")
+            
+        return cls(server_handler.save_file.to_data().get_bytes(), cc=cc, gv=gv)
 
     def save(self, output_path: Optional[str] = None):
         path = core.Path(output_path) if output_path else self.save_path
@@ -32,9 +51,10 @@ class BCSFEWrapper:
         self.save_file.to_file(path)
 
     def upload_to_server(self) -> Tuple[Optional[str], Optional[str]]:
-        handler = core.ServerHandler(self.save_file.cc)
-        response, error = handler.upload_save(self.save_file)
-        if response: return response.get("transfer_code"), response.get("confirmation_code")
+        handler = core.ServerHandler(self.save_file, print=False)
+        codes = handler.get_codes()
+        if codes:
+            return codes
         return None, None
 
     def edit_catfood(self, amount: int): self.save_file.catfood = amount

{bcsfe_wrapper_python-0.1.3.dist-info → bcsfe_wrapper_python-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe-wrapper-python
-Version: 0.1.3
+Version: 0.1.5
 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.3.dist-info → bcsfe_wrapper_python-0.1.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bcsfe_wrapper/__init__.py,sha256=o2LbyVJjuRV1gap8wDbsv39kEUJM1rt8Lq49u1RYYXA,268
-bcsfe_wrapper/wrapper.py,sha256=zoFoCdQyNFtE2hDUApkUjPB4F6z4rnSnPtl88xyQYOA,5044
+bcsfe_wrapper/wrapper.py,sha256=Gnpe0vSei-LGaethtL8SkcCnww_iXYSomsFCeAgWmJk,5774
 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.3.dist-info/METADATA,sha256=4rP8MszJlJClcULS6VvPi2MjBo1kKajUqz_Y_C_DhAU,4326
-bcsfe_wrapper_python-0.1.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-bcsfe_wrapper_python-0.1.3.dist-info/top_level.txt,sha256=kqyMKpAdNg39_kGGtqsxOSLPIb-qx7R1mQj1hReUsYM,14
-bcsfe_wrapper_python-0.1.3.dist-info/RECORD,,
+bcsfe_wrapper_python-0.1.5.dist-info/METADATA,sha256=h4sQqByl11oBi84-NzUdouvWbhOUQUEatKWUxdoeKjk,4326
+bcsfe_wrapper_python-0.1.5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+bcsfe_wrapper_python-0.1.5.dist-info/top_level.txt,sha256=kqyMKpAdNg39_kGGtqsxOSLPIb-qx7R1mQj1hReUsYM,14
+bcsfe_wrapper_python-0.1.5.dist-info/RECORD,,