backupchan-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 See what's changed between versions!
 
+## 0.2.2
+
+* Refactored to use the API's new directory upload function.
+
+## 0.2.1
+
+* Refactored to use the [client connection configuration library](https://github.com/Backupchan/client-config).
+
 ## 0.2.0
 
 * Added command to view stats.

{backupchan_cli-0.2.0/backupchan_cli.egg-info → backupchan_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backupchan-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Command-line interface for interacting with Backup-chan.
 Author-email: Moltony <koronavirusnyj@gmail.com>
 License: BSD-3-Clause
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/Backupchan/cli
 Project-URL: Repository, https://github.com/Backupchan/cli.git
 Project-URL: Issues, https://github.com/Backupchan/cli/issues
 Project-URL: Changelog, https://github.com/Backupchan/cli/blob/main/CHANGELOG.md
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
@@ -18,9 +18,8 @@ Classifier: Topic :: System :: Archiving :: Backup
 Classifier: Typing :: Typed
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupchan-client-lib>=0.2.0
-Requires-Dist: keyring
-Requires-Dist: platformdirs
+Requires-Dist: backupchan-client-lib>=0.3.0
+Requires-Dist: backupchan-client-config>=0.1.0
 Dynamic: license-file
 
 # Backup-chan CLI

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/backupchan_cli/commands/backup.py

@@ -70,26 +70,12 @@ def setup_subcommands(subparser):
 
 def do_upload(args, _, api: API):
     if os.path.isdir(args.filename):
-        # Cannot upload a directory to a single-file target.
-        target_type = api.get_target(args.target_id)[0].target_type
-        if target_type == BackupType.SINGLE:
-            utility.failure("Cannot upload directory to a single file target")
-
-        # Make a temporary gzipped tarball containing the directory contents.
-        temp_dir = tempfile.gettempdir()
-        temp_tar_path = os.path.join(temp_dir, f"bakch-{uuid.uuid4().hex}.tar.gz")
-        with tarfile.open(temp_tar_path, "w:gz") as tar:
-            tar.add(args.filename, arcname=os.path.basename(args.filename))
-        
-        # Upload our new tar.
-        with open(temp_tar_path, "rb") as tar:
-            try:
-                api.upload_backup(args.target_id, tar, os.path.basename(args.filename) + ".tar.gz", not args.automatic)
-            except requests.exceptions.ConnectionError:
-                utility.failure_network()
-            except BackupchanAPIError as exc:
-                utility.failure(f"Failed to upload backup: {str(exc)}")
-
+        try:
+            api.upload_backup_folder(args.target_id, args.filename, not args.automatic)
+        except requests.exceptions.ConnectionError:
+            utility.failure_network()
+        except BackupchanAPIError as exc:
+            utility.failure(f"Failed to upload backup: {str(exc)}")
     else:
         with open(args.filename, "rb") as file:
             try:

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/backupchan_cli/commands/config.py

@@ -1,5 +1,5 @@
 import os
-from backupchan_cli.config import Config
+from backupchan_config import Config
 from backupchan_cli import utility
 
 #

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/backupchan_cli/main.py

@@ -1,6 +1,6 @@
 from .commands import config, target, backup, log, recyclebin, stats
-from .config import Config, ConfigException
 from .utility import failure, NO_CONFIG_MESSAGE
+from backupchan_config import Config, ConfigException
 from backupchan import API
 import argparse
 

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2/backupchan_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backupchan-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Command-line interface for interacting with Backup-chan.
 Author-email: Moltony <koronavirusnyj@gmail.com>
 License: BSD-3-Clause
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/Backupchan/cli
 Project-URL: Repository, https://github.com/Backupchan/cli.git
 Project-URL: Issues, https://github.com/Backupchan/cli/issues
 Project-URL: Changelog, https://github.com/Backupchan/cli/blob/main/CHANGELOG.md
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
@@ -18,9 +18,8 @@ Classifier: Topic :: System :: Archiving :: Backup
 Classifier: Typing :: Typed
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupchan-client-lib>=0.2.0
-Requires-Dist: keyring
-Requires-Dist: platformdirs
+Requires-Dist: backupchan-client-lib>=0.3.0
+Requires-Dist: backupchan-client-config>=0.1.0
 Dynamic: license-file
 
 # Backup-chan CLI

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/backupchan_cli.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ README.md
 cli.py
 pyproject.toml
 backupchan_cli/__init__.py
-backupchan_cli/config.py
 backupchan_cli/main.py
 backupchan_cli/utility.py
 backupchan_cli.egg-info/PKG-INFO

backupchan_cli-0.2.2/backupchan_cli.egg-info/requires.txt

@@ -0,0 +1,2 @@
+backupchan-client-lib>=0.3.0
+backupchan-client-config>=0.1.0

{backupchan_cli-0.2.0 → backupchan_cli-0.2.2}/pyproject.toml

@@ -1,21 +1,20 @@
 [project]
 name = "backupchan-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "Command-line interface for interacting with Backup-chan."
 authors = [
     { name = "Moltony", email = "koronavirusnyj@gmail.com" }
 ]
 dependencies = [
-    "backupchan-client-lib>=0.2.0",
-    "keyring",
-    "platformdirs"
+    "backupchan-client-lib>=0.3.0",
+    "backupchan-client-config>=0.1.0"
 ]
 
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
 
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "License :: OSI Approved :: BSD License",
     "Natural Language :: English",

backupchan_cli-0.2.0/backupchan_cli/config.py

@@ -1,72 +0,0 @@
-import json
-import sys
-import platformdirs
-import keyring
-import os
-from pathlib import Path
-
-class ConfigException(Exception):
-    pass
-
-CONFIG_FILE_DIR = platformdirs.user_config_dir('backupchan')
-CONFIG_FILE_PATH = f"{CONFIG_FILE_DIR}/config.json"
-
-class Config:
-    def __init__(self):
-        self.port: int | None = None
-        self.host: str | None = None
-        self.api_key: str | None = None
-
-    def read_config(self):
-        if not os.path.exists(CONFIG_FILE_PATH):
-            raise ConfigException("Config file not found")
-
-        with open(CONFIG_FILE_PATH, "r") as config_file:
-            self.parse_config(config_file.read())
-        self.retrieve_api_key()
-
-    def reset(self, write: bool = False):
-        self.port = None
-        self.host = None
-        self.api_key = None
-
-        if write:
-            self.delete_api_key()
-            if os.path.exists(CONFIG_FILE_PATH):
-                os.remove(CONFIG_FILE_PATH)
-
-    def is_incomplete(self):
-        return self.port is None or self.host is None or self.api_key is None
-
-    def parse_config(self, config: str):
-        config_json = json.loads(config)
-        self.port = config_json["port"]
-        self.host = config_json["host"]
-
-    def retrieve_api_key(self):
-        self.api_key = keyring.get_password("backupchan", "api_key")
-
-    def save_config(self):
-        if self.is_incomplete():
-            raise ConfigException("Cannot save incomplete config")
-        
-        Path(CONFIG_FILE_DIR).mkdir(exist_ok=True, parents=True)
-
-        config_dict = {
-            "host": self.host,
-            "port": self.port
-        }
-
-        with open(CONFIG_FILE_PATH, "w") as config_file:
-            json.dump(config_dict, config_file)
-
-        self.save_api_key()
-
-    def delete_api_key(self):
-        try:
-            keyring.delete_password("backupchan", "api_key")
-        except keyring.errors.PasswordDeleteError:
-            pass
-    
-    def save_api_key(self):
-        keyring.set_password("backupchan", "api_key", self.api_key)

backupchan_cli-0.2.0/backupchan_cli.egg-info/requires.txt

@@ -1,3 +0,0 @@
-backupchan-client-lib>=0.2.0
-keyring
-platformdirs