Merge branch 'master' into feat/chrono

Author: alainm23

.github/workflows/caldav-test.yml

@@ -56,7 +56,7 @@ jobs:
           meson test -C build --suite=caldav-integration --print-errorlogs
 
       - name: Upload Meson test log
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: meson-test-log
           path: build/meson-logs/testlog.txt

.github/workflows/merge.yml

@@ -49,21 +49,16 @@ jobs:
           echo >> po/POTFILES
           echo "data/resources/ui/shortcuts.ui" >> po/POTFILES
 
-          # Update translations
-          xgettext --files-from=po/POTFILES --directory=. \
-            --output=po/io.github.alainm23.planify.pot --from-code=UTF-8 \
-            --keyword=_ --keyword=N_
-
-          for lang in $(cat po/LINGUAS); do
-            msgmerge --update --no-fuzzy-matching --backup=none po/$lang.po po/io.github.alainm23.planify.pot
-          done
+          # Update translations preserving metadata
+          python3 scripts/update_translations.py
 
       - name: Check for real changes
         id: check_changes
         run: |
-          # Exclude date-only changes (POT-Creation-Date and PO-Revision-Date)
+          # Exclude metadata-only changes
           if git diff --ignore-matching-lines='^"POT-Creation-Date:' \
                       --ignore-matching-lines='^"PO-Revision-Date:' \
+                      --ignore-matching-lines='^"Report-Msgid-Bugs-To:' \
                       --quiet po/; then
             echo "has_changes=false" >> $GITHUB_OUTPUT
           else
@@ -83,3 +78,11 @@ jobs:
           git add po/
           git diff --staged --quiet || git commit -m "Update translations"
           git push origin master
+
+      - name: Notify Weblate of changes
+        if: steps.check_changes.outputs.has_changes == 'true'
+        run: |
+          curl -X POST "https://hosted.weblate.org/api/components/planner/io-github-alainm23-planify/repository/" \
+            -H "Authorization: Token ${{ secrets.WEBLATE_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d '{"operation": "pull"}'

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

README.md

@@ -1,7 +1,7 @@
 [![Please do not theme this app](https://stopthemingmy.app/badge.svg)](https://stopthemingmy.app)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
 <a href="https://hosted.weblate.org/engage/planner/">
-<img src="https://hosted.weblate.org/widget/planner/translations/svg-badge.svg" alt="Translation status" />
+<img src="https://hosted.weblate.org/widget/planner/io-github-alainm23-planify/svg-badge.svg" alt="Estado de la traducción" />
 </a>
 
 <div align="center">
@@ -176,4 +176,4 @@ If you find Planify useful, consider supporting its development:
   <br><br>
   <img src="https://img.shields.io/github/stars/alainm23/planify?style=social" alt="GitHub stars">
   <img src="https://img.shields.io/github/forks/alainm23/planify?style=social" alt="GitHub forks">
-</div>
+</div>

core/Objects/Item.vala

@@ -1369,18 +1369,42 @@ public class Objects.Item : Objects.BaseObject {
                 }
             });
         } else if (project.source_type == SourceType.CALDAV) {
-            loading = true;
-            var caldav_client = Services.CalDAV.Core.get_default ().get_client (project.source);
-            caldav_client.delete_item.begin (this, (obj, res) => {
-                HttpResponse response = caldav_client.delete_item.end (res);
-                loading = false;
+            delete_caldav.begin ();
+        }
+    }
 
-                if (response.status) {
-                    Services.Store.instance ().delete_item (this);
-                } else {
-                    Services.EventBus.get_default ().send_error_toast (response.error_code, response.error);
-                }
-            });
+    private async void delete_caldav () {
+        loading = true;
+        var caldav_client = Services.CalDAV.Core.get_default ().get_client (project.source);
+        
+        try {
+            yield delete_subitems_caldav (this, caldav_client);
+            
+            var response = yield caldav_client.delete_item (this);
+            
+            if (!response.status) {
+                throw new IOError.FAILED (response.error);
+            }
+            
+            Services.Store.instance ().delete_item (this);
+        } catch (Error e) {
+            Services.EventBus.get_default ().send_error_toast (0, e.message);
+        }
+        
+        loading = false;
+    }
+
+    private async void delete_subitems_caldav (Objects.Item item, Services.CalDAV.CalDAVClient caldav_client) throws Error {
+        foreach (Objects.Item subitem in Services.Store.instance ().get_subitems (item)) {
+            yield delete_subitems_caldav (subitem, caldav_client);
+            
+            var response = yield caldav_client.delete_item (subitem);
+
+            if (!response.status) {
+                throw new IOError.FAILED (response.error);
+            }
+            
+            Services.Store.instance ().delete_item (subitem);
         }
     }
 
@@ -1495,12 +1519,12 @@ public class Objects.Item : Objects.BaseObject {
     }
 
     public void move (Objects.Project project, string _section_id) {
-        loading = true;
-        show_item = false;
-
         if (project.source_type == SourceType.LOCAL) {
             _move (project.id, _section_id);
         } else if (project.source_type == SourceType.TODOIST) {
+            loading = true;
+            sensitive = false;
+            
             string move_id = project.id;
             string move_type = "project_id";
             if (_section_id != "") {
@@ -1511,7 +1535,6 @@ public class Objects.Item : Objects.BaseObject {
             Services.Todoist.get_default ().move_item.begin (this, move_type, move_id, (obj, res) => {
                 var response = Services.Todoist.get_default ().move_item.end (res);
                 loading = false;
-                show_item = true;
 
                 if (response.status) {
                     _move (project.id, _section_id);
@@ -1520,6 +1543,9 @@ public class Objects.Item : Objects.BaseObject {
                 }
             });
         } else if (project.source_type == SourceType.CALDAV) {
+            loading = true;
+            sensitive = false;
+            
             move_caldav_recursive.begin (project, _section_id);
         }
     }
@@ -1738,4 +1764,29 @@ public class Objects.Item : Objects.BaseObject {
 
         return response;
     }
+
+    public void to_string () {
+        print ("_________________________________\n");
+        print ("ID: %s\n", id);
+        print ("Content: %s\n", content);
+        print ("Description: %s\n", description);
+        print ("Project ID: %s\n", project_id);
+        print ("Section ID: %s\n", section_id);
+        print ("Parent ID: %s\n", parent_id);
+        print ("Priority: %d (%s)\n", priority, priority_text);
+        print ("Checked: %s\n", checked ? "true" : "false");
+        print ("Pinned: %s\n", pinned ? "true" : "false");
+        print ("Has Due: %s\n", has_due ? "true" : "false");
+        if (has_due) {
+            print ("Due Date: %s\n", due.date);
+        }
+        print ("Child Order: %d\n", child_order);
+        print ("Added At: %s\n", added_at);
+        print ("Completed At: %s\n", completed_at);
+        print ("Labels: %d\n", labels.size);
+        foreach (var label in labels) {
+            print ("  - %s\n", label.name);
+        }
+        print ("---------------------------------\n");
+    }
 }

core/Objects/Project.vala

@@ -753,11 +753,13 @@ public class Objects.Project : Objects.BaseObject {
         int items_checked = 0;
 
         foreach (Objects.Item item in Services.Store.instance ().get_items_by_project (this)) {
-            if (!item.was_archived ()) {
-                items_total++;
-                if (item.checked) {
-                    items_checked++;
-                }
+            if (!is_archived && item.was_archived ()) {
+                continue;
+            }
+
+            items_total++;
+            if (item.checked) {
+                items_checked++;
             }
         }