Merge branch 'main' into cli-interface

Author: alainm23

.github/workflows/flatpak.yml

@@ -2,7 +2,7 @@ name: Build Flatpak
 'on':
   push:
     branches:
-      - master
+      - main
 jobs:
   flatpak:
     name: flatpak

ARCHITECTURE.md

@@ -37,13 +37,13 @@ sequenceDiagram
         Application->>User:Initialize UI with data
 ```
 
-When the user opens the application, the `App.vala` runs `MainWindow.vala` to initialize the application. First the app starts the SQLite database and connects to it ([src/MainWindow.vala\#L156](https://github.com/alainm23/planify/blob/master/src/MainWindow.vala#L156)). The database will return the stored data, including any external data sources that the program should synchronize with. Then, the program will start the synchronization process for all connected external data sources ([src/MainWindow.vala\#L198](https://github.com/alainm23/planify/blob/master/src/MainWindow.vala#L198)). The data will be fetched asynchronously. Finally, the UI is populated with the loaded data and displayed to the user.
+When the user opens the application, the `App.vala` runs `MainWindow.vala` to initialize the application. First the app starts the SQLite database and connects to it ([src/MainWindow.vala\#L156](https://github.com/alainm23/planify/blob/main/src/MainWindow.vala#L156)). The database will return the stored data, including any external data sources that the program should synchronize with. Then, the program will start the synchronization process for all connected external data sources ([src/MainWindow.vala\#L198](https://github.com/alainm23/planify/blob/main/src/MainWindow.vala#L198)). The data will be fetched asynchronously. Finally, the UI is populated with the loaded data and displayed to the user.
 
 ## Switching pages
 
 ![](docs/image4.png)
 
-The Planify app has three main Views. The label list ([src/Views/Label](https://github.com/alainm23/planify/tree/master/src/Views/Label)), the task list ([src/Views/Project/List.vala](https://github.com/alainm23/planify/blob/master/src/Views/Project/List.vala)), and the day list ([src/Views/Scheduled](https://github.com/alainm23/planify/tree/master/src/Views/Scheduled)). As the user, as you navigate around the application, you can transition between these different states, changing which view is in your main window. By using the Inbox, Today, Scheduled, and Labels buttons in the sidebar, you can transition between those modes, which have specific Views associated with them. For example, if you press the Labels button, that will open a label list view. If you click on a specific label, you will be transitioned to a task list view with all of the tasks with that label attached. From here, you could transition to the day list view by pressing the Scheduled button in the sidebar.
+The Planify app has three main Views. The label list ([src/Views/Label](https://github.com/alainm23/planify/tree/main/src/Views/Label)), the task list ([src/Views/Project/List.vala](https://github.com/alainm23/planify/blob/main/src/Views/Project/List.vala)), and the day list ([src/Views/Scheduled](https://github.com/alainm23/planify/tree/main/src/Views/Scheduled)). As the user, as you navigate around the application, you can transition between these different states, changing which view is in your main window. By using the Inbox, Today, Scheduled, and Labels buttons in the sidebar, you can transition between those modes, which have specific Views associated with them. For example, if you press the Labels button, that will open a label list view. If you click on a specific label, you will be transitioned to a task list view with all of the tasks with that label attached. From here, you could transition to the day list view by pressing the Scheduled button in the sidebar.
 
 ## Adding a new task
 
@@ -75,13 +75,13 @@ For Todoist sources, it must retrieve a session token from the Todoist API. It m
 [core/Services/Todoist.vala\#L210](https://github.com/alainm23/planify/blob/4e40a7244c1d2b564e97e65508481f7c2e6ff038/core/Services/Todoist.vala#L210)
 
 For CalDAV Sources, it retrieves the authentication bearer token from storage, authenticates, retrieves & parses the XML, and merges or deletes calendars/tasks as necessary.
-[core/Services/CalDAV/Core.vala\#L234](https://github.com/alainm23/planify/blob/master/core/Services/CalDAV/Core.vala#L234)
+[core/Services/CalDAV/Core.vala\#L234](https://github.com/alainm23/planify/blob/main/core/Services/CalDAV/Core.vala#L234)
 
 `SyncButton.vala` has the ability to manually trigger a sync by broadcasting on its clicked signal. It also responds to events dispatched from the sources and updates its appearance accordingly when syncs start, fail, or finish.
-[src/Widgets/SyncButton.vala\#L73](https://github.com/alainm23/planify/blob/master/src/Widgets/SyncButton.vala#L73)
+[src/Widgets/SyncButton.vala\#L73](https://github.com/alainm23/planify/blob/main/src/Widgets/SyncButton.vala#L73)
 
 ## Reminders
 
 ![](docs/image3.png)
 
-When a reminder is created in the UI or loaded from the database at startup, it will run `reminder_added()` in [Notification.vala](https://github.com/alainm23/planify/blob/master/src/Services/Notification.vala#L60). The code will first check if the time of the notification has already passed, and if it has, it will trigger the notification. If not, it will check whether or not the reminder is due today. If it is due today, it will set a timeout for the remaining time until the notification is due. If it is not due, it will not do anything. However, in [TimeMonitor.vala](https://github.com/alainm23/planify/blob/master/src/Services/TimeMonitor.vala), there is always a timeout set for midnight. At midnight, it will call `refresh()`, causing `Notification.vala` to rerun `reminder_added()` for all reminders. This in effect causes all reminders to check if they are due again, since it is now a new day. This loop continues until all reminders have been triggered.
+When a reminder is created in the UI or loaded from the database at startup, it will run `reminder_added()` in [Notification.vala](https://github.com/alainm23/planify/blob/main/src/Services/Notification.vala#L60). The code will first check if the time of the notification has already passed, and if it has, it will trigger the notification. If not, it will check whether or not the reminder is due today. If it is due today, it will set a timeout for the remaining time until the notification is due. If it is not due, it will not do anything. However, in [TimeMonitor.vala](https://github.com/alainm23/planify/blob/main/src/Services/TimeMonitor.vala), there is always a timeout set for midnight. At midnight, it will call `refresh()`, causing `Notification.vala` to rerun `reminder_added()` for all reminders. This in effect causes all reminders to check if they are due again, since it is now a new day. This loop continues until all reminders have been triggered.

README.md

@@ -10,7 +10,7 @@
   <h3 align="center">Never worry about forgetting things again</h3>
 </div>
 
-![Planify Screenshot](https://raw.githubusercontent.com/alainm23/planify/master/data/resources/screenshot/screenshot-03.png)
+![Planify Screenshot](https://raw.githubusercontent.com/alainm23/planify/main/data/resources/screenshot/screenshot-03.png)
 
 ## ✨ Features
 

core/Objects/Item.vala

@@ -62,7 +62,7 @@ public class Objects.Item : Objects.BaseObject {
     public Objects.DueDate due { get; set; default = new Objects.DueDate (); }
     public Gee.ArrayList<Objects.Label> labels { get; set; default = new Gee.ArrayList<Objects.Label> (); }
 
-    public Gee.ArrayList<Objects.Label> _get_labels () {
+    public Gee.ArrayList<Objects.Label> get_labels_list () {
         Gee.ArrayList<Objects.Label> return_value = new Gee.ArrayList<Objects.Label> ();
 
         foreach (Objects.Label label in labels) {
@@ -513,6 +513,10 @@ public class Objects.Item : Objects.BaseObject {
         ICal.Property ? related_to_property = ical_vtodo.get_first_property (ICal.PropertyKind.RELATEDTO_PROPERTY);
         if (related_to_property != null) {
             parent_id = related_to_property.get_relatedto ();
+            if (parent_id == id) {
+                warning ("Item/Task %s has a direct self-reference", id);
+                parent_id = "";
+            }
         } else {
             parent_id = "";
         }
@@ -601,7 +605,7 @@ public class Objects.Item : Objects.BaseObject {
             }
         }
 
-        foreach (var label in _get_labels ()) {
+        foreach (var label in get_labels_list ()) {
             if (!new_labels.has_key (label.id)) {
                 delete_item_label (label.id);
             }
@@ -945,6 +949,10 @@ public class Objects.Item : Objects.BaseObject {
         item_label_added (label);
     }
 
+    public void clean_labels () {
+        labels.clear ();
+    }
+
     public Objects.Label ? delete_item_label (string id) {
         Objects.Label ? return_value = null;
         return_value = get_label (id);
@@ -1681,10 +1689,22 @@ public class Objects.Item : Objects.BaseObject {
     }
 
     public bool was_archived () {
-        if (has_parent) {
+        return was_archived_internal (new Gee.HashSet<string> ());
+    }
+
+    private bool was_archived_internal (Gee.Set<string> visited) {
+        // Prevent infinite recursion with circular references
+        if (visited.contains (id)) {
+            warning ("Item/Task %s has a circular reference", id);
+            return false;
+        }
+
+        visited.add (id);
+
+        if (has_parent && _parent_id != id) { // Check for direct self-reference
             var parent_item = parent;
             if (parent_item != null) {
-                return parent_item.was_archived ();
+                return parent_item.was_archived_internal (visited);
             }
         }
 
@@ -1836,7 +1856,7 @@ public class Objects.Item : Objects.BaseObject {
             }
         }
 
-        foreach (var label in _get_labels ()) {
+        foreach (var label in get_labels_list ()) {
             if (!new_labels.has_key (label.id)) {
                 delete_item_label (label.id);
                 update = true;

core/Objects/Project.vala

@@ -38,7 +38,7 @@ public class Objects.Project : Objects.BaseObject {
     public string sync_id { get; set; default = ""; }
     public string source_id { get; set; default = SourceType.LOCAL.to_string (); }
     public string calendar_url { get; set; default = ""; }
-    public string calendar_source_uid { get; set; default = ""; }   
+    public string calendar_source_uid { get; set; default = ""; }
 
     bool _show_completed = false;
     public bool show_completed {
@@ -119,7 +119,7 @@ public class Objects.Project : Objects.BaseObject {
             return _view_id;
         }
     }
-    
+
     string _parent_id_string;
     public string parent_id_string {
         get {
@@ -535,7 +535,7 @@ public class Objects.Project : Objects.BaseObject {
         var related_items = new Gee.ArrayList<Objects.Item> ();
 
         foreach (var item in items) {
-            string? parent_id = Util.find_string_value ("RELATED-TO", item.calendar_data);
+            string ? parent_id = Util.find_string_value ("RELATED-TO", item.calendar_data);
             if (parent_id != null && parent_id != "") {
                 Objects.Item ? parent_item = Services.Store.instance ().get_item (parent_id);
                 if (parent_item != null) {
@@ -772,7 +772,7 @@ public class Objects.Project : Objects.BaseObject {
         }
 
         var project_items = Services.Store.instance ().get_items_by_project (this);
-        
+
         int pending_tasks = 0;
         int items_total = 0;
         int items_checked = 0;
@@ -871,35 +871,35 @@ public class Objects.Project : Objects.BaseObject {
 
     private void handle_project_deletion () {
         loading = true;
-        
+
         if (source_type == SourceType.LOCAL) {
             Services.Store.instance ().delete_project.begin (this);
             return;
         }
-        
+
         if (source_type == SourceType.TODOIST) {
             delete_from_todoist ();
         } else if (source_type == SourceType.CALDAV) {
             delete_from_caldav ();
         }
     }
-    
+
     private void delete_from_todoist () {
         Services.Todoist.get_default ().delete.begin (this, (obj, res) => {
             handle_remote_delete_response (Services.Todoist.get_default ().delete.end (res));
         });
     }
-    
+
     private void delete_from_caldav () {
         var caldav_client = Services.CalDAV.Core.get_default ().get_client (source);
         caldav_client.delete_project.begin (this, (obj, res) => {
             handle_remote_delete_response (caldav_client.delete_project.end (res));
         });
     }
-    
+
     private void handle_remote_delete_response (HttpResponse response) {
         loading = false;
-        
+
         if (response.status) {
             Services.Store.instance ().delete_project.begin (this);
         } else {