- Workaround missing disabled fonts - Closes #446

JerryCasiano · JerryCasiano · commit fa8cbee237a7 · 2025-04-27T14:43:41.000-04:00
diff --git a/build-aux/ui/application-preferences-symbolic.svg b/build-aux/ui/application-preferences-symbolic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <path style="fill:#444444" d="M 6.25,1 6.1,2.84 A 5.5,5.5 0 0 0 4.49,3.77 L 2.81,2.98 1.06,6.02 2.58,7.07 A 5.5,5.5 0 0 0 2.5,8 5.5,5.5 0 0 0 2.58,8.93 L 1.06,9.98 2.81,13.02 4.48,12.23 A 5.5,5.5 0 0 0 6.1,13.15 L 6.25,15 H 9.75 L 9.9,13.16 A 5.5,5.5 0 0 0 11.51,12.23 L 13.19,13.02 14.94,9.98 13.42,8.93 A 5.5,5.5 0 0 0 13.5,8 5.5,5.5 0 0 0 13.42,7.07 L 14.94,6.02 13.19,2.98 11.52,3.77 A 5.5,5.5 0 0 0 9.9,2.85 L 9.75,1 Z M 8,6 A 2,2 0 0 1 10,8 2,2 0 0 1 8,10 2,2 0 0 1 6,8 2,2 0 0 1 8,6 Z"/>
+</svg>
diff --git a/build-aux/ui/gen_ui_resources.py b/build-aux/ui/gen_ui_resources.py
@@ -33,13 +33,14 @@
 
     'actions' : [
         'action-unavailable-symbolic.svg',
+        'application-preferences-symbolic.svg',
         'document-edit-symbolic.svg',
         'edit-clear-symbolic.svg',
         'edit-clear-symbolic-rtl.svg',
         'edit-find-symbolic.svg',
         'edit-select-all-symbolic.svg',
-        'edit-undo-symbolic-rtl.svg',
         'edit-undo-symbolic.svg',
+        'edit-undo-symbolic-rtl.svg',
         'format-justify-center-symbolic.svg',
         'format-justify-fill-symbolic.svg',
         'format-justify-left-symbolic.svg',
@@ -48,6 +49,7 @@
         'go-previous-symbolic.svg',
         'list-add-symbolic.svg',
         'list-drag-handle-symbolic.svg',
+        'list-remove-all-symbolic.svg',
         'list-remove-symbolic.svg',
         'open-menu-symbolic.svg',
         'panel-right-symbolic.svg',
@@ -82,7 +84,8 @@
         'dialog-question-symbolic.svg',
         'folder-open-symbolic.svg',
         'network-error-symbolic.svg',
-        'network-offline-symbolic.svg'
+        'network-offline-symbolic.svg',
+        'google-fonts-symbolic.svg'
     ]
 
 }
diff --git a/build-aux/ui/google-fonts-symbolic.svg b/build-aux/ui/google-fonts-symbolic.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+ </defs>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="M 2,0 C 0.892,0 0,0.892 0,2 V 14 C 0,15.108 0.892,16 2,16 H 14 C 15.108,16 16,15.108 16,14 V 2 C 16,0.892 15.108,0 14,0 Z M 7.8984,2.502 C 9.1926,2.4785 10.496,2.9086 11.547,3.7949 L 10.256,5.3242 C 8.9092,4.188 6.9508,4.2217 5.6465,5.4062 4.3421,6.5909 4.1177,8.5385 5.1191,9.9883 6.1205,11.438 8.0205,11.918 9.5898,11.117 10.472,10.667 11.073,9.8908 11.336,9.0059 H 8 V 7.0059 L 13.398,7 C 13.832,9.3547 12.689,11.781 10.5,12.898 8.0515,14.148 5.0369,13.389 3.4746,11.127 1.9123,8.8652 2.2658,5.7738 4.3008,3.9258 5.3183,3.0017 6.6043,2.526 7.8984,2.502 Z"/>
+</svg>
diff --git a/build-aux/ui/list-remove-all-symbolic.svg b/build-aux/ui/list-remove-all-symbolic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <path style="fill:#444444" d="M 15,4 H 5 V 6 H 15 Z M 13,7 H 3 V 9 H 13 Z M 11,10 H 1 V 12 H 11 Z"/>
+</svg>
diff --git a/fedora/font-manager.spec b/fedora/font-manager.spec
@@ -15,7 +15,7 @@
 
 Name:       font-manager
 Version:    %{MajorVersion}.%{MinorVersion}.%{PatchVersion}.%{build_timestamp}
