obsideo-cli 0.2.7__tar.gz → 0.2.8__tar.gz

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.7
+Version: 0.2.8
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/obsideo/cli.py

@@ -339,6 +339,14 @@ class ObsideoShell(cmd.Cmd):
         self._cwd = ""  # S3 key prefix; "" = root
         self._refresh_prompt()
 
+    def precmd(self, line: str) -> str:
+        # Tolerate a leading "obsideo " typed out of habit inside the shell
+        # (e.g. "obsideo ls" -> "ls"), so it doesn't error with Unknown syntax.
+        stripped = line.lstrip()
+        if stripped.lower().startswith("obsideo "):
+            return stripped[len("obsideo "):]
+        return line
+
     # ── path helpers ────────────────────────────────────────────────────────
     def _refresh_prompt(self):
         self.prompt = f"obsideo:/{self._cwd} "
@@ -563,25 +571,27 @@ class ObsideoShell(cmd.Cmd):
         print()
         print("  -- Obsideo account --------------------------")
         print("     Plan:  Free")
-        if not config.account_token():
-            # No shim token (e.g. creds set via env / pre-login account): we can't
-            # query usage. Don't claim the service is down — tell them how to link it.
-            print("     Usage: sign in with `obsideo login` to see usage details")
+        # Prefer the signup service (it knows your quota); otherwise compute usage
+        # straight from your storage so this always works - never nag to "log in".
+        usage = _fetch_usage() if config.account_token() else None
+        if usage:
+            used, quota = usage["used_bytes"], usage["quota_bytes"]
+            pct = usage.get("percent_used", (used / quota if quota else 0))
+            print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
+            bar_len = 30
+            filled = int(bar_len * min(pct, 1.0))
+            print(f"     [{'#'*filled}{'-'*(bar_len-filled)}]")
+            if pct >= 0.8:
+                print("     You're near your limit - reply to any Obsideo email to upgrade.")
         else:
-            usage = _fetch_usage()
-            if usage:
-                used, quota = usage["used_bytes"], usage["quota_bytes"]
-                pct = usage.get("percent_used", (used / quota if quota else 0))
-                print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
-                bar_len = 30
-                filled = int(bar_len * min(pct, 1.0))
-                print(f"     [{'#'*filled}{'-'*(bar_len-filled)}]")
-                if pct >= 0.8:
-                    print("     You're near your limit - reply to any Obsideo email to upgrade.")
-            else:
-                print("     Usage: couldn't reach the account service - try again shortly")
-        print(f"     Files: bucket '{storage.bucket()}'  ·  sync folder {sync_mod.ensure_sync_dir()}")
-        print(f"     Keys:  {config.CONFIG_DIR}  (back up data.key)")
+            try:
+                used, n = storage.total_usage()
+                print(f"     Used:  {_human(used)} across {n} file(s)")
+            except Exception:
+                print("     Used:  (couldn't read storage just now)")
+        print(f"     Bucket: {storage.bucket()}")
+        print(f"     Sync folder: {sync_mod.ensure_sync_dir()}")
+        print(f"     Keys: {config.CONFIG_DIR}  (back up data.key)")
         print("  ---------------------------------------------")
         print()
 

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/obsideo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.7
+Version: 0.2.8
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/obsideo_core/storage.py

@@ -189,6 +189,31 @@ def exists(key: str) -> bool:
     return head(key) is not None
 
 
+def total_usage() -> tuple[int, int]:
+    """Total stored bytes + object count across the account's bucket (flat list).
+    Lets `account` show real usage without the signup-service token — it just reads
+    the storage the account can already see. Names stay opaque; only sizes summed."""
+    s3 = _s3()
+    total = 0
+    count = 0
+    token = None
+    while True:
+        kwargs = dict(Bucket=bucket())
+        if token:
+            kwargs["ContinuationToken"] = token
+        resp = s3.list_objects_v2(**kwargs)
+        for obj in resp.get("Contents", []):
+            if obj["Key"].endswith("/"):
+                continue  # folder marker, not a real object
+            total += obj.get("Size", 0)
+            count += 1
+        if resp.get("IsTruncated"):
+            token = resp.get("NextContinuationToken")
+        else:
+            break
+    return total, count
+
+
 def list_prefix(prefix: str = "", delimiter: str = "/") -> dict:
     """List one VFS level. Returns {'folders': [name...], 'files': [{name,key,size}]}.
 

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "obsideo-cli"
-version = "0.2.7"
+version = "0.2.8"
 description = "Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal."
 readme = "README.md"
 requires-python = ">=3.10"

{obsideo_cli-0.2.7 → obsideo_cli-0.2.8}/tests/test_cli.py

@@ -295,3 +295,23 @@ def test_sync_readme_created_and_not_pushed(tmp_path, monkeypatch, capsys):
     n = sync.push(verbose=True)
     assert n == 0
     assert "empty" in capsys.readouterr().out.lower()
+
+
+def test_account_computes_usage_without_token(monkeypatch, tmp_path, capsys):
+    # No signup token -> account must compute usage from storage, NOT nag to log in.
+    from obsideo import sync
+    monkeypatch.setattr(cli.config, "account_token", lambda: None)
+    monkeypatch.setattr(cli.storage, "total_usage", lambda: (1_500_000, 7))
+    monkeypatch.setattr(cli.storage, "bucket", lambda: "tb")
+    monkeypatch.setattr(sync, "_sync_dir", lambda: tmp_path / "s")
+    cli.ObsideoShell().do_account("")
+    out = capsys.readouterr().out
+    assert "across 7 file" in out
+    assert "obsideo login" not in out and "sign in" not in out.lower()
+
+
+def test_precmd_strips_obsideo_prefix():
+    sh = cli.ObsideoShell()
+    assert sh.precmd("obsideo ls") == "ls"
+    assert sh.precmd("obsideo login") == "login"
+    assert sh.precmd("ls") == "ls"  # unchanged when no prefix