bcsfe-wrapper-python 0.1.3__tar.gz → 0.1.4__tar.gz

{bcsfe_wrapper_python-0.1.3/bcsfe_wrapper_python.egg-info → bcsfe_wrapper_python-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe-wrapper-python
-Version: 0.1.3
+Version: 0.1.4
 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 → bcsfe_wrapper_python-0.1.4}/bcsfe_wrapper/wrapper.py

@@ -2,29 +2,37 @@ 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"):
         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':
         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)
+        
+        # 正しいメソッド名は from_codes
+        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 +40,11 @@ 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)
+        # 正しいメソッド名は get_codes
+        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 → bcsfe_wrapper_python-0.1.4/bcsfe_wrapper_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe-wrapper-python
-Version: 0.1.3
+Version: 0.1.4
 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 → bcsfe_wrapper_python-0.1.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='bcsfe-wrapper-python',
-    version='0.1.3',
+    version='0.1.4',
     packages=find_packages(), include_package_data=True,
     install_requires=[
         # 依存関係があればここに記述