TaskBridgeApp 0.1.3b4__tar.gz → 0.1.3b6__tar.gz

{taskbridgeapp-0.1.3b4 → taskbridgeapp-0.1.3b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TaskBridgeApp
-Version: 0.1.3b4
+Version: 0.1.3b6
 Summary: Export your Apple Reminders & Notes to NextCloud, a local folder, or CalDav - and keep them in sync!
 Home-page: https://taskbridge.app/
 License: GPL-3.0-or-later
@@ -26,7 +26,7 @@ Requires-Dist: caldav (>=1.4.0,<2.0.0)
 Requires-Dist: darkdetect (>=0.8.0,<0.9.0)
 Requires-Dist: keyring (>=25.3.0,<26.0.0)
 Requires-Dist: markdown2 (>=2.5.3,<3.0.0)
-Requires-Dist: markdownify (>=1.0.0,<2.0.0)
+Requires-Dist: markdownify (>=1.1.0,<2.0.0)
 Requires-Dist: schedule (>=1.2.1,<2.0.0)
 Project-URL: Repository, https://github.com/keithvassallomt/taskbridge
 Description-Content-Type: text/markdown

{taskbridgeapp-0.1.3b4 → taskbridgeapp-0.1.3b6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "TaskBridgeApp"
-version = "0.1.3-beta.4"
+version = "0.1.3-beta.6"
 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 = ["Keith Vassallo <keith@vassallo.cloud>"]
@@ -28,7 +28,7 @@ keyring = "^25.3.0"
 schedule = "^1.2.1"
 caldav = "^1.4.0"
 markdown2 = "^2.5.3"
-markdownify = "^1.0.0"
+markdownify = "^1.1.0"
 
 [tool.poetry.group.dev.dependencies]
 py2app = "^0.28.7"
@@ -59,7 +59,7 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-tbcli = 'taskbridge.cli.tbcli:main'
+tbcli = 'taskbridgeapp.cli.tbcli:main'
 
 [tool.coverage.run]
 omit = [

{taskbridgeapp-0.1.3b4 → taskbridgeapp-0.1.3b6}/taskbridgeapp/reminders/model/reminder.py

@@ -270,10 +270,15 @@ class Reminder:
 
         """
         tasks_in_caldav = container.remote_calendar.cal_obj.search(todo=True, uid=self.uuid)
+
+        # Remote task using __TB__
+        if len(tasks_in_caldav) == 0:
+            tasks_in_caldav = container.remote_calendar.cal_obj.search(todo=True, uid=self.uuid.replace("x-apple-reminder://", "__TB__"))
+
         if len(tasks_in_caldav) > 0:
             remote = tasks_in_caldav[0]
             self.uuid = new_uuid
-            remote.icalendar_component["uid"] = self.uuid
+            remote.icalendar_component["uid"] = self.uuid.replace("x-apple-reminder://", "__TB__")
             remote.save()
             return True, 'Remote reminder UID updated'
         return False, 'Could not find remote reminder to update UUID: {} ({})'.format(self.uuid, self.name)

{taskbridgeapp-0.1.3b4 → taskbridgeapp-0.1.3b6}/taskbridgeapp/reminders/model/remindercontainer.py

@@ -568,7 +568,7 @@ class ReminderContainer:
                                     if r.uuid == deleted['local_uuid'] or r.name == deleted['local_name']), None)
             if remote_reminder is not None:
                 if helpers.confirm("Delete remote reminder {}".format(remote_reminder.name)):
-                    to_delete = container.remote_calendar.cal_obj.search(todo=True, uid=remote_reminder.uuid)
+                    to_delete = container.remote_calendar.cal_obj.search(todo=True, uid=remote_reminder.uuid.replace("x-apple-reminder://", "__TB__"))
                     if len(to_delete) > 0:
                         to_delete[0].delete()
                         container.remote_reminders.remove(remote_reminder)