Fixed modification date comparison bug in reminder sync.

pint-sized · May 30, 2024 · 85b073e · 85b073e
1 parent 05781ed
commit 85b073e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "TaskBridge"
-version = "0.1.2-beta.1"
+version = "0.1.2-beta.2"
 description = "Export your Apple Reminders & Notes to NextCloud, a local folder, or CalDav - and keep them in sync!"
 keywords = ["sync", "note sync", "reminder sync", "cloud notes", "cloud reminders"]
 authors = ["Pint-Sized Software <hello@pintsized.dev>"]

diff --git a/taskbridge/gui/about.ui b/taskbridge/gui/about.ui
@@ -93,7 +93,7 @@
    <item>
     <widget class="QLabel" name="lbl_version">
      <property name="text">
-      <string>Version 0.1.2-beta.1</string>
+      <string>Version 0.1.2-beta.2</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

diff --git a/taskbridge/reminders/model/remindercontainer.py b/taskbridge/reminders/model/remindercontainer.py
@@ -838,16 +838,17 @@ def sync_local_reminders_to_remote(self, result: dict, fail: str = None) -> tupl
             # Get the associated remote reminder, if any
             remote_reminder = next((r for r in self.remote_reminders
                                     if r.uuid == local_reminder.uuid or r.name == local_reminder.name), None)
-            if remote_reminder is None or local_reminder.modified_date > remote_reminder.modified_date:
+            if (remote_reminder is None or
+                    local_reminder.modified_date.replace(tzinfo=None) > remote_reminder.modified_date.replace(tzinfo=None)):
                 key = 'remote_added' if remote_reminder is None else 'remote_updated'
                 remote_reminder = copy.deepcopy(local_reminder)
                 if helpers.confirm("Upsert remote reminder {}".format(remote_reminder.name)):
                     success, data = remote_reminder.upsert_remote(self)
                     if not success or fail == "fail_upsert_remote":
                         return False, data
                     result[key].append(remote_reminder.name)
-            elif (local_reminder.modified_date < remote_reminder.modified_date) or fail in ["local_older", "fail_upsert_local",
-                                                                                            "fail_update_uuid"]:
+            elif ((local_reminder.modified_date.replace(tzinfo=None) < remote_reminder.modified_date.replace(tzinfo=None)) or
+                  fail in ["local_older", "fail_upsert_local", "fail_update_uuid"]):
                 key = 'local_updated'
                 if fail in ["local_older", "fail_upsert_local", "fail_update_uuid"]:
                     remote_reminder.upsert_remote(self)