From b6f6640a83c24ceea68bc0d38e51e9dca1364e42 Mon Sep 17 00:00:00 2001
From: Mid Favila <midfavila@sdf.org>
Date: Fri, 24 Dec 2021 11:42:30 -0400
Subject: [PATCH] update invcli and modem-manager

---
 invcli        | 17 +++++++++++++----
 modem-manager |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/invcli b/invcli
index aa01fec..18bab23 100755
--- a/invcli
+++ b/invcli
@@ -6,9 +6,11 @@ search()
     query_sanitized="$(printf "%s\n" "$1"|sed -e 's/  */%20/g')"
     curl --output /tmp/invidious_results "https://vid.puffyan.us/search?q=$query_sanitized"
 }
+
 extract_names()
 {
- sed -ne 's/<p dir.*>\(.*\)<\/p>/\1/p' /tmp/invidious_results|sed 's/  *//'
+viable=$(grep watch /tmp/invidious_results|grep youtube|expr $(wc -l) - 1)
+sed -ne 's/<p dir.*>\(.*\)<\/p>/\1/p' /tmp/invidious_results|sed -ne 's/  *//' -e '/^$/d' -e p|sed ${viable}q
 }
 
 extract_urls()
@@ -21,7 +23,7 @@ extract_urls()
 
 watch_vid()
 {
-    curl -v  "https://vid.puffyan.us/latest_version?id=$id&itag=$itag" 2>>/dev/stdout|sed -ne 's/< Location: \(.*\)/\1/p'
+    ffplay  "https://vid.puffyan.us/latest_version?id=$id&itag=$itag" 2>>/dev/stdout|sed -ne 's/< Location: \(.*\)/\1/p'
 }
 
 fetch_itag()
@@ -37,12 +39,18 @@ fetch_id()
 
 generate_locations()
 {
-    for itag in 22 #$(fetch_itag $(extract_urls|sed $chosen_video!d)|sed $chosen_video!d)
+	# 18 is for 360p, 22 is for 720p
+    for itag in 18 #$(fetch_itag $(extract_urls|sed $chosen_video!d)|sed $chosen_video!d)
     do
 	watch_vid
     done
 }
 
+
+#Use this snippet to only retrieve URLs that are actually in the results...
+#grep 'watch?v=' /tmp/invidious_results|grep youtube
+#
+#Hopefully this is the key to fixing the weird interactions between extract_names and fetch_itag
 main()
 {
     printf "Enter your search terms: "
@@ -54,11 +62,12 @@ main()
     printf "Attempting to retrieve primary source for: "
     printf "\"%s\"" "$(extract_names|sed $chosen_video!d)"
     printf "...\nPlease wait.\n\n"
+    chosen_video=$(expr $chosen_video - 1)
     itag=$(echo $(fetch_itag $(extract_urls|sed $chosen_video!d))|cut -f$chosen_video -d' ')
     id=$(fetch_id)
     media="$(generate_locations|sed 1!d)"
     printf "Loading %s...\n" "$media"
-    ffplay -autoexit "$media"
+#    ffplay -autoexit "$media"
 }
 
 main
diff --git a/modem-manager b/modem-manager
index adc02a9..e41b045 100755
--- a/modem-manager
+++ b/modem-manager
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # We need root to configure interface properties.
-if [ "${USER}" != root ]
+if [ "$(whoami)" != root ]
    then printf "We need root!\n"
    exit
    else