diff --git a/maloja/__init__.py b/maloja/__init__.py index ce9990e..3ea1919 100644 --- a/maloja/__init__.py +++ b/maloja/__init__.py @@ -7,7 +7,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,0,14 +version = 2,1 versionstr = ".".join(str(n) for n in version) diff --git a/maloja/controller.py b/maloja/controller.py index 1e48bf7..2166b2c 100755 --- a/maloja/controller.py +++ b/maloja/controller.py @@ -161,9 +161,9 @@ def loadlastfm(filename): def direct(): from . import server -def backup(level="full"): +def backup(level="full",folder=origpath): import tarfile - from datetime import date + from datetime import datetime import glob @@ -186,10 +186,10 @@ def backup(level="full"): for g in user_files: real_files += glob.glob(g) - today = date.today() - datestr = "-".join((str(today.year),str(today.month),str(today.day))) - filename = "maloja_backup_" + datestr + ".tar.gz" - archivefile = os.path.join(origpath,filename) + now = datetime.utcnow() + timestr = now.strftime("%Y_%m_%d_%H_%M_%S") + filename = "maloja_backup_" + timestr + ".tar.gz" + archivefile = os.path.join(folder,filename) assert not os.path.exists(archivefile) with tarfile.open(name=archivefile,mode="x:gz") as archive: for f in real_files: diff --git a/maloja/data_files/backups/dummy b/maloja/data_files/backups/dummy new file mode 100644 index 0000000..e69de29 diff --git a/maloja/fixexisting.py b/maloja/fixexisting.py index 301cce5..6f36f4d 100644 --- a/maloja/fixexisting.py +++ b/maloja/fixexisting.py @@ -7,6 +7,7 @@ from .cleanup import CleanerAgent from doreah.logging import log import difflib import datetime +from .controller import backup wendigo = CleanerAgent() @@ -17,6 +18,8 @@ pthj = os.path.join def fix(): + backup(level="minimal",folder=pthj(DATA_DIR,"backups")) + now = datetime.datetime.utcnow() nowstr = now.strftime("%Y_%m_%d_%H_%M_%S") datestr = now.strftime("%Y/%m/%d")