From f679c48a24b200195ca703bf673a2ae72dc65d1c Mon Sep 17 00:00:00 2001
From: matteo4375 <matteo4375@gmail.com>
Date: Sat, 26 Oct 2024 12:31:40 -0400
Subject: apps: add option to include categories in queries

---
 lib/apps/application.vala | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'lib/apps/application.vala')

diff --git a/lib/apps/application.vala b/lib/apps/application.vala
index 0a2f73c..07b44e4 100644
--- a/lib/apps/application.vala
+++ b/lib/apps/application.vala
@@ -47,6 +47,17 @@ public class AstalApps.Application : Object {
      */
     public string[] keywords { owned get { return app.get_keywords(); } }
 
+    /**
+     * `Categories` field from the desktop file.
+     */
+    public string[] categories { owned get {
+        var categories = app.get_categories();
+        if (categories != null)
+            return categories.split(";");
+
+        return new string[0];
+    } }
+
     internal Application(string id, int? frequency = 0) {
         Object(app: new DesktopAppInfo(id));
         this.frequency = frequency;
@@ -94,6 +105,12 @@ public class AstalApps.Application : Object {
                 score.keywords = s;
             }
         }
+        foreach (var category in categories) {
+            var s = fuzzy_match_string(term, category);
+            if (s > score.categories) {
+                score.categories = s;
+            }
+        }
 
         return score;
     }
@@ -117,6 +134,11 @@ public class AstalApps.Application : Object {
                 score.keywords = keyword.down().contains(term.down()) ? 1 : 0;
             }
         }
+        foreach (var category in categories) {
+            if (score.categories == 0) {
+                score.categories = category.down().contains(term.down()) ? 1 : 0;
+            }
+        }
 
         return score;
     }
@@ -129,16 +151,21 @@ public class AstalApps.Application : Object {
             .set_member_name("executable").add_string_value(executable)
             .set_member_name("description").add_string_value(description)
             .set_member_name("icon_name").add_string_value(icon_name)
-            .set_member_name("frequency").add_int_value(frequency)
-            .set_member_name("keywords")
-            .begin_array();
+            .set_member_name("frequency").add_int_value(frequency);
 
+        builder.set_member_name("keywords").begin_array();
         foreach (string keyword in keywords) {
             builder.add_string_value(keyword);
         }
+        builder.end_array();
+
+        builder.set_member_name("categories").begin_array();
+        foreach (string category in categories) {
+            builder.add_string_value(category);
+        }
+        builder.end_array();
 
         return builder
-            .end_array()
             .end_object()
             .get_root();
     }
@@ -150,4 +177,5 @@ public struct AstalApps.Score {
     int executable;
     int description;
     int keywords;
+    int categories;
 }
-- 
cgit v1.2.3


From e5d183860e6b21fee97e427ecac4867559b1c6e4 Mon Sep 17 00:00:00 2001
From: Aylur <k.demeter@protonmail.com>
Date: Fri, 1 Nov 2024 13:44:03 +0000
Subject: fix: trailing empty category

---
 lib/apps/application.vala | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'lib/apps/application.vala')

diff --git a/lib/apps/application.vala b/lib/apps/application.vala
index 07b44e4..75b47e9 100644
--- a/lib/apps/application.vala
+++ b/lib/apps/application.vala
@@ -50,13 +50,16 @@ public class AstalApps.Application : Object {
     /**
      * `Categories` field from the desktop file.
      */
-    public string[] categories { owned get {
-        var categories = app.get_categories();
-        if (categories != null)
-            return categories.split(";");
-
-        return new string[0];
-    } }
+    public string[] categories {
+        owned get {
+            if (app.get_categories() == null)
+                return {};
+
+            var categories = app.get_categories();
+            var arr = categories.split(";");
+            return categories.has_suffix(";") ? arr[0:arr.length-1] : arr;
+        }
+    }
 
     internal Application(string id, int? frequency = 0) {
         Object(app: new DesktopAppInfo(id));
@@ -144,28 +147,26 @@ public class AstalApps.Application : Object {
     }
 
     internal Json.Node to_json() {
-        var builder = new Json.Builder()
-            .begin_object()
-            .set_member_name("name").add_string_value(name)
-            .set_member_name("entry").add_string_value(entry)
-            .set_member_name("executable").add_string_value(executable)
-            .set_member_name("description").add_string_value(description)
-            .set_member_name("icon_name").add_string_value(icon_name)
-            .set_member_name("frequency").add_int_value(frequency);
-
-        builder.set_member_name("keywords").begin_array();
+        var keyword_arr = new Json.Builder().begin_array();
         foreach (string keyword in keywords) {
-            builder.add_string_value(keyword);
+            keyword_arr.add_string_value(keyword);
         }
-        builder.end_array();
 
-        builder.set_member_name("categories").begin_array();
+        var category_arr = new Json.Builder().begin_array();
         foreach (string category in categories) {
-            builder.add_string_value(category);
+            category_arr.add_string_value(category);
         }
-        builder.end_array();
 
-        return builder
+        return new Json.Builder()
+            .begin_object()
+            .set_member_name("name").add_string_value(name)
+            .set_member_name("entry").add_string_value(entry)
+            .set_member_name("executable").add_string_value(executable)
+            .set_member_name("description").add_string_value(description)
+            .set_member_name("icon_name").add_string_value(icon_name)
+            .set_member_name("frequency").add_int_value(frequency)
+            .set_member_name("keywords").add_value(keyword_arr.end_array().get_root())
+            .set_member_name("categories").add_value(category_arr.end_array().get_root())
             .end_object()
             .get_root();
     }
-- 
cgit v1.2.3