Better UX for playing all search results

Also fix a bug with looping over video numbers

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>

diff --git a/lib.nim b/lib.nim
index 893422ecec8138285d2ea1051f28b8ed6f468a30..fe9d5c02cf3070da046176f742b1293b7505a74e 100644 (file)
--- a/lib.nim
+++ b/lib.nim
@@ -17,6 +17,8 @@ type
   SearchResult* = tuple[title: string, url: string]
   CommandLineOptions* = tuple[searchQuery: string, musicOnly: bool, feelingLucky: bool, fullScreen: bool]
 
+let processOptions = {poStdErrToStdOut, poUsePath}
+
 proc selectMediaPlayer*(): string =
   let availablePlayers = filterIt(supportedPlayers, execProcess("which " & it).len != 0)
   if len(availablePlayers) == 0:
@@ -42,9 +44,10 @@ proc presentVideoOptions*(searchResults: seq[SearchResult]) =
   for index, (title, url) in searchResults:
     styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n"
 
-proc play*(player: string, args: openArray[string]) =
+proc play*(player: string, args: openArray[string], title: string) =
   # poEchoCmd can be added to options for debugging
-  discard execProcess(player, args=args, options={poStdErrToStdOut, poUsePath})
+  styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, title
+  discard execProcess(player, args=args, options=processOptions)
 
 func urlLongen(url: string): string =
   url.replace("youtu.be/", "www.youtube.com/watch?v=")
@@ -58,6 +61,6 @@ func sanitizeURL*(url: string): string =
 proc directPlay*(searchQuery: string, player: string) =
   let url = sanitizeURL(searchQuery)
   if searchQuery.startswith("magnet:"):
-    play("peerflix", args=[url, &"--{player}"])
+    discard execProcess("peerflix", args=[url, &"--{player}"], options=processOptions)
   else:
-    play(player, args=[url])
+    discard execProcess("peerflix", args=[url], options=processOptions)

diff --git a/nimcoon.nim b/nimcoon.nim
index ed3a572d2d596ced7b0fde6b524db3bf9783029b..8b1ba591f166a0545053cc420ecf12149c5847ab 100644 (file)
--- a/nimcoon.nim
+++ b/nimcoon.nim
@@ -35,6 +35,7 @@ proc main() =
 
   if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
     directPlay(searchQuery, player)
+    quit(0)
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
@@ -57,16 +58,14 @@ proc main() =
 
     if userInput == "all":
       for number in 0..(len(searchResults)):
-        play(player, buildArgs(number))
+        play(player, buildArgs(number), searchResults[number].title)
 
     if userInput == "q":
       break
 
-    let videoNumber = parseInt(userInput)
-    styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, searchResults[videoNumber].title
-
     # Play the video using the preferred/available media player
-    play(player, buildArgs(videoNumber))
+    let videoNumber = parseInt(userInput)
+    play(player, buildArgs(videoNumber), searchResults[videoNumber].title)
     if feelingLucky:
       break