From 811928a79e13b5534aaa08e05f9d3745c9a9023f Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 27 Mar 2020 13:17:02 +0530 Subject: [PATCH] Support directPlay and directDownload for music Signed-off-by: Joseph Nuthalapati --- src/lib.nim | 20 ++++++++++++++------ src/nimcoon.nim | 4 ++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/lib.nim b/src/lib.nim index ffa4a4a..1fa2168 100644 --- a/src/lib.nim +++ b/src/lib.nim @@ -85,12 +85,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(\" \")}") diff --git a/src/nimcoon.nim b/src/nimcoon.nim index 31a6088..a0bb93d 100644 --- a/src/nimcoon.nim +++ b/src/nimcoon.nim @@ -50,9 +50,9 @@ proc main() = if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"): if options["download"]: - directDownload(sanitizeURL(searchQuery)) + directDownload(sanitizeURL(searchQuery), options["musicOnly"]) else: - directPlay(sanitizeURL(searchQuery), player) + directPlay(sanitizeURL(searchQuery), player, options["musicOnly"]) quit(0) let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery)) -- 2.43.0