X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/db34bbff88d4c8e222a92c905908f25027428ddf..046c2cc3b1dc773cf9e1b92f2c4fb41e2d6d8eb0:/src/lib.nim

diff --git a/src/lib.nim b/src/lib.nim
index d77cbe1..6153992 100644
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -51,8 +51,26 @@ proc presentVideoOptions*(searchResults: SearchResults) =
   for index, (title, url) in searchResults:
     styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n"
 
-proc play*(player: string, args: openArray[string], title: string) =
-  styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, title
+func isPlaylist(url: string): bool =
+  # Identifies if video is part of a playlist
+  # Only YouTube playlists are supported for now
+  "www.youtube.com" in url and "&list=" in url
+
+# This is a pure function with no side effects
+func buildPlayerArgs(url: string, options: Table[string, bool], player: string): seq[string] =
+  let url =
+    # Playlists are only supported for MPV player
+    if isPlaylist(url) and player == "mpv":
+      "https://www.youtube.com/playlist?" & url.split('&')[1]
+    else: url
+  let musicOnly = if options["musicOnly"]: "--no-video" else: ""
+  let fullScreen = if options["fullScreen"]: "--fullscreen" else: ""
+  return filterIt([url, musicOnly, fullScreen], it != "")
+
+proc play*(player: string, options: Table[string, bool], url: string, title: string = "") =
+  let args = buildPlayerArgs(url, options, player)
+  if title != "":
+    styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, title
   if "--no-video" in args:
     discard execShellCmd(&"{player} {args.join(\" \")}")
   else:
@@ -60,19 +78,13 @@ proc play*(player: string, args: openArray[string], title: string) =
 
 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
+    return @["--ignore-errors", "-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "0", "-o", downloadLocation, url]
 
 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
+    return @["-f", "best", "-o", downloadLocation, url]
 
 proc download*(args: openArray[string], title: string) =
   styledEcho "\n", fgGreen, "Downloading ", styleBright, fgMagenta, title
@@ -87,17 +99,16 @@ func stripZshEscaping(url: string): string =
 func sanitizeURL*(url: string): string =
   urlLongen(stripZshEscaping(url))
 
-proc directPlay*(url: string, player: string, musicOnly: bool) =
-  if url.startswith("magnet:"):
-    if musicOnly:
+proc directPlay*(url: string, player: string, options: Table[string, bool]) =
+  if url.startswith("magnet:") or url.endswith(".torrent"):
+    if options["musicOnly"]:
+      # TODO Replace with WebTorrent once it supports media player options
       discard execShellCmd(&"peerflix '{url}' -a --{player} -- --no-video")
     else:
-      discard execProcess("peerflix", args=[url, &"--{player}"], options=processOptions)
+      # WebTorrent is so much faster!
+      discard execProcess("webtorrent", args=[url, &"--{player}"], options=processOptions)
   else:
-    if musicOnly:
-      discard execShellCmd(&"{player} --no-video {url}")
-    else:
-      discard execProcess(player, args=[url], options=processOptions)
+    play(player, options, url)
 
 proc directDownload*(url: string, musicOnly: bool) =
   let args =
@@ -112,13 +123,6 @@ proc offerSelection(searchResults: SearchResults, options: Table[string, bool],
     stdout.styledWrite(fgYellow, "Choose video number: ")
     readLine(stdin)
 
-# This is a pure function with no side effects
-func buildPlayerArgs(searchResult: SearchResult, options: Table[string, bool]): seq[string] =
-  var args = @[searchResult.url]
-  if options["musicOnly"]: args.add("--no-video")
-  if options["fullScreen"]: args.add("--fullscreen")
-  return args
-
 proc handleUserInput(searchResult: SearchResult, options: Table[string, bool], player: string) =
   if options["download"]:
     if options["musicOnly"]:
@@ -126,7 +130,7 @@ proc handleUserInput(searchResult: SearchResult, options: Table[string, bool], p
     else:
       download(buildVideoDownloadArgs(searchResult.url), searchResult.title)
   else:
-    play(player, buildPlayerArgs(searchResult, options), searchResult.title)
+    play(player, options, searchResult.url, searchResult.title)
 
 proc present*(searchResults: SearchResults, options: Table[string, bool], selectionRange: SelectionRange, player: string) =
   #[ Continuously present options till the user quits the application