-Release:    3
+Release:    4
 Summary:    A simple font management application for Gtk+ Desktop Environments
 License:    GPLv3+
 Url:        http://fontmanager.github.io/
@@ -198,5 +198,5 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.metain
 %endif
 
 %changelog
-* Wed Mar 5 2025 JerryCasiano <JerryCasiano@gmail.com> 0.9.4-3
+* Wed Mar 5 2025 JerryCasiano <JerryCasiano@gmail.com> 0.9.4-4
 - Refer to https://github.com/FontManager/font-manager/commits/master for changes.
diff --git a/lib/fontconfig/font-manager-fontconfig.c b/lib/fontconfig/font-manager-fontconfig.c
@@ -200,6 +200,37 @@ font_manager_list_available_font_families (void)
     return result;
 }
 
+/**
+ * font_manager_get_files_for_family:
+ *
+ * Returns: (transfer full) (nullable):
+ * a newly created #FontManagerStringSet containing filepaths or %NULL.
+ * Free the returned object using #g_object_unref
+ */
+FontManagerStringSet *
+font_manager_get_files_for_family (const char *family)
+{
+    g_return_val_if_fail(family != NULL, NULL);
+    FcPattern *pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, family, NULL);
+    FcObjectSet *objectset = FcObjectSetBuild(FC_FAMILY, FC_FILE, NULL);
+    FcFontSet *fontset = FcFontList(FcConfigGetCurrent(), pattern, objectset);
+
+    FontManagerStringSet * result = font_manager_string_set_new();
+
+    for (int i = 0; i < fontset->nfont; i++) {
+        FcChar8 *file;
+        if (FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &file) == FcResultMatch) {
+            font_manager_string_set_add(result, (const char *) file);
+        }
+    }
+
+    FcObjectSetDestroy(objectset);
+    FcPatternDestroy(pattern);
+    FcFontSetDestroy(fontset);
+    font_manager_string_set_sort(result);
+    return result;
+}
+
 /**
  * font_manager_get_available_fonts:
  * @family_name: (nullable): family name or %NULL
diff --git a/lib/fontconfig/font-manager-fontconfig.h b/lib/fontconfig/font-manager-fontconfig.h
@@ -56,6 +56,7 @@ gboolean font_manager_add_application_font (const gchar *filepath);
 gboolean font_manager_add_application_font_directory (const gchar *dir);
 gboolean font_manager_update_font_configuration (void);
 GList * font_manager_list_available_font_files (void);
+FontManagerStringSet * font_manager_get_files_for_family (const char *family);
 FontManagerStringSet * font_manager_list_available_font_families (void);
 GList * font_manager_get_langs_from_fontconfig_pattern (FcPattern *pattern);
 JsonObject * font_manager_get_attributes_from_filepath (const gchar *filepath, GError **error);
diff --git a/lib/ui/gresources.xml b/lib/ui/gresources.xml
@@ -3,15 +3,15 @@
   <gresource prefix="/com/github/FontManager/FontManager">
     <file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/com.github.FontManager.FontManager-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/apps/preferences-desktop-locale-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/application-preferences-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/action-unavailable-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/application-preferences-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/document-edit-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-clear-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-clear-symbolic-rtl.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-find-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-select-all-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-undo-symbolic-rtl.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-undo-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/edit-undo-symbolic-rtl.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/format-justify-center-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/format-justify-fill-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/format-justify-left-symbolic.svg</file>
@@ -20,8 +20,8 @@
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/go-previous-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/list-add-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/list-drag-handle-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/list-remove-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/list-remove-all-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/list-remove-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/open-menu-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/panel-right-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/actions/panel-right-symbolic-rtl.svg</file>
@@ -44,6 +44,7 @@
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/status/folder-open-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/status/network-error-symbolic.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">icons/scalable/status/network-offline-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" compressed="true">icons/scalable/status/google-fonts-symbolic.svg</file>
   </gresource>
   <gresource prefix="/com/github/FontManager/FontManager/ui">
     <file compressed="true">FontManager.css</file>
diff --git a/lib/ui/icons/scalable/status/google-fonts-symbolic.svg b/lib/ui/icons/scalable/status/google-fonts-symbolic.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+ </defs>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="M 2,0 C 0.892,0 0,0.892 0,2 V 14 C 0,15.108 0.892,16 2,16 H 14 C 15.108,16 16,15.108 16,14 V 2 C 16,0.892 15.108,0 14,0 Z M 7.8984,2.502 C 9.1926,2.4785 10.496,2.9086 11.547,3.7949 L 10.256,5.3242 C 8.9092,4.188 6.9508,4.2217 5.6465,5.4062 4.3421,6.5909 4.1177,8.5385 5.1191,9.9883 6.1205,11.438 8.0205,11.918 9.5898,11.117 10.472,10.667 11.073,9.8908 11.336,9.0059 H 8 V 7.0059 L 13.398,7 C 13.832,9.3547 12.689,11.781 10.5,12.898 8.0515,14.148 5.0369,13.389 3.4746,11.127 1.9123,8.8652 2.2658,5.7738 4.3008,3.9258 5.3183,3.0017 6.6043,2.526 7.8984,2.502 Z"/>
+</svg>
diff --git a/src/font-manager/Application.vala b/src/font-manager/Application.vala
@@ -139,7 +139,6 @@ namespace FontManager {
                     reload();
                 } else {
                     update_font_configuration();
-                    load_user_font_resources();
                     available_fonts = get_sorted_font_list(null);
                     db.update_started.connect(() => { hold(); });
                     db.update_complete.connect(() => { GLib.stdout.printf("\n"); release(); });
@@ -169,10 +168,7 @@ namespace FontManager {
         }
 
         public string list_full () throws GLib.DBusError, GLib.IOError {
-            update_font_configuration();
-            load_user_font_resources();
-            Json.Object _fonts = get_available_fonts(null);
-            Json.Array sorted_fonts = sort_json_font_listing(_fonts);
+            Json.Array sorted_fonts = get_sorted_font_list(null);
             return print_json_array(sorted_fonts, true);
         }
 
diff --git a/src/font-manager/ArchiveManager.vala b/src/font-manager/ArchiveManager.vala
@@ -22,6 +22,17 @@
 
 namespace FontManager {
 
+/**
+ * SECTION: font-manager-archive-manager
+ * @short_description: Extract and generate compressed files using libarchive.
+ * @title: Archive Manager
+ *
+ * Utility functions to extract formats supported by libarchive and generate ZIP files.
+ */
+
+    /**
+     * Mimetypes supported during extraction operations.
+     */
     public const string LIBARCHIVE_MIME_TYPES [] = {
         "application/epub+zip",
         "application/vnd.debian.binary-package",
@@ -51,7 +62,7 @@ namespace FontManager {
         "application/zip"
     };
 
-    public class ArchiveManager : Object {
+    namespace ArchiveManager {
 
         Archive.Entry add_entry (Archive.Write archive, File file, FileInfo file_info, string path) {
             Archive.Entry entry = new Archive.Entry();
@@ -117,6 +128,17 @@ namespace FontManager {
             return;
         }
 
+        /**
+         * font_manager_archive_manager_compress:
+         *
+         * Generates a ZIP archive from the provided set of file paths
+         *
+         * @self: #FontManagerArchiveManager
+         * @filelist #FontManagerStringSet of paths to include in archive
+         * @output_file #GFile used to determine name and directory of resulting archive file
+         *
+         * Returns: %TRUE if archive was successfully extracted
+         */
         public bool compress (StringSet filelist, File output_file) {
 
             return_val_if_fail(filelist.size > 0, false);
@@ -160,6 +182,17 @@ namespace FontManager {
             return true;
         }
 
+        /**
+         * font_manager_archive_manager_extract:
+         *
+         * Extract the supplied archive into the specified directory
+         *
+         * @self: #FontManagerArchiveManager
+         * @file #GFile to extract
+         * @dest_dir #GFile directory to use for extraction
+         *
+         * Returns: %TRUE if archive was successfully created
+         */
         public bool extract (File file, File dest_dir) {
 
             return_val_if_fail(file.query_exists(), false);
diff --git a/src/font-manager/Collections.vala b/src/font-manager/Collections.vala
@@ -31,11 +31,9 @@ namespace FontManager {
         public StringSet? available_families { get; set; default = null; }
 
         construct {
-            update_font_configuration();
-            load_user_font_resources();
             available_families = list_available_font_families();
-            load();
             notify["sort-type"].connect_after(on_sort_type_changed);
+            load();
         }
 
         void on_sort_type_changed () {
@@ -423,7 +421,6 @@ namespace FontManager {
             var collections = ((CollectionListView) source);
             var outpath = Path.build_filename(home, collections.selected_item.name);
             var output = File.new_for_path(outpath);
-            var libarchive = new ArchiveManager();
             var filelist = ((Collection) collections.selected_item).get_filelist();
             int64 filesize = get_filelist_file_size(filelist);
             if (filesize > 125000000) {
@@ -435,7 +432,7 @@ namespace FontManager {
                 notification.set_icon(icon);
                 get_default_application().send_notification("compress-started", notification);
             }
-            bool result = libarchive.compress(filelist, output);
+            bool result = ArchiveManager.compress(filelist, output);
             task.return_boolean(result);
             return;
 #else
diff --git a/src/font-manager/Library.vala b/src/font-manager/Library.vala
@@ -120,8 +120,6 @@ namespace FontManager {
                     }
                 }
 
-                var libarchive = new ArchiveManager();
-
                 foreach (var path in filelist) {
 
                     File file = File.new_for_path(path);
@@ -133,7 +131,7 @@ namespace FontManager {
                         continue;
                     }
 
-                    if (!libarchive.extract(file, tmp)) {
+                    if (!ArchiveManager.extract(file, tmp)) {
                         critical("Failed to extract archive : %s", path);
                         continue;
                     }
diff --git a/src/font-manager/Sidebar.vala b/src/font-manager/Sidebar.vala
@@ -136,8 +136,6 @@ namespace FontManager {
 
         StringSet get_available_sorted () {
             var result = ((CollectionListModel) collections.model).get_full_contents();
-            update_font_configuration();
-            load_user_font_resources();
             var available = list_available_font_families();
             result.retain_all(available);
             return result;
diff --git a/src/font-manager/Utils.vala b/src/font-manager/Utils.vala
@@ -195,7 +195,7 @@ namespace FontManager {
 
     // Adds user configured font sources (directories) and rejected fonts to our
     // FcConfig so that we can render fonts which are not actually "installed".
-    public bool load_user_font_resources () {
+    public bool load_user_font_resources (Reject? reject = null) {
         clear_application_fonts();
         bool res = true;
         var legacy_font_dir = Path.build_filename(Environment.get_home_dir(), ".fonts");
@@ -217,14 +217,20 @@ namespace FontManager {
             debug("Loaded user font resource : %s", source.path);
         });
         source_model = null;
-        var reject = new Reject();
-        reject.load();
         StringSet? files = null;
-        try {
-            Database db = DatabaseProxy.get_default_db();
-            files = reject.get_rejected_files(db);
-        } catch (Error e) {
-            warning(e.message);
+        if (reject == null) {
+            var _reject = new Reject();
+            _reject.load();
+            try {
+                Database db = DatabaseProxy.get_default_db();
+                files = _reject.get_rejected_files(db);
+            } catch (Error e) {
+                warning(e.message);
+            }
+        } else {
+            files = new StringSet();
+            foreach (string family in reject)
+                files.add_all(get_files_for_family(family));
         }
         if (files != null) {
             foreach (string path in files) {
@@ -235,15 +241,46 @@ namespace FontManager {
         return res;
     }
 
+    Reject? have_missing_rejects () {
+        var res = new Reject();
+        res.load();
+        try {
+            Database db = DatabaseProxy.get_default_db();
+            StringSet? files = res.get_rejected_files(db);
+            // This means files were either removed outside of the application,
+            // the database was deleted or database version was bumped.
+            if (files.size == res.size)
+                res = null;
+        } catch (Error e) {
+            warning(e.message);
+        }
+        return res;
+    }
+
     Json.Array get_sorted_font_list (Pango.Context? ctx) {
+        Reject? reject = have_missing_rejects();
+        if (reject != null) {
+            // If there is a discrepancy between families listed as disabled
+            // and families in the database delete the configuration so that
+            // Fontconfig returns a full list.
+            File config = File.new_for_path(reject.get_filepath());
+            try {
+                config.delete();
+            } catch (Error e) {
+                warning(e.message);
+            }
+        }
         update_font_configuration();
-        if (load_user_font_resources()) {
+        if (load_user_font_resources(reject)) {
             if (ctx != null)
                 clear_pango_cache(ctx);
-        } else
+        } else {
             critical("Failed to load user font resources, will be unable to render properly");
+        }
         var fonts = get_available_fonts(null);
         var sorted_fonts = sort_json_font_listing(fonts);
+        if (reject != null)
+            reject.save();
         return sorted_fonts;
     }
 
diff --git a/src/font-manager/preferences/Substitutions.vala b/src/font-manager/preferences/Substitutions.vala
diff --git a/src/font-manager/web/google/FontList.vala b/src/font-manager/web/google/FontList.vala
diff --git a/src/font-manager/web/google/GoogleFonts.vala b/src/font-manager/web/google/GoogleFonts.vala
