dprojectstools 0.0.4__tar.gz → 0.0.5__tar.gz

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dprojectstools
-Version: 0.0.4
+Version: 0.0.5
 Summary: A set of development tools
 Author-email: Marc Delos <marcdp@dprojects.com>
 Project-URL: Homepage, https://github.com/marcdp/dprojectstools

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/pyproject.toml

@@ -10,7 +10,7 @@ where = ["src"]
 
 [project]
 name = "dprojectstools"
-version = "0.0.4"
+version = "0.0.5"
 authors = [
   { name="Marc Delos", email="marcdp@dprojects.com" },
 ]

dprojectstools-0.0.5/src/dprojectstools/backups/__init__.py

@@ -0,0 +1,3 @@
+# xmenu/__init__.py
+from .restic import Restic
+

dprojectstools-0.0.5/src/dprojectstools/backups/restic.py

@@ -0,0 +1,62 @@
+import os
+import subprocess
+from typing import Annotated
+from ..commands import command, CommandsManager
+
+class Restic:
+
+    # vars
+    _repository: str
+    _repository_password: str
+    _aws_access_key_id: str
+    _aws_secret_access_key: str
+    
+    # ctor
+    def __init__(self, repository, repository_password, aws_access_key_id, aws_secret_access_key):
+        self._repository = repository
+        self._repository_password = repository_password
+        self._aws_access_key_id = aws_access_key_id
+        self._aws_secret_access_key = aws_secret_access_key
+
+    # commands
+    @command("Init repository", index = 1)
+    def init(self):
+        return subprocess.run("restic init", env = self._getEnv())
+
+    @command("Backup ", index = 10)
+    def backup(self):
+        return subprocess.run("restic backup ./data ./data2 --verbose", env = self._getEnv())
+
+    @command("List snapshots ", index = 20)
+    def snapshots_list(self):
+        return subprocess.run("restic snapshots", env = self._getEnv())
+    
+    @command("List snapshot contents ")
+    def snapshots_contents(self, 
+            id: Annotated[str, "ID"]
+        ):
+        return subprocess.run("restic ls --long {0}".format(id), env = self._getEnv())
+
+    @command("Restore ")
+    def snapshots_restore(self, 
+            id: Annotated[str, "ID"]
+        ):
+        return subprocess.run("restic restore {0} --target ./restore --verbose".format(id), env = self._getEnv())
+
+    # methods
+    def exec(self, argv):
+        commandsManager = CommandsManager()
+        commandsManager.register(self)
+        return commandsManager.execute(argv)
+    
+    # utils
+    def _getEnv(self):
+        myenv = os.environ.copy()
+        myenv['RESTIC_REPOSITORY'] = self._repository
+        myenv['RESTIC_PASSWORD'] = self._repository_password
+        myenv["AWS_ACCESS_KEY_ID"] = self._aws_access_key_id
+        myenv['AWS_SECRET_ACCESS_KEY'] = self._aws_secret_access_key
+        return myenv
+    
+
+

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/src/dprojectstools/commands/commands.py

@@ -86,8 +86,7 @@ class CommandsManager:
         command_title = getattr(func, "title")
         command_order = getattr(func, "order")
         command_index = getattr(func, "index")
-        command_arguments = []
-        
+        command_arguments = []        
         for param_name, param in inspect.signature(func).parameters.items():
             if param_name == "self":
                 continue
@@ -299,7 +298,11 @@ class CommandsManager:
         if command_args_errors:
             return -1
         # invoke
-        return command_to_execute.func(**command_args_dict)
+        if not command_to_execute.instance is None:
+            func_bounded = types.MethodType(command_to_execute.func, command_to_execute.instance)
+            return func_bounded(**command_args_dict)
+        else:
+            return command_to_execute.func(**command_args_dict)
 
         
 

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/src/dprojectstools/secrets/secrets.py

@@ -3,7 +3,7 @@ import os
 import json
 import keyring
 from typing import Annotated
-from ..commands import command
+from ..commands import command, CommandsManager
 from ..crypto import aes_decrypt, aes_encrypt, password_generate
 
 # consts
@@ -30,8 +30,6 @@ class SecretsManager():
                 if username == "":
                     username = os.getlogin()
                 password = keyring.get_password(KEYRING_APP, username)
-                print(username)
-                print(password)
                 if password is None:
                     password = password_generate()
                     keyring.set_password(KEYRING_APP, username, password)
@@ -80,7 +78,7 @@ class SecretsManager():
             file.write(text)
     
     
-    # ui method
+    # commands
     @command("List secrets", index = 90)
     def secrets_list(self):
         for key in self.keys():
@@ -103,3 +101,9 @@ class SecretsManager():
         ):
         self.delete(name)
 
+    # methods
+    def exec(self, argv):
+        commandsManager = CommandsManager()
+        commandsManager.register(self)
+        return commandsManager.execute(argv)        
+

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/src/dprojectstools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dprojectstools
-Version: 0.0.4
+Version: 0.0.5
 Summary: A set of development tools
 Author-email: Marc Delos <marcdp@dprojects.com>
 Project-URL: Homepage, https://github.com/marcdp/dprojectstools

{dprojectstools-0.0.4 → dprojectstools-0.0.5}/src/dprojectstools.egg-info/SOURCES.txt

@@ -6,6 +6,8 @@ src/dprojectstools.egg-info/PKG-INFO
 src/dprojectstools.egg-info/SOURCES.txt
 src/dprojectstools.egg-info/dependency_links.txt
 src/dprojectstools.egg-info/top_level.txt
+src/dprojectstools/backups/__init__.py
+src/dprojectstools/backups/restic.py
 src/dprojectstools/commands/__init__.py
 src/dprojectstools/commands/commands.py
 src/dprojectstools/crypto/__init__.py