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

diff --git a/clitube.nim b/clitube.nim
index 121b3d4..0c21a94 100644
--- a/clitube.nim
+++ b/clitube.nim
@@ -3,24 +3,21 @@ import httpClient
 import os
 import osproc
 import sequtils, sugar
+import strformat
 import std/[terminal]
 import strtabs
 import strutils
 import uri
 import xmltree
 
-# Supported video players in order of preference
-let supportedPlayers = ["mpv", "vlc"]
-
-# Only show these many results
-let limit = 10
+import preferences
 
 type SearchResult = tuple[title: string, url: string]
 
 proc selectMediaPlayer(): string =
   let availablePlayers = filterIt(supportedPlayers, execProcess("which " & it).len != 0)
   if len(availablePlayers) == 0:
-    stderr.writeLine "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]
@@ -28,7 +25,7 @@ proc selectMediaPlayer(): string =
 proc getYoutubePage(searchQuery: string): string =
   let queryParam = encodeUrl(searchQuery)
   let client = newHttpClient()
-  let response = get(client, "https://www.youtube.com/results?hl=en&search_query=" & queryParam)
+  let response = get(client, &"https://www.youtube.com/results?hl=en&search_query={queryParam}")
   return $response.body
 
 proc extractTitlesAndUrls(htmlFile: string): seq[SearchResult] =
@@ -45,7 +42,7 @@ let input = paramStr(1)
 let player = selectMediaPlayer()
 
 if "https://www.youtube.com" in input:
-  discard execProcess(player & " " & input)
+  discard execProcess(&"{player} {input}")
   quit(0)
 
 let searchResults = extractTitlesAndUrls(getYoutubePage(input))
@@ -53,9 +50,9 @@ let searchResults = extractTitlesAndUrls(getYoutubePage(input))
 presentVideoOptions(searchResults)
 
 stdout.styledWrite(fgYellow, "Choose video number: ")
-let number: int = parseInt(readLine(stdin))
+let number = parseInt(readLine(stdin))
 
 styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, searchResults[number].title
 
 # Play the video using the preferred/available media player
-discard execProcess(player & " " & searchResults[number].url)
+discard execProcess(&"{player}  {searchResults[number].url}")