let
processOptions = {poStdErrToStdOut, poUsePath} # Add poEchoCmd to debug
- PEERTUBE_REGEX = re"videos\/watch\/[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}"
+ PEERTUBE_REGEX = re"w\/[0-9a-zA-z]{22}"
proc isInstalled(program: string): bool =
return availablePlayers[0]
+proc printTitle(action: string, title: string) =
+ styledEcho "\n", fgGreen, &"{action} ", styleBright, fgMagenta, title
+
+
###############
# URL CLEANUP #
###############
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
+ printTitle("Playing", title)
if "--no-video" in args:
discard execShellCmd(&"{player} {args.join(\" \")}")
else:
proc download*(args: openArray[string], title: string) =
- styledEcho "\n", fgGreen, "Downloading ", styleBright, fgMagenta, title
- discard execShellCmd(&"youtube-dl {args.join(\" \")}")
+ printTitle("Downloading", title)
+ discard execShellCmd(&"yt-dlp {args.join(\" \")}")
proc directDownload*(url: string, options: Options) =
let args = buildDownloadArgs(url, options)
if "aria2c".isInstalled:
- discard execShellCmd(&"youtube-dl {args.join(\" \")} --external-downloader aria2c --external-downloader-args '-x 16 -s 16 -k 2M'")
+ discard execShellCmd(&"yt-dlp {args.join(\" \")} --external-downloader aria2c --external-downloader-args '-x 16 -s 16 -k 2M'")
else:
- discard execShellCmd(&"youtube-dl {args.join(\" \")}")
+ discard execShellCmd(&"yt-dlp {args.join(\" \")}")
proc luckyDownload*(searchQuery: string, options: Options) =
- let args = @[&"ytsearch:\"{searchQuery}\""] & buildDownloadArgs("", options)
- styledEcho "\n", fgGreen, "Searching and downloading using youtube-dl"
- discard execShellCmd(&"youtube-dl {args.join(\" \")}")
+ let args = @[&"ytsearch1:\"{searchQuery}\""] & buildDownloadArgs("", options)
+ let title = execProcess(&"yt-dlp --get-title {args.join(\" \")}").split("\n")[0]
+ download(args, title)
proc luckyPlay*(searchQuery: string, player: string, options: Options) =
let args = @[&"ytsearch:\"{searchQuery}\""] & buildDownloadArgs("", options)
- let output = execProcess(&"youtube-dl --get-url {args.join(\" \")}")
- let url = output.split("\n")[0]
- play(player, options, url)
+ let output = execProcess(&"yt-dlp --get-url --get-title {args.join(\" \")}").split("\n")
+ let
+ title = output[0]
+ url = &"\"{output[1]}\""
+ play(player, options, url, title)
###########
# OPTIONS #