From d98c3d46e5d4a673e9921a3fc2e43dedc061fd82 Mon Sep 17 00:00:00 2001
From: Samuel Woon <samuel.woon@protonmail.com>
Date: Fri, 4 Sep 2020 07:09:11 -0500
Subject: [PATCH] Use dt.now everywhere. By @samuel-w

Fixes #185
---
 src/vorta/models.py               | 7 +++++--
 src/vorta/views/extract_dialog.py | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vorta/models.py b/src/vorta/models.py
index a7dcdeda..0d04b484 100644
--- a/src/vorta/models.py
+++ b/src/vorta/models.py
@@ -8,6 +8,7 @@ import json
 import os
 import sys
 from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta as rd
 
 import peewee as pw
 from playhouse.migrate import SqliteMigrator, migrate
@@ -26,6 +27,7 @@ class JSONField(pw.TextField):
 
     From: https://gist.github.com/rosscdh/f4f26758b0228f475b132c688f15af2b
     """
+
     def db_value(self, value):
         """Convert the python value for storage in the database."""
         return value if value is None else json.dumps(value)
@@ -38,7 +40,7 @@ class JSONField(pw.TextField):
 class RepoModel(pw.Model):
     """A single remote repo with unique URL."""
     url = pw.CharField(unique=True)
-    added_at = pw.DateTimeField(default=datetime.utcnow)
+    added_at = pw.DateTimeField(default=datetime.now)
     encryption = pw.CharField(null=True)
     unique_size = pw.IntegerField(null=True)
     unique_csize = pw.IntegerField(null=True)
@@ -177,6 +179,7 @@ class SettingsModel(pw.Model):
 
 class BackupProfileMixin:
     """Extend to support multiple profiles later."""
+
     def profile(self):
         return BackupProfileModel.get(id=self.window().current_profile.id)
 
@@ -366,5 +369,5 @@ def init_db(con=None):
         s.save()
 
     # Delete old log entries after 3 months.
-    three_months_ago = datetime.now() - timedelta(days=180)
+    three_months_ago = datetime.now() - rd(months=3)
     EventLogModel.delete().where(EventLogModel.start_time < three_months_ago)
diff --git a/src/vorta/views/extract_dialog.py b/src/vorta/views/extract_dialog.py
index 75ff0f42..4f135910 100644
--- a/src/vorta/views/extract_dialog.py
+++ b/src/vorta/views/extract_dialog.py
@@ -12,7 +12,6 @@ from vorta.views.tree_view import TreeModel
 
 uifile = get_asset("UI/extractdialog.ui")
 ExtractDialogUI, ExtractDialogBase = uic.loadUiType(uifile)
-ISO_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
 
 
 class ExtractDialog(ExtractDialogBase, ExtractDialogUI):