Filter tabs by existence of URL

alfredapp · Oct 15, 2024 · 93aac6b · 93aac6b
1 parent 88a5293
commit 93aac6b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs b/Tasks/com.alfredapp.automation.core/safari/.common/tabs
@@ -68,8 +68,8 @@ function run(argv) {
   // Act on tabs
   const tabs = windows
     .flatMap(window => window.tabs())
-    .filter(tab => tab !== null)
-    .map(tab => [tab.url(), tab.name()])
+    .map(tab => [tab?.url(), tab?.name()])
+    .filter(tab => tab[0])
 
   switch (outFormat) {
     case "url": return alfredArgs(tabs.map(tab => tab[0]))

diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching b/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching
@@ -32,6 +32,7 @@ function browserVariant(appName) {
 }
 
 function lookFor(matchString, inText, useRegex) {
+  if (!inText) return false
   if (useRegex) return RegExp(matchString).test(inText)
   return inText.includes(matchString)
 }
@@ -75,8 +76,8 @@ function run(argv) {
   // Act on tabs
   const matchingTabs = windows
     .flatMap(window => window.tabs())
-    .filter(tab => tab !== null)
-    .map(tab => [tab.url(), tab.name()])
+    .map(tab => [tab?.url(), tab?.name()])
+    .filter(tab => tab[0])
     .filter(tab => lookFor(matchString, tab[0], regex))
 
   switch (outFormat) {

diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching-activate b/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching-activate
@@ -32,6 +32,7 @@ function browserVariant(appName) {
 }
 
 function lookFor(matchString, inText, useRegex) {
+  if (!inText) return false
   if (useRegex) return RegExp(matchString).test(inText)
   return inText.includes(matchString)
 }

diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching-close b/Tasks/com.alfredapp.automation.core/safari/.common/tabs-matching-close
@@ -32,6 +32,7 @@ function browserVariant(appName) {
 }
 
 function lookFor(matchString, inText, useRegex) {
+  if (!inText) return false
   if (useRegex) return RegExp(matchString).test(inText)
   return inText.includes(matchString)
 }
@@ -74,8 +75,7 @@ function run(argv) {
   // Act on tabs
   const matchingTabs = windows
     .flatMap(window => window.tabs())
-    .filter(tab => tab !== null)
-    .filter(tab => lookFor(matchString, tab.url(), regex))
+    .filter(tab => lookFor(matchString, tab?.url(), regex))
 
   const tabURLs = matchingTabs.map(tab => tab.url())
 

diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs-not-matching b/Tasks/com.alfredapp.automation.core/safari/.common/tabs-not-matching
@@ -32,6 +32,7 @@ function browserVariant(appName) {
 }
 
 function lookFor(matchString, inText, useRegex) {
+  if (!inText) return false
   if (useRegex) return RegExp(matchString).test(inText)
   return inText.includes(matchString)
 }
@@ -75,8 +76,8 @@ function run(argv) {
   // Act on tabs
   const matchingTabs = windows
     .flatMap(window => window.tabs())
-    .filter(tab => tab !== null)
-    .map(tab => [tab.url(), tab.name()])
+    .map(tab => [tab?.url(), tab?.name()])
+    .filter(tab => tab[0])
     .filter(tab => !lookFor(matchString, tab[0], regex))
 
   switch (outFormat) {

diff --git a/Tasks/com.alfredapp.automation.core/safari/.common/tabs-not-matching-close b/Tasks/com.alfredapp.automation.core/safari/.common/tabs-not-matching-close
@@ -32,6 +32,7 @@ function browserVariant(appName) {
 }
 
 function lookFor(matchString, inText, useRegex) {
+  if (!inText) return false
   if (useRegex) return RegExp(matchString).test(inText)
   return inText.includes(matchString)
 }
@@ -74,8 +75,7 @@ function run(argv) {
   // Act on tabs
   const matchingTabs = windows
     .flatMap(window => window.tabs())
-    .filter(tab => tab !== null)
-    .filter(tab => !lookFor(matchString, tab.url(), regex))
+    .filter(tab => !lookFor(matchString, tab?.url(), regex))
 
   const tabURLs = matchingTabs.map(tab => tab.url())