Merge branch 'cristianfalvo-master'

Author: Tudmotu

constants.js

@@ -28,4 +28,6 @@ export const PrefsFields = {
     CLEAR_HISTORY_ON_INTERVAL       : 'clear-history-on-interval',
     CLEAR_HISTORY_INTERVAL          : 'clear-history-interval',
     NEXT_HISTORY_CLEAR              : 'next-history-clear',
+    CASE_SENSITIVE_SEARCH           : 'case-sensitive-search',
+    REGEX_SEARCH                    : 'regex-search',
 };

extension.js

@@ -45,6 +45,8 @@ let EXCLUDED_APPS             = [];
 let CLEAR_HISTORY_ON_INTERVAL = false;
 let CLEAR_HISTORY_INTERVAL    = 60;
 let NEXT_HISTORY_CLEAR        = -1;
+let CASE_SENSITIVE_SEARCH     = false;
+let REGEX_SEARCH              = false;
 
 export default class ClipboardIndicatorExtension extends Extension {
     enable () {
@@ -401,7 +403,10 @@ const ClipboardIndicator = GObject.registerClass({
     items. It the entry is empty, the section is restored with all items
     set as visible. */
     _onSearchTextChanged () {
-        let searchedText = this.searchEntry.get_text().toLowerCase();
+
+        // Text to be searched converted to lowercase if search is case insensitive
+        let searchedText = this.searchEntry.get_text();
+        if (!CASE_SENSITIVE_SEARCH) searchedText = searchedText.toLowerCase();
 
         if(searchedText === '') {
             this._getAllIMenuItems().forEach(function(mItem){
@@ -410,8 +415,21 @@ const ClipboardIndicator = GObject.registerClass({
         }
         else {
             this._getAllIMenuItems().forEach(function(mItem){
-                let text = mItem.clipContents.toLowerCase();
-                let isMatching = text.indexOf(searchedText) >= 0;
+                // Clip content converted to lowercase if search is case insensitive
+                let text = mItem.clipContents;
+                if (!CASE_SENSITIVE_SEARCH) text = text.toLowerCase();
+
+                let isMatching = false;
+                if (REGEX_SEARCH){
+                    /* Regex flags:
+                       - 'm' for multiline matching (when multiline content is copied)
+                       - 'i' for case insensitive matching when search is not set to case sensitive
+                    */
+                    let text_regex = new RegExp(searchedText, 'm' + (CASE_SENSITIVE_SEARCH ? '' : 'i'));
+                    isMatching = text_regex.test(text);
+                }else{
+                    isMatching = text.indexOf(searchedText) >= 0;
+                }
                 mItem.actor.visible = isMatching
             });
         }
@@ -1115,6 +1133,8 @@ const ClipboardIndicator = GObject.registerClass({
         CLEAR_HISTORY_ON_INTERVAL   = settings.get_boolean(PrefsFields.CLEAR_HISTORY_ON_INTERVAL);
         CLEAR_HISTORY_INTERVAL      = settings.get_int(PrefsFields.CLEAR_HISTORY_INTERVAL);
         NEXT_HISTORY_CLEAR          = settings.get_int(PrefsFields.NEXT_HISTORY_CLEAR);
+        CASE_SENSITIVE_SEARCH       = settings.get_boolean(PrefsFields.CASE_SENSITIVE_SEARCH);
+        REGEX_SEARCH                = settings.get_boolean(PrefsFields.REGEX_SEARCH);
     }
 
     async _onSettingsChange () {

prefs.js

@@ -13,6 +13,7 @@ export default class ClipboardIndicatorPreferences extends ExtensionPreferences
         const page = new Adw.PreferencesPage();
         page.add(settingsUI.ui);
         page.add(settingsUI.behavior);
+        page.add(settingsUI.search);
         page.add(settingsUI.limits);
         page.add(settingsUI.exclusion);
         page.add(settingsUI.topbar);
@@ -134,6 +135,14 @@ class Settings {
             halign: Gtk.Align.CENTER,
         });
 
+        this.case_sensitive_search = new Adw.SwitchRow({
+            title: _("Case-sensitive search")
+        });
+
+        this.regex_search = new Adw.SwitchRow({
+            title: _("Regular expression matching in search")
+        });
+
         this.field_exclusion_row_add_button.connect('clicked', () => {
             this.field_exclusion_row_add_button.set_sensitive(false);
             this.excluded_row_counter++;
@@ -167,6 +176,7 @@ class Settings {
         this.topbar =  new Adw.PreferencesGroup({ title: _('Topbar') });
         this.notifications =  new Adw.PreferencesGroup({ title: _('Notifications') });
         this.shortcuts =  new Adw.PreferencesGroup({ title: _('Shortcuts') });
+        this.search = new Adw.PreferencesGroup({title: _('Search')});
 
         this.ui.add(this.field_preview_size);
         this.ui.add(this.field_move_item_first);
@@ -196,6 +206,9 @@ class Settings {
         this.notifications.add(this.field_cycle_notification_toggle)
         this.notifications.add(this.field_confirm_clear_toggle);
 
+        this.search.add(this.case_sensitive_search);
+        this.search.add(this.regex_search);
+
         this.#buildShorcuts(this.shortcuts);
 
         this.schema.bind(PrefsFields.HISTORY_SIZE, this.field_size, 'value', Gio.SettingsBindFlags.DEFAULT);
@@ -219,6 +232,8 @@ class Settings {
         this.schema.bind(PrefsFields.CACHE_IMAGES, this.field_cache_images, 'active', Gio.SettingsBindFlags.DEFAULT);
         this.schema.bind(PrefsFields.CLEAR_HISTORY_ON_INTERVAL, this.field_clear_history_on_interval, 'active', Gio.SettingsBindFlags.DEFAULT);
         this.schema.bind(PrefsFields.CLEAR_HISTORY_INTERVAL, this.field_clear_history_interval, 'value', Gio.SettingsBindFlags.DEFAULT);
+        this.schema.bind(PrefsFields.CASE_SENSITIVE_SEARCH, this.case_sensitive_search, 'active', Gio.SettingsBindFlags.DEFAULT);
+        this.schema.bind(PrefsFields.REGEX_SEARCH, this.regex_search, 'active', Gio.SettingsBindFlags.DEFAULT);
 
         this.field_clear_history_interval.set_sensitive(this.field_clear_history_on_interval.active);
         this.#fetchExludedAppsList();

schemas/gschemas.compiled

@@ -215,5 +215,15 @@
                 The timestamp for the next scheduled history clear.
             </description>
         </key>
+        <key name="case-sensitive-search" type="b">
+            <default>false</default>
+            <summary>Case sensitive search</summary>
+            <description>Make search case sensitive</description>
+        </key>
+        <key name="regex-search" type="b">
+            <default>false</default>
+            <summary>Regex-based search</summary>
+            <description>Allow regex in search</description>
+        </key>
     </schema>
 </schemalist>