X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/9a8ef4ad5f1c6dbee407cbea01224676131060ba..e6561dc98ae9f83c63ebf3e14fbefbd6e5264f5d:/src/lib.nim diff --git a/src/lib.nim b/src/lib.nim index ffa4a4a..54259e2 100644 --- a/src/lib.nim +++ b/src/lib.nim @@ -20,9 +20,10 @@ type Options* = Table[string, bool] SearchResult* = tuple[title: string, url: string] CommandLineOptions* = tuple[searchQuery: string, options: Options] + SelectionRange* = tuple[begin: int, until: int] # poEchoCmd can be added to options for debugging -let processOptions = {poStdErrToStdOut, poUsePath, poEchoCmd} +let processOptions = {poStdErrToStdOut, poUsePath} proc selectMediaPlayer*(): string = let availablePlayers = filterIt(supportedPlayers, execProcess("which " & it).len != 0) @@ -85,12 +86,20 @@ func stripZshEscaping(url: string): string = func sanitizeURL*(url: string): string = urlLongen(stripZshEscaping(url)) -proc directPlay*(url: string, player: string) = +proc directPlay*(url: string, player: string, musicOnly: bool) = if url.startswith("magnet:"): - discard execProcess("peerflix", args=[url, &"--{player}"], options=processOptions) + if musicOnly: + discard execShellCmd(&"peerflix '{url}' -a --{player} -- --no-video") + else: + discard execProcess("peerflix", args=[url, &"--{player}"], options=processOptions) else: - discard execProcess(player, args=[url], options=processOptions) - -proc directDownload*(url: string) = - let args = buildVideoDownloadArgs(url) + if musicOnly: + discard execShellCmd(&"{player} --no-video {url}") + else: + discard execProcess(player, args=[url], options=processOptions) + +proc directDownload*(url: string, musicOnly: bool) = + let args = + if musicOnly: buildMusicDownloadArgs(url) + else: buildVideoDownloadArgs(url) discard execShellCmd(&"youtube-dl {args.join(\" \")}")