feat: Searching also in the account name

kewisch · Feb 9, 2025 · 8b6cfd1 · 8b6cfd1
1 parent ea74239
commit 8b6cfd1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -115,5 +115,8 @@
     },
     "partialMatchFullPath": {
         "message": "Search for keywords within the entire folder path"
+    },
+    "searchAccountName": {
+        "message": "Search for keywords also within the account name"
     }
 }
diff --git a/src/common/util.js b/src/common/util.js
@@ -9,6 +9,7 @@ export const DEFAULT_PREFERENCES = {
   migratedShiftArrow: false,
   recentStrategy: "accessed",
   partialMatchFullPath: false,
+  searchAccountName: false,
 };
 
 export async function getValidatedFolders(rootNode, prefName) {

diff --git a/src/options/options.html b/src/options/options.html
@@ -36,6 +36,10 @@
       <input type="checkbox" id="partialMatchFullPath">
       <label for="partialMatchFullPath" data-l10n-id="partialMatchFullPath"></label>
     </div>
+    <div class="preference">
+      <input type="checkbox" id="searchAccountName">
+      <label for="searchAccountName" data-l10n-id="searchAccountName"></label>
+    </div>
     <div class="preference" data-l10n-attr-title="useLegacyShortcutsTitle">
       <input type="checkbox" id="useLegacyShortcuts">
       <label for="useLegacyShortcuts" data-l10n-id="useLegacyShortcuts"></label>

diff --git a/src/popup/baseItemList.js b/src/popup/baseItemList.js
@@ -18,6 +18,7 @@ export default class BaseItemList extends HTMLElement {
 
   ignoreFocus = false;
   partialMatchFullPath = false;
+  searchAccountName = false;
 
   static observedAttributes = ["placeholder"];
 
@@ -517,7 +518,7 @@ export default class BaseItemList extends HTMLElement {
 
       if (this.partialMatchFullPath) {
         for (let item of this.allItems) {
-          let pathString = item.fullSearchString.toLowerCase();
+          let pathString = (this.searchAccountName ? (item.account.name.toLowerCase() + "/") : "") + item.fullSearchString.toLowerCase();
 
           if (!hasAccent) {
             pathString = pathString.normalize("NFD").replace(DIACRITICS, "");

diff --git a/src/popup/folderList.js b/src/popup/folderList.js
@@ -141,12 +141,13 @@ class TBFolderList extends BaseItemList {
     return body.lastElementChild;
   }
 
-  initItems(allItems, defaultItems, showFolderPath=false, excludeSet=null, partialMatchFullPath=false) {
+  initItems(allItems, defaultItems, showFolderPath=false, excludeSet=null, partialMatchFullPath=false, searchAccountName=false) {
     this._allItems = allItems;
     this._defaultItems = defaultItems;
     this.#showFolderPath = showFolderPath;
     this.#excludeSet = excludeSet || new Set();
     this.partialMatchFullPath = partialMatchFullPath;
+    this.searchAccountName = searchAccountName;
     this.repopulate();
   }
 

diff --git a/src/popup/popup.js b/src/popup/popup.js
@@ -40,7 +40,7 @@ async function load() {
 
   let {
     maxRecentFolders, showFolderPath, skipArchive, layout, defaultFolderSetting, migratedShiftArrow,
-    recentStrategy, partialMatchFullPath
+    recentStrategy, partialMatchFullPath, searchAccountName
   } = await browser.storage.local.get(DEFAULT_PREFERENCES);
 
   if (layout == "wide" || (layout == "auto" && window.outerWidth > 1400)) {
@@ -154,7 +154,7 @@ async function load() {
   }
 
   let folderList = document.getElementById("folder-list");
-  folderList.initItems(rootNode.folderNodes, defaultFolders, showFolderPath, excludeSet, partialMatchFullPath);
+  folderList.initItems(rootNode.folderNodes, defaultFolders, showFolderPath, excludeSet, partialMatchFullPath, searchAccountName);
   folderList.ignoreFocus = true;
   folderList.addEventListener("item-selected", async (event) => {
     let { folder, altMode } = event.detail;