nia-sync 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

{nia_sync-0.1.6.dist-info → nia_sync-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nia-sync
-Version: 0.1.6
+Version: 0.1.7
 Summary: Keep your local files in sync with Nia Cloud
 Requires-Python: >=3.10
 Requires-Dist: typer>=0.9.0

{nia_sync-0.1.6.dist-info → nia_sync-0.1.7.dist-info}/RECORD

@@ -2,10 +2,10 @@ auth.py,sha256=n0ezRqIbz3kZYcyIjH47_MDKgwNgAaVr0Y2NEfRxa50,5704
 config.py,sha256=dbnkDihOiJL0-WBzTyxDXM2AIduwsvZycgQuhAoYglU,7637
 extractor.py,sha256=IxpFGOlklusmPs2Jz398DH1hVVYpciwQN_HDyxpmm_Q,29193
 main.py,sha256=f1e2q99QfI_U0YyYgsC75P1wHebKuweWa0pYEAQPMO8,26582
-sync.py,sha256=jdVPceViN5uxoRCr5ukCVumBhvl3t53xkJnvZwvKmdw,10710
+sync.py,sha256=82w71raeH66DlwmoClWfNS4-NiCfZ-TA8ozK9O21HZk,12843
 watcher.py,sha256=JmsN9uR7Ss1mDC-kApXL6Hg_wQZWTsO7rRIFkQu8GbM,9978
-nia_sync-0.1.6.dist-info/METADATA,sha256=BpVvABRhWNRG4dcuFh06zVr7e7Zba2jh95GcR7lZOts,246
-nia_sync-0.1.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-nia_sync-0.1.6.dist-info/entry_points.txt,sha256=Fx8TIOgXqWdZzZEkEateDtcNfgnwuPW4jZTqlEUrHVs,33
-nia_sync-0.1.6.dist-info/top_level.txt,sha256=_ZWBugSHWwSpLXYJAcF6TlWmzECu18k0y1-EX27jtBw,40
-nia_sync-0.1.6.dist-info/RECORD,,
+nia_sync-0.1.7.dist-info/METADATA,sha256=YqDiD8s4_7I1uSWIpWm_ABGqqsypjxWF2U8FT08LuB0,246
+nia_sync-0.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nia_sync-0.1.7.dist-info/entry_points.txt,sha256=Fx8TIOgXqWdZzZEkEateDtcNfgnwuPW4jZTqlEUrHVs,33
+nia_sync-0.1.7.dist-info/top_level.txt,sha256=_ZWBugSHWwSpLXYJAcF6TlWmzECu18k0y1-EX27jtBw,40
+nia_sync-0.1.7.dist-info/RECORD,,

sync.py

@@ -15,7 +15,7 @@ from typing import Any
 import httpx
 
 from config import API_BASE_URL, get_api_key
-from extractor import extract_incremental, detect_source_type
+from extractor import extract_incremental, detect_source_type, TYPE_FOLDER
 
 logger = logging.getLogger(__name__)
 
@@ -26,10 +26,31 @@ MAX_BATCH_SIZE_BYTES = 4 * 1024 * 1024  # 4MB max payload per batch
 MAX_RETRIES = 4
 RETRY_BASE_DELAY = 1.5
 RETRY_MAX_DELAY = 15.0
+FOLDER_CURSOR_VERSION = 1
 
 # Reusable client for connection pooling
 _http_client: httpx.Client | None = None
 
+def _normalize_folder_cursor(
+    path: str,
+    cursor: dict[str, Any] | None,
+) -> tuple[dict[str, Any], str | None]:
+    if not cursor:
+        return {}, "missing"
+
+    cursor_version = cursor.get("cursor_version")
+    root_path = cursor.get("root_path")
+    normalized_root = os.path.abspath(os.path.expanduser(root_path)) if root_path else None
+
+    if cursor_version != FOLDER_CURSOR_VERSION:
+        return {}, "version_mismatch"
+    if not normalized_root:
+        return {}, "missing_root_path"
+    if normalized_root != path:
+        return {}, "root_path_changed"
+
+    return cursor, None
+
 def get_http_client() -> httpx.Client:
     """Get or create HTTP client with connection pooling."""
     global _http_client
@@ -88,8 +109,9 @@ def sync_source(source: dict[str, Any]) -> dict[str, Any]:
             "message": "No local path configured",
         }
 
-    # Expand ~ in path
+    # Expand ~ and normalize path
     path = os.path.expanduser(path)
+    path = os.path.abspath(path)
 
     # Validate path exists
     if not os.path.exists(path):
@@ -105,6 +127,12 @@ def sync_source(source: dict[str, Any]) -> dict[str, Any]:
     if not detected_type:
         detected_type = detect_source_type(path)
 
+    cursor_reset_reason = None
+    if detected_type == TYPE_FOLDER:
+        cursor, cursor_reset_reason = _normalize_folder_cursor(path, cursor)
+        if cursor_reset_reason:
+            logger.info(f"Resetting folder sync cursor for {path} ({cursor_reset_reason})")
+
     logger.info(f"Syncing {path} (type={detected_type})")
 
     try:
@@ -116,10 +144,38 @@ def sync_source(source: dict[str, Any]) -> dict[str, Any]:
         )
 
         files = extraction_result.get("files", [])
-        new_cursor = extraction_result.get("cursor", {})
+        new_cursor = dict(extraction_result.get("cursor", {}))
         stats = extraction_result.get("stats", {})
 
+        if detected_type == TYPE_FOLDER:
+            new_cursor["cursor_version"] = FOLDER_CURSOR_VERSION
+            new_cursor["root_path"] = path
+
         if not files:
+            if detected_type == TYPE_FOLDER and cursor_reset_reason:
+                cursor_update = new_cursor
+                upload_result = upload_sync_data(
+                    local_folder_id=local_folder_id,
+                    files=[],
+                    cursor=cursor_update,
+                    stats=stats,
+                    is_final_batch=True,
+                )
+                if upload_result.get("status") == "ok":
+                    source["cursor"] = cursor_update
+                    return {
+                        "path": path,
+                        "status": "success",
+                        "added": 0,
+                        "message": "No new data (cursor updated)",
+                    }
+                report_sync_error(local_folder_id, upload_result.get("message", "Upload failed"), path)
+                return {
+                    "path": path,
+                    "status": "error",
+                    "error": upload_result.get("message", "Upload failed"),
+                }
+
             logger.info(f"No new data to sync for {path}")
             return {
                 "path": path,