adding warning if no VPN's are found

chrede88 · Oct 4, 2023 · 7565806 · 7565806
1 parent fd895c9
commit 7565806
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 28 deletions.
diff --git a/alfred-wireguard.alfredworkflow b/alfred-wireguard.alfredworkflow
diff --git a/info.plist b/info.plist
@@ -8,6 +8,19 @@
 	<string>Productivity</string>
 	<key>connections</key>
 	<dict>
+		<key>63E6ED14-603A-4896-A2F5-459B6EA6A7AD</key>
+		<array>
+			<dict>
+				<key>destinationuid</key>
+				<string>661B2258-0E04-428F-8393-E8EBF6A096C5</string>
+				<key>modifiers</key>
+				<integer>0</integer>
+				<key>modifiersubtext</key>
+				<string></string>
+				<key>vitoclose</key>
+				<false/>
+			</dict>
+		</array>
 		<key>661B2258-0E04-428F-8393-E8EBF6A096C5</key>
 		<array>
 			<dict>
@@ -25,7 +38,7 @@
 		<array>
 			<dict>
 				<key>destinationuid</key>
-				<string>661B2258-0E04-428F-8393-E8EBF6A096C5</string>
+				<string>63E6ED14-603A-4896-A2F5-459B6EA6A7AD</string>
 				<key>modifiers</key>
 				<integer>0</integer>
 				<key>modifiersubtext</key>
@@ -94,6 +107,29 @@
 			<key>version</key>
 			<integer>3</integer>
 		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>concurrently</key>
+				<false/>
+				<key>escaping</key>
+				<integer>127</integer>
+				<key>script</key>
+				<string>bash togglevpn.sh {query}</string>
+				<key>scriptargtype</key>
+				<integer>1</integer>
+				<key>scriptfile</key>
+				<string>togglevpn.sh</string>
+				<key>type</key>
+				<integer>8</integer>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.action.script</string>
+			<key>uid</key>
+			<string>661B2258-0E04-428F-8393-E8EBF6A096C5</string>
+			<key>version</key>
+			<integer>2</integer>
+		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -118,25 +154,34 @@
 		<dict>
 			<key>config</key>
 			<dict>
-				<key>concurrently</key>
+				<key>conditions</key>
+				<array>
+					<dict>
+						<key>inputstring</key>
+						<string></string>
+						<key>matchcasesensitive</key>
+						<false/>
+						<key>matchmode</key>
+						<integer>0</integer>
+						<key>matchstring</key>
+						<string>{"items":[{"title":"No VPN's found!","arg":"NoVPNs"}]}</string>
+						<key>outputlabel</key>
+						<string>No VPN</string>
+						<key>uid</key>
+						<string>A8E3390B-E907-4540-B897-C2B54A6E908E</string>
+					</dict>
+				</array>
+				<key>elselabel</key>
+				<string>VPN found</string>
+				<key>hideelse</key>
 				<false/>
-				<key>escaping</key>
-				<integer>127</integer>
-				<key>script</key>
-				<string>bash togglevpn.sh {query}</string>
-				<key>scriptargtype</key>
-				<integer>1</integer>
-				<key>scriptfile</key>
-				<string>togglevpn.sh</string>
-				<key>type</key>
-				<integer>8</integer>
 			</dict>
 			<key>type</key>
-			<string>alfred.workflow.action.script</string>
+			<string>alfred.workflow.utility.conditional</string>
 			<key>uid</key>
-			<string>661B2258-0E04-428F-8393-E8EBF6A096C5</string>
+			<string>63E6ED14-603A-4896-A2F5-459B6EA6A7AD</string>
 			<key>version</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 	</array>
 	<key>readme</key>
@@ -150,10 +195,17 @@
 			<key>ypos</key>
 			<real>180</real>
 		</dict>
+		<key>63E6ED14-603A-4896-A2F5-459B6EA6A7AD</key>
+		<dict>
+			<key>xpos</key>
+			<real>350</real>
+			<key>ypos</key>
+			<real>200</real>
+		</dict>
 		<key>661B2258-0E04-428F-8393-E8EBF6A096C5</key>
 		<dict>
 			<key>xpos</key>
-			<real>410</real>
+			<real>465</real>
 			<key>ypos</key>
 			<real>180</real>
 		</dict>
@@ -170,7 +222,7 @@
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>1.1</string>
+	<string>1.1.3</string>
 	<key>webaddress</key>
 	<string>https://www.github.com/chrede88/alfred-wireguard</string>
 </dict>

diff --git a/vpnlist.sh b/vpnlist.sh
@@ -15,20 +15,25 @@ vpn_list() {
 
   # output JSON
   jsonstr="{\"items\":["
-  for vpn in "${vpns[@]}";do
-    conn=$(get_vpn_status $vpn )
-    jsonstr+="{\"title\":\"$vpn\",\"subtitle\":\"$conn\",\"arg\":\"$vpn\",";
-    if [[ "$conn" == "Connected" ]]; then
-      jsonstr+="\"icon\":{\"path\":\"./images/on.png\"}"
-    else
-      jsonstr+="\"icon\":{\"path\":\"./images/off.png\"}"
-    fi
-    jsonstr+="},"
-  done
+  if [ ${#vpns[@]} == 0 ]; then
+    jsonstr+="{\"title\":\"No VPN's found!\",\"arg\":\"NoVPNs\"}"
+  else
+    for vpn in "${vpns[@]}";do
+      conn=$(get_vpn_status $vpn )
+      jsonstr+="{\"title\":\"$vpn\",\"subtitle\":\"$conn\",\"arg\":\"$vpn\",";
+      if [[ "$conn" == "Connected" ]]; then
+        jsonstr+="\"icon\":{\"path\":\"./images/on.png\"}"
+      else
+        jsonstr+="\"icon\":{\"path\":\"./images/off.png\"}"
+      fi
+      jsonstr+="},"
+    done
+  fi
+
   jsonstr="${jsonstr%,}"
   jsonstr+="]}"
   echo -e $jsonstr
 }
 
 # execute vpn_list
-vpn_list
+vpn_list