termux-sync 1.2.0__tar.gz → 1.2.2__tar.gz

{termux_sync-1.2.0 → termux_sync-1.2.2}/CHANGELOG.md

@@ -18,6 +18,27 @@ Version numbers follow [Semantic Versioning](https://semver.org/).
 
 ---
 
+## [1.2.2] - 2026-07-11
+
+### Fixed
+
+- **`restore` — stuck retrying and failing with `HTTP Error 404: Not Found` when the GitHub backend points to a private repo** — `GitHubStorage.download()` and the `manifest.json` lookup in `list_backups()` downloaded release assets via `asset["browser_download_url"]` using the standard `Accept: application/vnd.github.v3+json` header. That URL only resolves without further authentication for public repos; for private repos GitHub returns 404 even with a valid token, since the download must go through the `/repos/{repo}/releases/assets/{id}` API endpoint with `Accept: application/octet-stream`. Added `GitHubStorage._asset_headers()` and `_asset_url()` and switched both call sites to use them, so restoring from a private-repo backend now downloads correctly instead of exhausting all 8 retries.
+
+---
+
+## [1.2.1] - 2026-05-22
+
+### Fixed
+
+- **`setup` — required fields accepted empty input silently** — pressing Enter on the `GitHub Personal Access Token` and `GitHub repo (owner/repo)` prompts passed through an empty string, which would later cause a crash or silent failure when actually running a backup or restore. Both fields are now validated in a loop that keeps prompting until a non-empty value is provided, with a descriptive error message on each failed attempt.
+  - `github_token`: re-prompts with `✗ Token cannot be empty. Paste your Personal Access Token.`
+  - `github_repo`: re-prompts with `✗ Invalid format. Use: username/repo-name` if empty or if the value does not contain exactly one `/` in a valid position
+  - `local_path`: re-prompts with `✗ Path cannot be empty.` if the user clears the default and submits nothing
+- **`setup` — existing token not acknowledged** — when a GitHub token was already saved in config, the password prompt showed an empty field with no indication that a value already existed. A hint line is now printed before the prompt: `A token is already saved. Press Enter to keep it, or paste a new one.`
+- **`KeyboardInterrupt` traceback instead of clean exit** — pressing Ctrl+C during any interactive prompt (e.g. `setup`, `schedule`, `restore`, `delete`) printed a full Python traceback instead of the intended cancellation panel. The root cause was that the `try/except KeyboardInterrupt` block only wrapped `main()` inside `if __name__ == "__main__"`, which is never executed when the script is invoked via a pip entry point or the tsctl launcher. The handler has been moved inside `main()` itself so it fires regardless of invocation method. The panel logic was extracted into a dedicated `_abort()` helper and `if __name__ == "__main__"` simplified to a bare `main()` call.
+
+---
+
 ## [1.2.0] - 2026-05-22
 
 ### Added

{termux_sync-1.2.0 → termux_sync-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termux-sync
-Version: 1.2.0
+Version: 1.2.2
 Summary: Backup and restore your entire Termux environment across devices
 Project-URL: Homepage, https://github.com/djunekz/termux-sync
 Project-URL: Repository, https://github.com/djunekz/termux-sync

{termux_sync-1.2.0 → termux_sync-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "termux-sync"
-version = "1.2.0"
+version = "1.2.2"
 description = "Backup and restore your entire Termux environment across devices"
 readme = "README.md"
 license = { file = "LICENSE" }

{termux_sync-1.2.0 → termux_sync-1.2.2}/src/termux_sync/__init__.py

@@ -43,7 +43,7 @@ try:
 except ImportError:
     RICH_AVAILABLE = False
 
-VERSION       = "1.2.0"
+VERSION       = "1.2.1"
 APP_NAME      = "termux-sync"
 CONFIG_DIR    = Path.home() / ".config" / APP_NAME
 CONFIG_FILE   = CONFIG_DIR / "config.json"
@@ -469,6 +469,15 @@ class GitHubStorage:
             "Accept": "application/vnd.github.v3+json",
         }
 
+    def _asset_headers(self) -> dict:
+        return {
+            "Authorization": f"token {self.token}",
+            "Accept": "application/octet-stream",
+        }
+
+    def _asset_url(self, asset_id: int) -> str:
+        return f"{self.API}/repos/{self.repo}/releases/assets/{asset_id}"
+
     def _api(self, method: str, endpoint: str, **kwargs):
         import urllib.request, urllib.error
         url  = f"{self.API}{endpoint}"
@@ -633,8 +642,8 @@ class GitHubStorage:
                     try:
                         import urllib.request
                         req = urllib.request.Request(
-                            asset["browser_download_url"],
-                            headers=self._headers()
+                            self._asset_url(asset["id"]),
+                            headers=self._asset_headers()
                         )
                         with urllib.request.urlopen(req, timeout=30) as r:
                             manifest = json.loads(r.read())
@@ -659,14 +668,14 @@ class GitHubStorage:
         dl_task = progress.add_task("[cyan]Downloading from GitHub...", total=len(assets))
 
         for asset in assets:
-            url  = asset["browser_download_url"]
+            url  = self._asset_url(asset["id"])
             out  = dest / asset["name"]
             size = asset.get("size", 0)
             f_task = progress.add_task(f"[cyan]{asset['name']}...", total=max(size, 1))
             last_err = None
             for attempt in range(8):
                 try:
-                    req = urllib.request.Request(url, headers=self._headers())
+                    req = urllib.request.Request(url, headers=self._asset_headers())
                     with urllib.request.urlopen(req, timeout=120) as r:
                         data = r.read()
                     out.write_bytes(data)
@@ -1138,9 +1147,14 @@ def cmd_setup():
     cfg["storage"] = storage_map[choice]
 
     if cfg["storage"] == "local":
-        cfg["local_path"] = Prompt.ask(
-            "  Local backup path", default=cfg.get("local_path", str(DEFAULT_DEST))
-        )
+        while True:
+            val = Prompt.ask(
+                "  Local backup path", default=cfg.get("local_path", str(DEFAULT_DEST))
+            ).strip()
+            if val:
+                cfg["local_path"] = val
+                break
+            console.print("  [red]✗ Path cannot be empty.[/red]")
 
     elif cfg["storage"] == "gdrive":
         console.print()
@@ -1159,12 +1173,34 @@ def cmd_setup():
         )
         console.print("  [dim]Token URL:[/dim] [white]https://github.com/settings/tokens[/white]")
         console.print()
-        cfg["github_token"] = Prompt.ask(
-            "  GitHub Personal Access Token", default=cfg.get("github_token", ""), password=True
-        )
-        cfg["github_repo"] = Prompt.ask(
-            "  GitHub repo (owner/repo)", default=cfg.get("github_repo", "")
-        )
+
+        existing_token = cfg.get("github_token", "")
+        if existing_token:
+            console.print("  [dim]A token is already saved. Press Enter to keep it, or paste a new one.[/dim]")
+        while True:
+            val = Prompt.ask(
+                "  GitHub Personal Access Token",
+                default=existing_token,
+                password=True,
+            ).strip()
+            if val:
+                cfg["github_token"] = val
+                break
+            console.print("  [red]✗ Token cannot be empty. Paste your Personal Access Token.[/red]")
+
+        while True:
+            val = Prompt.ask(
+                "  GitHub repo (owner/repo)", default=cfg.get("github_repo", "")
+            ).strip()
+            if not val:
+                console.print("  [red]✗ Repo cannot be empty. Enter in format: username/repo-name[/red]")
+                continue
+            if "/" not in val or val.startswith("/") or val.endswith("/"):
+                console.print("  [red]✗ Invalid format. Use: username/repo-name  (e.g. djunekz/my-termux-backup)[/red]")
+                continue
+            cfg["github_repo"] = val
+            break
+
         cfg["github_branch"] = Prompt.ask(
             "  Branch", default=cfg.get("github_branch", "main")
         )
@@ -1757,51 +1793,54 @@ Examples:
 
     cfg = load_config()
 
-    if args.command == "setup":
-        cmd_setup()
-    elif args.command == "backup":
-        cmd_backup(cfg, label=args.label)
-    elif args.command == "restore":
-        cmd_restore(cfg, backup_name=args.name)
-    elif args.command == "list":
-        cmd_list(cfg)
-    elif args.command == "delete":
-        cmd_delete(cfg, backup_name=args.name)
-    elif args.command == "schedule":
-        cmd_schedule()
-    elif args.command == "daemon":
-        cmd_daemon(cfg)
-    elif args.command == "status":
-        cmd_status(cfg)
-    elif args.command == "logs":
-        cmd_logs(args.lines)
-    elif args.command == "clear-logs":
-        cmd_clear_logs()
-    elif args.command == "check":
-        cmd_check(args.target or "")
-    elif args.command == "clear-cache":
-        cmd_clear_cache()
-    elif args.command == "export-config":
-        cmd_export_config(args.target or "")
-    elif args.command == "import-config":
-        cmd_import_config(args.target or "")
-
-
-if __name__ == "__main__":
     try:
-        main()
+        if args.command == "setup":
+            cmd_setup()
+        elif args.command == "backup":
+            cmd_backup(cfg, label=args.label)
+        elif args.command == "restore":
+            cmd_restore(cfg, backup_name=args.name)
+        elif args.command == "list":
+            cmd_list(cfg)
+        elif args.command == "delete":
+            cmd_delete(cfg, backup_name=args.name)
+        elif args.command == "schedule":
+            cmd_schedule()
+        elif args.command == "daemon":
+            cmd_daemon(cfg)
+        elif args.command == "status":
+            cmd_status(cfg)
+        elif args.command == "logs":
+            cmd_logs(args.lines)
+        elif args.command == "clear-logs":
+            cmd_clear_logs()
+        elif args.command == "check":
+            cmd_check(args.target or "")
+        elif args.command == "clear-cache":
+            cmd_clear_cache()
+        elif args.command == "export-config":
+            cmd_export_config(args.target or "")
+        elif args.command == "import-config":
+            cmd_import_config(args.target or "")
     except KeyboardInterrupt:
-        console = Console()
-        console.print()
-        console.print()
-        console.print(
-            Panel(
-                "[bold yellow]Operation cancelled[/bold yellow]\n\n"
-                "  You pressed [bold]Ctrl+C[/bold] — termux-sync was stopped.\n"
-                "  [dim]Any partial temporary files have been cleaned up.[/dim]\n\n"
-                "  Run the command again whenever you're ready.",
-                border_style="yellow",
-                padding=(1, 2),
-            )
+        _abort()
+
+
+def _abort():
+    console.print()
+    console.print()
+    console.print(
+        Panel(
+            "[bold yellow]Operation cancelled[/bold yellow]\n\n"
+            "  You pressed [bold]Ctrl+C[/bold] — termux-sync was stopped.\n"
+            "  [dim]Any partial temporary files have been cleaned up.[/dim]\n\n"
+            "  Run the command again whenever you're ready.",
+            border_style="yellow",
+            padding=(1, 2),
         )
-        sys.exit(0)
+    )
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()