X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/e9f0c7d0facb6a454a204e3b3ce66d521f40d6e8..201100de47bd2baf6d0199fd82f87d83257768d1:/src/nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 2db5ece..0624bad 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,7 +49,10 @@ 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))
@@ -68,18 +71,12 @@ 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
-
   proc handleUserInput(number: int) =
     if options["download"]:
       if options["musicOnly"]:
-        download(buildMusicDownloadArgs(number), searchResults[number].title)
+        download(buildMusicDownloadArgs(searchResults[number].url), searchResults[number].title)
+      else:
+        download(buildVideoDownloadArgs(searchResults[number].url), searchResults[number].title)
     else:
       play(player, buildPlayerArgs(number), searchResults[number].title)
 
@@ -88,7 +85,7 @@ proc main() =
     let userInput = getUserInput()
 
     if userInput == "all":
-      for number in 0..(len(searchResults)):
+      for number in 0..(limit-1): # Nim decided to deviate from Python ranges here
         # TODO `spawn` this?
         handleUserInput(number)