X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/3d5bf3fdb4680d213193fce1c2400dddf643f823..485b105320ea9074fc53bdf5967704b09e20c5cb:/clitube.nim

diff --git a/clitube.nim b/clitube.nim
index aeb9953..121b3d4 100644
--- a/clitube.nim
+++ b/clitube.nim
@@ -10,7 +10,7 @@ import uri
 import xmltree
 
 # Supported video players in order of preference
-let supportedPlayers = @["mpv", "mplayer", "vlc"]
+let supportedPlayers = ["mpv", "vlc"]
 
 # Only show these many results
 let limit = 10
@@ -20,20 +20,19 @@ type SearchResult = tuple[title: string, url: string]
 proc selectMediaPlayer(): string =
   let availablePlayers = filterIt(supportedPlayers, execProcess("which " & it).len != 0)
   if len(availablePlayers) == 0:
-    echo "Please install one of the supported media players: ", supportedPlayers
+    stderr.writeLine "Please install one of the supported media players: ", $supportedPlayers
     raise newException(OSError, "No supported media player found")
   else:
     return availablePlayers[0]
 
 proc getYoutubePage(searchQuery: string): string =
   let queryParam = encodeUrl(searchQuery)
-  var client = newHttpClient()
+  let client = newHttpClient()
   let response = get(client, "https://www.youtube.com/results?hl=en&search_query=" & queryParam)
-  writeFile("/tmp/clitube-page.html", response.body)
-  return "/tmp/clitube-page.html"
+  return $response.body
 
 proc extractTitlesAndUrls(htmlFile: string): seq[SearchResult] =
-  loadHtml(htmlFile).findAll("a").
+  parseHtml(htmlFile).findAll("a").
     filter(a => "watch" in a.attrs["href"] and a.attrs.hasKey "title").
     map(a => (a.attrs["title"], "https://www.youtube.com" & a.attrs["href"]))[..(limit-1)]
 
@@ -42,14 +41,20 @@ proc presentVideoOptions(searchResults: seq[SearchResult]) =
   for index, (title, url) in searchResults:
     styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n"
 
-let searchResults = extractTitlesAndUrls(getYoutubePage(paramStr(1)))
+let input = paramStr(1)
+let player = selectMediaPlayer()
+
+if "https://www.youtube.com" in input:
+  discard execProcess(player & " " & input)
+  quit(0)
+
+let searchResults = extractTitlesAndUrls(getYoutubePage(input))
 
 presentVideoOptions(searchResults)
 
 stdout.styledWrite(fgYellow, "Choose video number: ")
-var number: int = parseInt(readLine(stdin))
+let number: int = parseInt(readLine(stdin))
 
-var player = selectMediaPlayer()
 styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, searchResults[number].title
 
 # Play the video using the preferred/available media player