feat: Add option to exclude pinned tabs

navorite · Oct 15, 2023 · 09bfe30 · 09bfe30
1 parent a21c2d2
commit 09bfe30
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/src/lib/components/options/pages/General.svelte b/src/lib/components/options/pages/General.svelte
@@ -125,6 +125,13 @@
     }}
   />
 
+  <Switch
+    title="Exculde pinned tabs from session"
+    checked={$settings.excludePinned}
+    on:change={() =>
+      settings.changeSetting('excludePinned', !$settings.excludePinned)}
+  />
+
   <TagEditor />
 
   <div class="flex gap-2">

diff --git a/src/lib/components/popup/sessions/CurrentSession.svelte b/src/lib/components/popup/sessions/CurrentSession.svelte
@@ -92,7 +92,10 @@
 
     //should fix inconsistency in update flags
     timeout = setTimeout(async () => {
-      $session = await getSession($settings.urlFilterList);
+      $session = await getSession({
+        pinned: !$settings.excludePinned,
+        url: $settings.urlFilterList
+      });
 
       if ($settings.selectionId === 'current')
         selection.selectById($session.id);

diff --git a/src/lib/stores/settings.ts b/src/lib/stores/settings.ts
@@ -26,7 +26,8 @@ export const settings = (() => {
     autoSaveMaxSessions: autoSaveDefaults.autoSaveMaxSessions,
     autoSaveTimer: autoSaveDefaults.autoSaveTimer,
     tags: {},
-    doNotAskForTitle: true
+    doNotAskForTitle: true,
+    excludePinned: true
   };
 
   const { subscribe, set, update } = writable(defaultSettings);

diff --git a/src/lib/types/extension.ts b/src/lib/types/extension.ts
@@ -69,4 +69,5 @@ export interface ESettings {
     }
   >;
   doNotAskForTitle: boolean;
+  excludePinned: boolean;
 }
diff --git a/src/lib/utils/getSession.ts b/src/lib/utils/getSession.ts
@@ -1,11 +1,5 @@
 import browser from 'webextension-polyfill';
-import type {
-  ESession,
-  ETab,
-  QueryInfo,
-  URLFilterList,
-  compressOptions
-} from '@/lib/types';
+import type { ESession, ETab, QueryInfo, compressOptions } from '@/lib/types';
 import { compress_options, tabAttr } from '@/lib/constants/shared';
 import { compress as compressLZ } from 'lz-string';
 import { getExtensionURL } from '@/lib/utils/extension';
@@ -52,7 +46,7 @@ export async function getTabs(
 }
 
 // Get current session - TODO: arg: options?: compressOptions goes undefined after 1st call
-export async function getSession(urlFilterList?: URLFilterList) {
+export async function getSession(queryInfo?: QueryInfo) {
   const session: ESession = {
     title: 'Current Session',
     windows: [],
@@ -62,16 +56,14 @@ export async function getSession(urlFilterList?: URLFilterList) {
     tabsNumber: 0
   };
 
+  if (!queryInfo) queryInfo = {};
+
   session.windows = await browser?.windows?.getAll();
 
   for (const window of session.windows) {
-    window.tabs = await getTabs(
-      {
-        windowId: window.id,
-        url: urlFilterList as undefined
-      },
-      compress_options
-    );
+    queryInfo.windowId = window.id;
+
+    window.tabs = await getTabs(queryInfo, compress_options);
 
     session.tabsNumber += window.tabs.length;
   }