Add direct download for video

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

diff --git a/src/lib.nim b/src/lib.nim
index f5ee8a57001ccafa86eeb8f99e2f861b347eb2f8..ffa4a4a3847a8e55cd3145acf2bc9c3f3233b085 100644 (file)
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -56,6 +56,22 @@ proc play*(player: string, args: openArray[string], title: string) =
   else:
     discard execProcess(player, args=args, options=processOptions)
 
+func buildMusicDownloadArgs*(url: string): seq[string] =
+  {.noSideEffect.}:
+    var args = @["--ignore-errors", "-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "0", "-o"]
+    let downloadLocation = &"'{expandTilde(musicDownloadDirectory)}/%(title)s.%(ext)s'"
+    args.add(downloadLocation)
+    args.add(url)
+    return args
+
+func buildVideoDownloadArgs*(url: string): seq[string] =
+  {.noSideEffect.}:
+    var args = @["-f", "best", "-o"]
+    let downloadLocation = &"'{expandTilde(videoDownloadDirectory)}/%(title)s.%(ext)s'"
+    args.add(downloadLocation)
+    args.add(url)
+    return args
+
 proc download*(args: openArray[string], title: string) =
   styledEcho "\n", fgGreen, "Downloading ", styleBright, fgMagenta, title
   discard execShellCmd(&"youtube-dl {args.join(\" \")}")
@@ -69,9 +85,12 @@ func stripZshEscaping(url: string): string =
 func sanitizeURL*(url: string): string =
   urlLongen(stripZshEscaping(url))
 
-proc directPlay*(searchQuery: string, player: string) =
-  let url = sanitizeURL(searchQuery)
-  if searchQuery.startswith("magnet:"):
+proc directPlay*(url: string, player: string) =
+  if url.startswith("magnet:"):
     discard execProcess("peerflix", args=[url, &"--{player}"], options=processOptions)
   else:
     discard execProcess(player, args=[url], options=processOptions)
+
+proc directDownload*(url: string) =
+  let args = buildVideoDownloadArgs(url)
+  discard execShellCmd(&"youtube-dl {args.join(\" \")}")

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 2ddafc94d4384968048b25f2665ea83eb7d413bd..31a608894167d04f03b6ada6a388a2bb20cec64b 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -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))
+    else:
+      directPlay(sanitizeURL(searchQuery), player)
     quit(0)
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
@@ -68,28 +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
-
-  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) =
     if options["download"]:
       if options["musicOnly"]:
-        download(buildMusicDownloadArgs(number), searchResults[number].title)
+        download(buildMusicDownloadArgs(searchResults[number].url), searchResults[number].title)
       else:
-        download(buildVideoDownloadArgs(number), searchResults[number].title)
+        download(buildVideoDownloadArgs(searchResults[number].url), searchResults[number].title)
     else:
       play(player, buildPlayerArgs(number), searchResults[number].title)