gitstore 0.1.0__tar.gz → 0.1.2__tar.gz

{gitstore-0.1.0 → gitstore-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitstore
-Version: 0.1.0
+Version: 0.1.2
 Summary: Utilities to encrypt files/directories with utilitz and exchange them through GitHub repositories.
 Author: artitzco
 License: MIT
@@ -55,7 +55,7 @@ from gitstore import GitStoreUploader, GitStoreDownloader
 from gitstore import GitStoreUploader
 
 uploader = GitStoreUploader(
-    repo_path="C:/repos/my-publish-repo",  # optional, defaults to current working directory
+    repo_path="C:/repos/my-publish-repo",  # required
     security_level="high",                 # default
 )
 

{gitstore-0.1.0 → gitstore-0.1.2}/README.md

@@ -43,10 +43,10 @@ from gitstore import GitStoreUploader, GitStoreDownloader
 ```python
 from gitstore import GitStoreUploader
 
-uploader = GitStoreUploader(
-    repo_path="C:/repos/my-publish-repo",  # optional, defaults to current working directory
-    security_level="high",                 # default
-)
+uploader = GitStoreUploader(
+    repo_path="C:/repos/my-publish-repo",  # required
+    security_level="high",                 # default
+)
 
 record = uploader.store(
     source_path="C:/data/documento.pdf",   # file or directory

{gitstore-0.1.0 → gitstore-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitstore"
-version = "0.1.0"
+version = "0.1.2"
 description = "Utilities to encrypt files/directories with utilitz and exchange them through GitHub repositories."
 readme = "README.md"
 requires-python = ">=3.10"

{gitstore-0.1.0 → gitstore-0.1.2}/src/gitstore/client.py

@@ -2,6 +2,8 @@ import json
 import os
 import shutil
 import tempfile
+import hashlib
+import re
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
@@ -17,6 +19,7 @@ DEFAULT_PASSWORD_ENV_VAR = "GITSTORE_PASSWORD"
 class StoredArtifact:
     name: str
     artifact: str
+    artifact_hash: str
     is_directory: bool
     created_at_utc: str
 
@@ -31,19 +34,34 @@ def _resolve_password(password: str | None, password_env_var: str) -> str:
     return resolved_password
 
 
+def _hash_from_name_or_content(encrypted_path: Path) -> str:
+    # utilitz default output name pattern: -confidential-<24hex>.asc
+    m = re.search(r"-confidential-([0-9a-fA-F]{24})", encrypted_path.name)
+    if m:
+        return m.group(1).lower()
+
+    hasher = hashlib.sha256()
+    with open(encrypted_path, "rb") as f:
+        for chunk in iter(lambda: f.read(65536), b""):
+            hasher.update(chunk)
+    return hasher.hexdigest()[:24]
+
+
 class GitStoreUploader:
     def __init__(
         self,
-        repo_path: str | None = None,
+        repo_path: str,
         password: str | None = None,
         vault_dir: str = "vault",
         request_timeout: int = 60,
         password_env_var: str = DEFAULT_PASSWORD_ENV_VAR,
         security_level: str = "high",
     ) -> None:
+        if not repo_path:
+            raise ValueError("repo_path is required for uploader.")
         resolved_password = _resolve_password(password, password_env_var)
         self.config = GitStoreConfig(password=resolved_password, request_timeout=request_timeout)
-        self.repo_path = Path(repo_path).expanduser().resolve() if repo_path else Path.cwd().resolve()
+        self.repo_path = Path(repo_path).expanduser().resolve()
         self.vault_dir = vault_dir.strip().strip("/\\") or "vault"
         self._manifest_rel = f"{self.vault_dir}/index.json"
         self.password_env_var = password_env_var
@@ -82,52 +100,70 @@ class GitStoreUploader:
                     security_level=level,
                 )
             )
-        extension = "".join(encrypted_path.suffixes) or ".asc"
-        stamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S%fZ")
-        artifact_filename = f"{name}__{stamp}{extension}"
-        artifact_rel = f"{self.vault_dir}/{artifact_filename}"
-        artifact_abs = self.repo_path / artifact_rel
-        artifact_abs.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copy2(encrypted_path, artifact_abs)
 
-        manifest = self._load_manifest_local()
-        old_artifact_rel = None
-        if name in manifest:
-            if not replace_existing:
-                raise ValueError(
-                    f"Name '{name}' already exists. Use replace_existing=True to replace it."
-                )
-            old_artifact = manifest[name].get("artifact")
-            if old_artifact:
-                old_artifact_rel = f"{self.vault_dir}/{old_artifact}"
-                old_artifact_abs = self.repo_path / old_artifact_rel
-                if old_artifact_abs.exists():
-                    old_artifact_abs.unlink()
-
-        record = StoredArtifact(
-            name=name,
-            artifact=artifact_filename,
-            is_directory=is_directory,
-            created_at_utc=datetime.now(timezone.utc).isoformat(),
-        )
-        manifest[name] = record.__dict__
-        self._save_manifest_local(manifest)
+        try:
+            extension = "".join(encrypted_path.suffixes) or ".asc"
+            artifact_hash = _hash_from_name_or_content(encrypted_path)
+            artifact_filename = f"{name}{extension}"
+            artifact_rel = f"{self.vault_dir}/{artifact_filename}"
+            artifact_abs = self.repo_path / artifact_rel
+            artifact_abs.parent.mkdir(parents=True, exist_ok=True)
 
-        message = commit_message or f"gitstore: store '{name}'"
-        paths_to_commit = [artifact_rel, self._manifest_rel]
-        if old_artifact_rel:
-            paths_to_commit.insert(0, old_artifact_rel)
-        git_add_commit_push(
-            repo_path=str(self.repo_path),
-            paths_in_repo=paths_to_commit,
-            commit_message=message,
-        )
-        if old_artifact_rel:
-            git_purge_path_from_history(
+            manifest = self._load_manifest_local()
+            existing_record = manifest.get(name)
+            if existing_record:
+                existing_hash = str(existing_record.get("artifact_hash", "")).lower()
+                if existing_hash == artifact_hash:
+                    # Same content already stored for the same logical name.
+                    print(
+                        f"[gitstore] Skip upload: '{name}' already up to date "
+                        f"(hash={artifact_hash})."
+                    )
+                    return StoredArtifact(
+                        name=name,
+                        artifact=str(existing_record["artifact"]),
+                        artifact_hash=existing_hash,
+                        is_directory=bool(existing_record["is_directory"]),
+                        created_at_utc=str(existing_record["created_at_utc"]),
+                    )
+                if not replace_existing:
+                    raise ValueError(
+                        f"Name '{name}' already exists. Use replace_existing=True to replace it."
+                    )
+
+            shutil.copy2(encrypted_path, artifact_abs)
+
+            record = StoredArtifact(
+                name=name,
+                artifact=artifact_filename,
+                artifact_hash=artifact_hash,
+                is_directory=is_directory,
+                created_at_utc=datetime.now(timezone.utc).isoformat(),
+            )
+            manifest[name] = {
+                "name": record.name,
+                "artifact": record.artifact,
+                "artifact_hash": record.artifact_hash,
+                "is_directory": record.is_directory,
+                "created_at_utc": record.created_at_utc,
+            }
+            self._save_manifest_local(manifest)
+
+            message = commit_message or f"gitstore: store '{name}'"
+            paths_to_commit = [artifact_rel, self._manifest_rel]
+            git_add_commit_push(
                 repo_path=str(self.repo_path),
-                path_in_repo=old_artifact_rel,
+                paths_in_repo=paths_to_commit,
+                commit_message=message,
             )
-        return record
+            print(
+                f"[gitstore] Uploaded '{name}' -> '{artifact_rel}' "
+                f"(hash={artifact_hash})."
+            )
+            return record
+        finally:
+            if encrypted_path.exists():
+                encrypted_path.unlink()
 
     def destroy(self, name: str, commit_message: str | None = None) -> None:
         self._ensure_repo()
@@ -154,6 +190,7 @@ class GitStoreUploader:
             commit_message=message,
         )
         git_purge_path_from_history(repo_path=str(self.repo_path), path_in_repo=artifact_rel)
+        print(f"[gitstore] Destroyed '{name}' and purged '{artifact_rel}' from history.")
 
     def _ensure_repo(self) -> None:
         if not (self.repo_path / ".git").exists():
@@ -176,7 +213,7 @@ class GitStoreUploader:
         manifest_path = self._manifest_path()
         manifest_path.parent.mkdir(parents=True, exist_ok=True)
         with open(manifest_path, "w", encoding="utf-8", newline="\n") as f:
-            json.dump(manifest, f, indent=2, sort_keys=True)
+            json.dump(manifest, f, indent=2, sort_keys=False)
             f.write("\n")
 
 
@@ -206,7 +243,34 @@ class GitStoreDownloader:
     ) -> str:
         record = self._get_manifest_record(name)
         artifact = record["artifact"]
+        artifact_hash = str(record.get("artifact_hash") or "")
         is_directory = bool(record["is_directory"])
+        local_index_path, expected_existing = self._local_registry_paths(
+            output_path=output_path,
+            is_directory=is_directory,
+            name=name,
+        )
+        local_index = self._load_local_download_index(local_index_path)
+        already_restored = False
+        for item in local_index:
+            if not isinstance(item, dict):
+                continue
+            if str(item.get("name") or "") != name:
+                continue
+            if str(item.get("artifact_hash") or "") != artifact_hash:
+                continue
+            recorded_path = str(item.get("restored_path") or "")
+            recorded_exists = Path(recorded_path).exists() if recorded_path else False
+            expected_exists = expected_existing.exists() if expected_existing else False
+            if expected_exists or recorded_exists:
+                already_restored = True
+                break
+        if already_restored:
+            print(
+                f"[gitstore] Skip download: '{name}' already restored "
+                f"(hash={artifact_hash})."
+            )
+            return str(expected_existing)
 
         temp_dir = Path(tempfile.mkdtemp(prefix="gitstore_restore_"))
         temp_file = temp_dir / "artifact.enc"
@@ -214,18 +278,34 @@ class GitStoreDownloader:
             raw_url = f"{self.raw_base_url}/{self.vault_dir}/{artifact}"
             download_raw_file(raw_url, str(temp_file), timeout=self.config.request_timeout)
             if is_directory:
-                return decrypt_directory(
+                restored_path = decrypt_directory(
+                    encrypted_path=str(temp_file),
+                    config=self.config,
+                    output_path=output_path,
+                    overwrite=overwrite,
+                )
+            else:
+                restored_path = decrypt_file(
                     encrypted_path=str(temp_file),
                     config=self.config,
                     output_path=output_path,
                     overwrite=overwrite,
                 )
-            return decrypt_file(
-                encrypted_path=str(temp_file),
-                config=self.config,
-                output_path=output_path,
-                overwrite=overwrite,
+            local_index.append({
+                "name": name,
+                "artifact": artifact,
+                "artifact_hash": artifact_hash,
+                "is_directory": is_directory,
+                "created_at_utc": str(record.get("created_at_utc", "")),
+                "restored_path": restored_path,
+                "downloaded_at_utc": datetime.now(timezone.utc).isoformat(),
+            })
+            self._save_local_download_index(local_index_path, local_index)
+            print(
+                f"[gitstore] Downloaded and restored '{name}' -> '{restored_path}' "
+                f"(hash={artifact_hash})."
             )
+            return restored_path
         finally:
             shutil.rmtree(temp_dir, ignore_errors=True)
 
@@ -247,3 +327,37 @@ class GitStoreDownloader:
             raise ValueError(f"Invalid manifest record for name: {name}")
         return record
 
+    def _local_registry_paths(
+        self,
+        output_path: str | None,
+        is_directory: bool,
+        name: str,
+    ) -> tuple[Path, Path | None]:
+        if output_path:
+            out = Path(output_path).expanduser().resolve()
+            target = out
+        else:
+            # Conservative default when no explicit output path is passed.
+            base = Path.cwd().resolve()
+            target = base / name
+
+        # Keep metadata file at the same level as the restored artifact.
+        base_dir = target.parent
+        idx = base_dir / ".gitstore.json"
+        return idx, target
+
+    def _load_local_download_index(self, index_path: Path) -> list[dict]:
+        if not index_path.exists():
+            return []
+        with open(index_path, "r", encoding="utf-8") as f:
+            data = json.load(f)
+        if not isinstance(data, list):
+            raise ValueError(f"Invalid local download index format: {index_path}")
+        return [item for item in data if isinstance(item, dict)]
+
+    def _save_local_download_index(self, index_path: Path, data: list[dict]) -> None:
+        index_path.parent.mkdir(parents=True, exist_ok=True)
+        with open(index_path, "w", encoding="utf-8", newline="\n") as f:
+            json.dump(data, f, indent=2, sort_keys=False)
+            f.write("\n")
+

{gitstore-0.1.0 → gitstore-0.1.2}/src/gitstore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitstore
-Version: 0.1.0
+Version: 0.1.2
 Summary: Utilities to encrypt files/directories with utilitz and exchange them through GitHub repositories.
 Author: artitzco
 License: MIT
@@ -55,7 +55,7 @@ from gitstore import GitStoreUploader, GitStoreDownloader
 from gitstore import GitStoreUploader
 
 uploader = GitStoreUploader(
-    repo_path="C:/repos/my-publish-repo",  # optional, defaults to current working directory
+    repo_path="C:/repos/my-publish-repo",  # required
     security_level="high",                 # default
 )