From dfecc40d2baf1908dbe465c312d14749e5d28b28 Mon Sep 17 00:00:00 2001 From: George Lacey Date: Tue, 4 May 2021 12:46:35 +0100 Subject: [PATCH] Create top level package --- src/borgmanager/__init__.py | 0 src/{ => borgmanager}/borg/__init__.py | 0 src/{ => borgmanager}/borg/archive.py | 0 src/{ => borgmanager}/borg/error.py | 0 src/{ => borgmanager}/borg/repo.py | 4 ++-- src/{ => borgmanager}/borg/stats.py | 0 src/{ => borgmanager}/database/__init__.py | 0 src/{ => borgmanager}/database/borgdatabase.py | 0 src/{ => borgmanager}/database/connection/__init__.py | 0 .../database/connection/archiveconn.py | 0 .../database/connection/databaseconnection.py | 6 +----- .../database/connection/errorconn.py | 0 src/{ => borgmanager}/database/connection/repoconn.py | 0 .../database/connection/statsconn.py | 0 src/borgoutputhandler.py | 2 +- src/main.py | 11 +++++++---- 16 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 src/borgmanager/__init__.py rename src/{ => borgmanager}/borg/__init__.py (100%) rename src/{ => borgmanager}/borg/archive.py (100%) rename src/{ => borgmanager}/borg/error.py (100%) rename src/{ => borgmanager}/borg/repo.py (87%) rename src/{ => borgmanager}/borg/stats.py (100%) rename src/{ => borgmanager}/database/__init__.py (100%) rename src/{ => borgmanager}/database/borgdatabase.py (100%) rename src/{ => borgmanager}/database/connection/__init__.py (100%) rename src/{ => borgmanager}/database/connection/archiveconn.py (100%) rename src/{ => borgmanager}/database/connection/databaseconnection.py (95%) rename src/{ => borgmanager}/database/connection/errorconn.py (100%) rename src/{ => borgmanager}/database/connection/repoconn.py (100%) rename src/{ => borgmanager}/database/connection/statsconn.py (100%) diff --git a/src/borgmanager/__init__.py b/src/borgmanager/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/borg/__init__.py b/src/borgmanager/borg/__init__.py similarity index 100% rename from src/borg/__init__.py rename to src/borgmanager/borg/__init__.py diff --git a/src/borg/archive.py b/src/borgmanager/borg/archive.py similarity index 100% rename from src/borg/archive.py rename to src/borgmanager/borg/archive.py diff --git a/src/borg/error.py b/src/borgmanager/borg/error.py similarity index 100% rename from src/borg/error.py rename to src/borgmanager/borg/error.py diff --git a/src/borg/repo.py b/src/borgmanager/borg/repo.py similarity index 87% rename from src/borg/repo.py rename to src/borgmanager/borg/repo.py index 3655ca1..639255c 100644 --- a/src/borg/repo.py +++ b/src/borgmanager/borg/repo.py @@ -17,5 +17,5 @@ class Repo(object): return cls(uuid, location, last_modified) @classmethod - def from_sql(cls, sql: list): - pass \ No newline at end of file + def from_sql(cls, sql: tuple): + return cls(sql[1], sql[2], sql[3], sql[0]) diff --git a/src/borg/stats.py b/src/borgmanager/borg/stats.py similarity index 100% rename from src/borg/stats.py rename to src/borgmanager/borg/stats.py diff --git a/src/database/__init__.py b/src/borgmanager/database/__init__.py similarity index 100% rename from src/database/__init__.py rename to src/borgmanager/database/__init__.py diff --git a/src/database/borgdatabase.py b/src/borgmanager/database/borgdatabase.py similarity index 100% rename from src/database/borgdatabase.py rename to src/borgmanager/database/borgdatabase.py diff --git a/src/database/connection/__init__.py b/src/borgmanager/database/connection/__init__.py similarity index 100% rename from src/database/connection/__init__.py rename to src/borgmanager/database/connection/__init__.py diff --git a/src/database/connection/archiveconn.py b/src/borgmanager/database/connection/archiveconn.py similarity index 100% rename from src/database/connection/archiveconn.py rename to src/borgmanager/database/connection/archiveconn.py diff --git a/src/database/connection/databaseconnection.py b/src/borgmanager/database/connection/databaseconnection.py similarity index 95% rename from src/database/connection/databaseconnection.py rename to src/borgmanager/database/connection/databaseconnection.py index cd48d60..acedc0b 100644 --- a/src/database/connection/databaseconnection.py +++ b/src/borgmanager/database/connection/databaseconnection.py @@ -120,11 +120,7 @@ class DatabaseConnection(ABC): # region QUERIES def get_all(self): - result = self.sql_execute_one(f"SELECT * FROM {self._sql_table};") - if result is None: - return None - else: - return result[0] + return self.sql_execute_all(f"SELECT * FROM {self._sql_table};") # endregion diff --git a/src/database/connection/errorconn.py b/src/borgmanager/database/connection/errorconn.py similarity index 100% rename from src/database/connection/errorconn.py rename to src/borgmanager/database/connection/errorconn.py diff --git a/src/database/connection/repoconn.py b/src/borgmanager/database/connection/repoconn.py similarity index 100% rename from src/database/connection/repoconn.py rename to src/borgmanager/database/connection/repoconn.py diff --git a/src/database/connection/statsconn.py b/src/borgmanager/database/connection/statsconn.py similarity index 100% rename from src/database/connection/statsconn.py rename to src/borgmanager/database/connection/statsconn.py diff --git a/src/borgoutputhandler.py b/src/borgoutputhandler.py index 6955cd4..c6a5e98 100644 --- a/src/borgoutputhandler.py +++ b/src/borgoutputhandler.py @@ -1,5 +1,5 @@ from datetime import datetime -import borg +from borgmanager import borg import json diff --git a/src/main.py b/src/main.py index e9d7f61..6bfd4fd 100644 --- a/src/main.py +++ b/src/main.py @@ -1,18 +1,21 @@ -from database import BorgDatabase +from borgmanager.database import BorgDatabase from sys import stdin from os.path import realpath from pathlib import Path import argparse from borgoutputhandler import BorgOutputHandler +from borgmanager.summary import Summary def main(args, path: Path): + db = BorgDatabase(path / 'borg.sqlite') if args.graph is not None: pass + elif args.summary is not None: + summary = Summary(db, args.summary) else: borg_output = " ".join(stdin.readlines()) bo = BorgOutputHandler(borg_output) - db = BorgDatabase(path / 'borg.sqlite') if bo.error: db.insert_error(bo.get_borg_error()) @@ -22,8 +25,8 @@ def main(args, path: Path): def get_args(): parser = argparse.ArgumentParser() - parser.add_argument("-g", "--graph", help="Produce graphs at specified location", - type=str) + parser.add_argument("-g", "--graph", help="Produce graphs at specified location", type=str) + parser.add_argument("-s", "--summary", help="Print summary", type=str) return parser.parse_args()