added more .env stuff

.gitignore

@@ -1,3 +1,6 @@
 __pycache__
 *.egg-info
-build/
+build/
+
+.env
+key

README.md

@@ -7,11 +7,11 @@ Purpose:
 
 ## Environment Variables
 
-Recommended to put these in the relevant `~/.bashrc` file
+Put these in a `.env` file in the directory that the backup will be run from.
 
 | Env Variable        | Description                                                                                |
-| ------------------- | ------------------------------------------------------------------------------------------ |
-| `HOSTNAME`          | Network hostname of where the backup is running                                            |
+|---------------------|--------------------------------------------------------------------------------------------|
+| `HOSTNAME`          | Network hostname of where the backup is running. Used to tag the backups in restic         |
 | `BACKUP_DIR`        | Directory to back up                                                                       |
 | `RESTIC_REPOSITORY` | Directory for the restic repository. This is usually on a mount point made from Proxmox    |
 | `RESTIC_PASSWORD`   | Password for the restic repository                                                         |

pyproject.toml

@@ -12,4 +12,4 @@ authors = [
 license = { file = "LICENSE" }
 requires-python = ">=3.10"
 
-dependencies = ["rich", "requests", "click"]
+dependencies = ["rich", "requests", "click", "docker", "python-dotenv"]

requirements.txt

@@ -2,4 +2,6 @@ uv
 ruff
 rich
 requests
-click
+click
+docker
+python-dotenv

src/restic/backup.py

@@ -81,6 +81,7 @@ def main(
     logging.getLogger('urllib3.connectionpool').setLevel('WARNING')
 
     if project is not None and services is not None:
+        logger.debug(f'Using project {project} and stopping services: {services}')
         decorator = manage_containers(project=project, services=services.split(','))
         func = decorator(run)
     else:
@@ -96,4 +97,10 @@ def main(
 
 
 if __name__ == '__main__':
+    from dotenv import load_dotenv
+    from pathlib import Path
+
+    dotenv_file = Path.cwd() / '.env'
+    print(dotenv_file)
+    load_dotenv(dotenv_path=dotenv_file)
     main()

src/restic/docker.py

@@ -15,11 +15,12 @@ def manage_containers(project: str, services: list[str]):
             try:
                 project_containers = (
                     c
-                    for c in client.containers.list()
-                    if c.labels['com.docker.compose.project'] == project
+                    for c in client.containers.list(all=True)
+                    if c.labels.get('com.docker.compose.project', False)
                 )
-                service_dict = {
-                    c.labels['com.docker.compose.service']: c for c in project_containers
+                service_dict: dict[str, Container] = {
+                    service: c for c in project_containers
+                    if (service := c.labels.get('com.docker.compose.service', False))
                 }
                 containers: list[Container] = [service_dict[s] for s in services]
             except Exception as e:

src/restic/forget.py

@@ -10,6 +10,7 @@ from rich.logging import RichHandler
 from restic import size, snapshots
 from restic.console import console, logger
 from restic.loki import send_to_loki
+from restic.prune import prune
 
 
 class KeepStrategy(BaseModel):
@@ -43,7 +44,8 @@ def forget(loki_url: str = None, dry_run: bool = False, **kwargs):
     if result.returncode == 0:
         try:
             line = result.stdout
-            data = json.loads(line)
+            # data = json.loads(line)
+            json.loads(line)
         except json.JSONDecodeError:
             logger.error('Error decoding JSON')
             logger.error(line)
@@ -53,7 +55,7 @@ def forget(loki_url: str = None, dry_run: bool = False, **kwargs):
         finally:
             logger.debug('Done')
     else:
-        logger.error(f'Error running command')
+        logger.error('Error running command')
         logger.error(result.stderr)
 
 
@@ -84,9 +86,16 @@ def main(loki_url: str, dry_run: bool, **kwargs):
     except Exception:
         console.print_exception()
     else:
-        snapshots.snapshot(loki_url)
-        size.get_size(loki_url)
+        prune(loki_url, dry_run)
+        if not dry_run:
+            snapshots.snapshot(loki_url)
+            size.get_size(loki_url)
+        else:
+            logger.debug('Skipping getting size because of dry run')
 
 
 if __name__ == '__main__':
+    from dotenv import load_dotenv
+
+    load_dotenv()
     main()

src/restic/prune.py

@@ -12,7 +12,7 @@ from restic.console import console, logger
 from restic.loki import send_to_loki
 
 field_regex = re.compile(
-    r'^(?P<name>[\w ]+):\s+(?P<blobs>\d+) blobs \/ (?P<size>\d+(\.\d+)? (M|G)iB)', re.MULTILINE
+    r'^(?P<name>[\w ]+):\s+(?P<blobs>\d+) blobs \/ (?P<size>\d+(\.\d+)? (?:Mi|Gi)?B)', re.MULTILINE
 )
 
 
@@ -23,6 +23,8 @@ def convert_size(size_str: str) -> int:
         scale = 8589934592
     elif size_str.endswith('MiB'):
         scale = 8388608
+    else:
+        scale = 1
     return int(round(base_size * scale))
 
 
@@ -48,7 +50,7 @@ def prune(loki_url: str = None, dry_run: bool = False):
         sys.exit(1)
 
     d = {f['name']: {'blobs': f['blobs'], 'size': f['size']} for f in field_gen(result.stdout)}
-    console.print(d)
+    logger.debug(json.dumps(d, indent=4))
 
     if loki_url is not None and not dry_run:
         send_to_loki(loki_url, line=json.dumps(d), backup='prune')

src/restic/snapshots.py

@@ -35,4 +35,7 @@ def main(loki_url: str = None):
 
 
 if __name__ == '__main__':
+    from dotenv import load_dotenv
+    
+    load_dotenv()
     main()