claude-timemachine
b31fdd023a
Product / UI / CLI / docs rebrand. Internal package, repo, and on-disk dir names stay 'cloud_sync' / 'cloud-sync' / '.cloud-sync/' to avoid breaking existing installs; a future commit can do the file-system rename when the cost is worth paying. User-facing changes: CLI prog name: cloud-sync -> instance-sync CLI description: cloud-svc URL -> Timemachine Network endpoint Dialog title: CLOUD SYNC -> INSTANCE SYNC Dialog title: CLOUD CONFLICT -> INSTANCE CONFLICT Dialog title: CONNECT CLOUD SAVE -> CONNECT TO THE NETWORK Card label: Cloud Save -> Remote Save Skip button: Skip cloud sync -> Skip instance sync Body copy: 'the cloud' -> 'the Timemachine Network' Window titles: Cloud sync — ... -> Instance sync — ... Log prefix: cloud-sync: -> instance-sync: Error prose: 'cloud-sync token' -> 'instance-sync token' Backend changes: restic --host tag: cloud-sync -> instance-sync State.host_tag dflt: cloud-sync -> instance-sync (Existing snapshots with the old tag still pull fine; we use 'latest'.) Drop tkinter fallback: ui.py now offers Qt OR Headless. tkinter is unnecessary given we already maintain Qt + headless; one less code path to keep styled, smaller pyz. make_progress() picks Qt first, falls through to HeadlessProgress on ImportError with a stderr hint to 'pip install PySide6'. README: rebrand title + prose; note repo/dir rename deferred; call out the PySide6 install step. Conflict/login dialogs are now Qt-only; without Qt, conflict aborts (defensive) and login tells the user to paste the token manually. 52 tests green; no test-file label changes needed since they only exercise internal APIs.
85 lines
2.5 KiB
Python
85 lines
2.5 KiB
Python
"""Per-instance sync state.
|
|
|
|
Tracks the snapshot id this pack was last synced to and when. Lives at
|
|
``<pack-folder>/.cloud-sync/state.json`` (mode 600).
|
|
|
|
Purpose: divergence detection. On ``pull``, if the remote latest id
|
|
differs from ``last_pulled_snapshot_id`` AND any in-scope local file
|
|
has mtime > ``last_pulled_at``, the local and remote diverged from a
|
|
common ancestor — surface the conflict dialog.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from dataclasses import dataclass
|
|
from datetime import datetime, timezone
|
|
from pathlib import Path
|
|
|
|
|
|
SCHEMA_VERSION = 1
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class State:
|
|
last_pulled_snapshot_id: str
|
|
last_pulled_at: datetime
|
|
host_tag: str = "instance-sync"
|
|
|
|
|
|
def state_path(pack_folder: Path) -> Path:
|
|
return pack_folder / ".cloud-sync" / "state.json"
|
|
|
|
|
|
def read(pack_folder: Path) -> State | None:
|
|
"""Return parsed state or None if file missing / unreadable / wrong schema."""
|
|
p = state_path(pack_folder)
|
|
if not p.exists():
|
|
return None
|
|
try:
|
|
data = json.loads(p.read_text(encoding="utf-8"))
|
|
except (OSError, json.JSONDecodeError):
|
|
return None
|
|
if data.get("schema") != SCHEMA_VERSION:
|
|
return None
|
|
try:
|
|
return State(
|
|
last_pulled_snapshot_id=data["last_pulled_snapshot_id"],
|
|
last_pulled_at=_parse_iso(data["last_pulled_at"]),
|
|
host_tag=data.get("host_tag", "instance-sync"),
|
|
)
|
|
except (KeyError, ValueError):
|
|
return None
|
|
|
|
|
|
def write(pack_folder: Path, state: State) -> None:
|
|
"""Persist state. Creates parent dir + sets mode 600."""
|
|
p = state_path(pack_folder)
|
|
p.parent.mkdir(parents=True, exist_ok=True)
|
|
payload = {
|
|
"schema": SCHEMA_VERSION,
|
|
"last_pulled_snapshot_id": state.last_pulled_snapshot_id,
|
|
"last_pulled_at": state.last_pulled_at.astimezone(timezone.utc)
|
|
.isoformat()
|
|
.replace("+00:00", "Z"),
|
|
"host_tag": state.host_tag,
|
|
}
|
|
p.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8")
|
|
p.chmod(0o600)
|
|
|
|
|
|
def clear(pack_folder: Path) -> None:
|
|
"""Remove state.json if present. Used when remote has zero snapshots."""
|
|
p = state_path(pack_folder)
|
|
p.unlink(missing_ok=True)
|
|
|
|
|
|
def _parse_iso(s: str) -> datetime:
|
|
"""Parse ISO-8601 with trailing Z or +HH:MM, return tz-aware UTC."""
|
|
if s.endswith("Z"):
|
|
s = s[:-1] + "+00:00"
|
|
dt = datetime.fromisoformat(s)
|
|
if dt.tzinfo is None:
|
|
dt = dt.replace(tzinfo=timezone.utc)
|
|
return dt.astimezone(timezone.utc)
|