sysetup 1.4.2__tar.gz → 1.4.3__tar.gz

{sysetup-1.4.2/src/sysetup.egg-info → sysetup-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.2
+Version: 1.4.3
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,13 +8,14 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<2,>=1.2.21
+Requires-Dist: backupmaster<3,>=2.0.2
 Requires-Dist: dbus-next<1,>=0.2.3
 Requires-Dist: package-utils[context]<1,>=0.6.1
 Requires-Dist: powercli<1,>=0.3.1
 Requires-Dist: requests<3,>=2.32.3
 Requires-Dist: superpathlib<3,>=2.0.4
 Provides-Extra: dev
+Requires-Dist: dirhash<1,>=0.5.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.7.1; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"

sysetup-1.4.3/bin/pw

@@ -0,0 +1,10 @@
+#! /bin/bash
+
+password_name=${1:-Login}
+
+if command -v ksshaskpass >/dev/null 2>&1; then
+    ksshaskpass -- "Enter passphrase for $password_name: "
+else
+    security find-generic-password -s "$password_name" -a "autopass" -w
+    # to add: security add-generic-password -s "$password_name" -a "autopass" -U -w
+fi

{sysetup-1.4.2 → sysetup-1.4.3}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "sysetup"
-version = "1.4.2"
+version = "1.4.3"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "backupmaster >=1.2.21, <2",
+    "backupmaster >=2.0.2, <3",
     "dbus-next >=0.2.3, <1",
     "package-utils[context] >=0.6.1, <1",
     "powercli >=0.3.1, <1",
@@ -17,6 +17,7 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
+    "dirhash >=0.5.0, <1",
     "types-requests >=2.32.0.20250306, <3",
     "package-dev-tools >=0.7.1, <1",
     "package-dev-utils >=0.1.6, <1",

{sysetup-1.4.2 → sysetup-1.4.3}/src/sysetup/main/files/assets.py

@@ -1,5 +1,6 @@
 import cli
-from backup.backups.cache import cache
+from backup.syncer import Syncer
+from backup.syncer.sync_configs import SyncConfigs
 
 from sysetup.models import Path
 from sysetup.utils import download_directory
@@ -33,12 +34,11 @@ def move_setup_files() -> None:
             else:
                 archived_setup_files.append(path)
 
+    config = SyncConfigs.cache.with_paths(setup_files)
     if setup_files:
-        cache.Backup(paths=setup_files).pull()
-
-    source = cache.Backup().source
+        Syncer(config).capture_pull()
     for path in archived_setup_files:
-        dest = (source / path.relative_to(setup_files_root)).parent
+        dest = (config.source / path.relative_to(setup_files_root)).parent
         if dest.is_root and not dest.exists():
             cli.run("mkdir -p", dest, root=True)
         else:

{sysetup-1.4.2 → sysetup-1.4.3}/src/sysetup/main/installations.py

@@ -43,9 +43,13 @@ def install_chromium() -> None:
 def _install_chromium() -> None:
     release_name = cli.capture_output_lines("lsb_release -sc")[-1]
     repo_url = f"https://freeshell.de/phd/chromium/{release_name}"
+    key = "869689FE09306074"
+    keyring = "/usr/share/keyrings/phd-chromium.gpg"
+    sources_file = "/etc/apt/sources.list.d/phd-chromium.list"
     commands = (
-        f'echo "deb {repo_url} /" | sudo tee /etc/apt/sources.list.d/phd-chromium.list',
-        "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 869689FE09306074",
+        f"gpg --keyserver keyserver.ubuntu.com --recv-keys {key}",
+        f"gpg --export {key} | sudo gpg --dearmor -o {keyring}",
+        f'echo "deb [signed-by={keyring}] {repo_url} /" | sudo tee {sources_file}',
         "apt-get update",
         "apt-get install -y chromium",
     )

{sysetup-1.4.2 → sysetup-1.4.3}/src/sysetup/utils/bitwarden.py

@@ -29,12 +29,14 @@ class Client:
     def session_token(self) -> str:
         if not Path("bw").exists():
             self.download_cli()
-        command: tuple[str, ...]
-        if context.secrets.bw_clientid:
-            cli.run("./bw login --apikey")
-            command = "./bw unlock --raw", self.password
-        else:
-            command = "./bw login --raw", self.email, self.password
+
+        logged_in = "userEmail" in cli.capture_output("./bw status")
+        command: tuple[str, ...] = "./bw unlock --raw", self.password
+        if not logged_in:
+            if context.secrets.bw_clientid:
+                cli.run("./bw login --apikey")
+            else:
+                command = "./bw login --raw", self.email, self.password
         return cli.capture_output(*command)
 
     def download_cli(self) -> None:

{sysetup-1.4.2 → sysetup-1.4.3}/src/sysetup/utils/download.py

@@ -1,9 +1,9 @@
 import os
 
 import cli
-from backup.backups import Backup
 from backup.context import context as backup_context
-from backup.models import Path as BackupPath
+from backup.syncer import Syncer
+from backup.syncer.sync_configs import select_sync_config
 
 from sysetup.models import Path
 
@@ -11,13 +11,21 @@ from .bitwarden import bitwarden
 
 
 def download_directory(path: Path) -> None:
-    check_authenticated()
-    Backup(sub_check_path=BackupPath(path), confirm=False).pull()
+    download_item(directory=path)
 
 
 def download_file(path: Path) -> None:
+    download_item(path)
+
+
+def download_item(path: Path | None = None, directory: Path | None = None) -> None:
     check_authenticated()
-    Backup(path=BackupPath(path), confirm=False).pull()
+    location = path or directory
+    assert location is not None
+    config = select_sync_config(location)
+    config.path = path
+    config.directory = directory
+    Syncer(config).capture_pull()
 
 
 def check_authenticated() -> None:

{sysetup-1.4.2 → sysetup-1.4.3/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.2
+Version: 1.4.3
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,13 +8,14 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<2,>=1.2.21
+Requires-Dist: backupmaster<3,>=2.0.2
 Requires-Dist: dbus-next<1,>=0.2.3
 Requires-Dist: package-utils[context]<1,>=0.6.1
 Requires-Dist: powercli<1,>=0.3.1
 Requires-Dist: requests<3,>=2.32.3
 Requires-Dist: superpathlib<3,>=2.0.4
 Provides-Extra: dev
+Requires-Dist: dirhash<1,>=0.5.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.7.1; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"

{sysetup-1.4.2 → sysetup-1.4.3}/src/sysetup.egg-info/requires.txt

@@ -1,4 +1,4 @@
-backupmaster<2,>=1.2.21
+backupmaster<3,>=2.0.2
 dbus-next<1,>=0.2.3
 package-utils[context]<1,>=0.6.1
 powercli<1,>=0.3.1
@@ -6,6 +6,7 @@ requests<3,>=2.32.3
 superpathlib<3,>=2.0.4
 
 [dev]
+dirhash<1,>=0.5.0
 types-requests<3,>=2.32.0.20250306
 package-dev-tools<1,>=0.7.1
 package-dev-utils<1,>=0.1.6

{sysetup-1.4.2 → sysetup-1.4.3}/tests/test_background.py

@@ -1,7 +1,6 @@
 import os
 from collections.abc import Callable, Iterator
 
-import cli
 import pytest
 from backup.utils import setup
 
@@ -31,12 +30,9 @@ def restore_and_check(
     setup.check_setup()
 
     def _restore_and_check(restored_path: Path) -> Iterator[None]:
-        def extract_content_hash() -> str:
-            return cli.capture_output("rclone hashsum MD5", restored_path, check=False)
-
-        content_hash = extract_content_hash()
+        content_hash = restored_path.content_hash
         yield from restore(restored_path)
-        assert extract_content_hash() == content_hash
+        assert restored_path.content_hash == content_hash
 
     return _restore_and_check
 

sysetup-1.4.2/bin/pw

@@ -1,4 +0,0 @@
-#! /bin/bash
-
-password_name=${1:-Login}
-ksshaskpass -- "Enter passphrase for $password_name: "