X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/d2ebe4d2197106ef89a103744c93dcca9e4b0e5f..e6561dc98ae9f83c63ebf3e14fbefbd6e5264f5d:/src/nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 2ddafc9..5ddcfcc 100644
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -32,7 +32,7 @@ proc parseArguments(): CommandLineOptions =
 
 proc isValidOptions*(options: Options): bool =
   # Check for invalid combinations of options
-  var invalidCombinations = [("musicOnly", "fullScreen")]
+  var invalidCombinations = [("musicOnly", "fullScreen"), ("download", "fullScreen")]
   for combination in invalidCombinations:
     if options[combination[0]] and options[combination[1]]:
      stderr.writeLine fmt"Incompatible options provided: {combination[0]} and {combination[1]}"
@@ -49,15 +49,21 @@ proc main() =
     quit(1)
 
   if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
-    directPlay(searchQuery, player)
+    if options["download"]:
+      directDownload(sanitizeURL(searchQuery), options["musicOnly"])
+    else:
+      directPlay(sanitizeURL(searchQuery), player, options["musicOnly"])
     quit(0)
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
-  proc getUserInput(): string =
+  # Currently available range to choose from depending on pagination
+  var selectionRange: SelectionRange = (0, limit-1) # Nim decided to deviate from Python ranges here
+
+  proc offerSelection(): string =
     if options["feelingLucky"]: "0"
     else:
-      presentVideoOptions(searchResults[..(limit-1)])
+      presentVideoOptions(searchResults[selectionRange.begin .. selectionRange.until])
       stdout.styledWrite(fgYellow, "Choose video number: ")
       readLine(stdin)
 
@@ -68,42 +74,31 @@ proc main() =
     if options["fullScreen"]: args.add("--fullscreen")
     return args
 
-  func buildMusicDownloadArgs(number: int): seq[string] =
-    {.noSideEffect.}:
-      var args = @["--ignore-errors", "-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "0", "-o"]
-      let downloadLocation = &"'{expandTilde(musicDownloadDirectory)}/{searchResults[number].title}.mp3'"
-      args.add(downloadLocation)
-      args.add(searchResults[number].url)
-      return args
-
-  func buildVideoDownloadArgs(number: int): seq[string] =
-    {.noSideEffect.}:
-      var args = @["-f", "best", "-o"]
-      let downloadLocation = &"'{expandTilde(videoDownloadDirectory)}/%(title)s.%(ext)s'"
-      args.add(downloadLocation)
-      args.add(searchResults[number].url)
-      return args
-
-  proc handleUserInput(number: int) =
+  proc handleUserInput(selection: int) =
     if options["download"]:
       if options["musicOnly"]:
-        download(buildMusicDownloadArgs(number), searchResults[number].title)
+        download(buildMusicDownloadArgs(searchResults[selection].url), searchResults[selection].title)
       else:
-        download(buildVideoDownloadArgs(number), searchResults[number].title)
+        download(buildVideoDownloadArgs(searchResults[selection].url), searchResults[selection].title)
     else:
-      play(player, buildPlayerArgs(number), searchResults[number].title)
+      play(player, buildPlayerArgs(selection), searchResults[selection].title)
 
 
   while(true):
-    let userInput = getUserInput()
+    let userInput = offerSelection()
 
-    if userInput == "all":
-      for number in 0..(len(searchResults)):
+    case userInput
+    of "all":
+      for selection in selectionRange.begin .. selectionRange.until:
         # TODO `spawn` this?
-        handleUserInput(number)
-
-    if userInput == "q":
-      break
+        handleUserInput(selection)
+    of "n":
+      if selectionRange.until + 1 < len(searchResults):
+        selectionRange = (selectionRange.until + 1, min(len(searchResults) - 1, selectionRange.until + limit))
+      continue
+    # of "p":
+    of "q":
+      quit(0)
 
     # Play the video using the preferred/available media player
     let videoNumber = parseInt(userInput)