X-Git-Url: http://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/26229fac9c93a427a85e86b899ed54639116de9a..9ed70b9e0ee8ebf8e0b1fc1bbe1b77178d1f008c:/src/lib.nim

diff --git a/src/lib.nim b/src/lib.nim
index 16082c5..17761f3 100644
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -16,7 +16,7 @@ import
 
 
 let
-  processOptions = {poStdErrToStdOut, poUsePath} # poEchoCmd can be added to options for debugging
+  processOptions = {poStdErrToStdOut, poUsePath, poEchoCmd}
   PEERTUBE_REGEX = re"videos\/watch\/[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}"
 
 
@@ -49,6 +49,7 @@ proc presentVideoOptions*(searchResults: SearchResults) =
   for index, (title, url) in searchResults:
     styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, "   ", url, "\n"
 
+
 func buildPlayerArgs(url: string, options: Table[string, bool], player: string): seq[string] =
   let musicOnly = if options["musicOnly"]: "--no-video" else: ""
   let fullScreen = if options["fullScreen"]: "--fullscreen" else: ""
@@ -62,7 +63,7 @@ proc play*(player: string, options: Table[string, bool], url: string, title: str
   if "--no-video" in args:
     discard execShellCmd(&"{player} {args.join(\" \")}")
   else:
-    discard startProcess(player, args=args, options=processOptions)
+    discard execProcess(player, args=args, options=processOptions)
 
 
 func buildMusicDownloadArgs(url: string): seq[string] =
@@ -86,9 +87,11 @@ proc download*(args: openArray[string], title: string) =
 func urlLongen(url: string): string = url.replace("youtu.be/", "www.youtube.com/watch?v=")
 
 
-func rewriteInvidiousToYouTube(url: string): string =
+func rewriteInvidiousToYouTube*(url: string): string =
   {.noSideEffect.}:
-    if rewriteInvidiousURLs: url.replace("invidio.us", "www.youtube.com") else: url
+    if rewriteInvidiousURLs and url.replace(".", "").contains("invidious"):
+       &"https://www.youtube.com/watch?v={url.split(\"=\")[1]}"
+    else: url
 
 
 func stripZshEscaping(url: string): string = url.replace("\\", "")
@@ -142,6 +145,32 @@ proc handleUserInput(searchResult: SearchResult, options: Table[string, bool], p
     play(player, options, searchResult.url, searchResult.title)
 
 
+proc isValidOptions*(options: Options): bool =
+  # Check for invalid combinations of options
+  var invalidCombinations = [("musicOnly", "fullScreen"), ("download", "fullScreen")]
+  result = true
+  for combination in invalidCombinations:
+    if options[combination[0]] and options[combination[1]]:
+     stderr.writeLine fmt"Incompatible options provided: {combination[0]} and {combination[1]}"
+     result = false
+
+
+proc updateOptions(options: Options, newOptions: string): Options =
+  result = options
+
+  for option in newOptions:
+    case option
+    of 'm': result["musicOnly"] = true
+    of 'f': result["fullScreen"] = true
+    of 'd': result["download"] = true
+    else:
+      echo "Invalid option provided!"
+      quit(2)
+
+  if(not isValidOptions(result)):
+    quit(2)
+
+
 proc present*(searchResults: SearchResults, options: Table[string, bool], selectionRange: SelectionRange, player: string) =
   ##[ Continuously present options till the user quits the application
 
@@ -170,8 +199,14 @@ proc present*(searchResults: SearchResults, options: Table[string, bool], select
   of "q":
     quit(0)
   else:
-    let searchResult = searchResults[selectionRange.begin .. selectionRange.until][parseInt(userInput)]
-    handleUserInput(searchResult, options, player)
+    if " " in userInput:
+      let selection = parseInt(userInput.split(" ")[0])
+      let updatedOptions = updateOptions(options, userInput.split(" ")[1])
+      let searchResult = searchResults[selectionRange.begin .. selectionRange.until][selection]
+      handleUserInput(searchResult, updatedOptions, player)
+    else:
+      let searchResult = searchResults[selectionRange.begin .. selectionRange.until][parseInt(userInput)]
+      handleUserInput(searchResult, options, player)
     if options["feelingLucky"]:
       quit(0)
     else: