trailsnap-cli 0.3.9__tar.gz → 0.4.0__tar.gz

{trailsnap_cli-0.3.9 → trailsnap_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trailsnap-cli
-Version: 0.3.9
+Version: 0.4.0
 Summary: TrailSnap Command Line Interface
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{trailsnap_cli-0.3.9 → trailsnap_cli-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trailsnap-cli"
-version = "0.3.9"
+version = "0.4.0"
 description = "TrailSnap Command Line Interface"
 readme = "README.md"
 requires-python = ">=3.9"

{trailsnap_cli-0.3.9 → trailsnap_cli-0.4.0}/trailsnap/cli.py

@@ -8,7 +8,7 @@ sys.path.insert(0, str(Path(__file__).parent))
 from commands import config, photos, tags, albums, locations, people, folders, medias
 from output import set_formatter, OutputFormatter
 
-VERSION = "0.3.9"
+VERSION = "0.4.0"
 
 def main():
     if hasattr(sys.stdout, "reconfigure"):

{trailsnap_cli-0.3.9 → trailsnap_cli-0.4.0}/trailsnap/utils.py

@@ -64,7 +64,15 @@ def make_request(endpoint, params=None, method="GET", response_type="json"):
     try:
         with urllib.request.urlopen(req) as response:
             if response_type == "json":
-                return json.loads(response.read().decode("utf-8"))
+                result = json.loads(response.read().decode("utf-8"))
+                # 处理可能返回的统一结构 {"code": ..., "msg": ..., "data": ...}
+                if isinstance(result, dict) and "code" in result and "msg" in result:
+                    if result["code"] not in (200, 0):
+                        print(f"API 请求失败: {result.get('msg', '未知错误')} (错误码: {result['code']})")
+                        sys.exit(1)
+                    # 如果有 data 字段，则返回 data，否则返回整个结构（兼容部分可能只需要成功状态的情况）
+                    return result.get("data", result)
+                return result
             elif response_type == "text":
                 return response.read().decode("utf-8")
             if response_type == "bytes":

{trailsnap_cli-0.3.9 → trailsnap_cli-0.4.0}/trailsnap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trailsnap-cli
-Version: 0.3.9
+Version: 0.4.0
 Summary: TrailSnap Command Line Interface
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown