Fix all recent bugs. Shift to Invidious API.

[nimcoon.git] / src / lib.nim

diff --git a/src/lib.nim b/src/lib.nim
index ccd1a39797f990c90c870f52d72bc72f179150ec..33b15d933dcde8e8dd2b2675890254b6d5d2a3c1 100644 (file)
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -1,5 +1,4 @@
 import
-  htmlparser,
   httpClient,
   json,
   os,
@@ -8,28 +7,16 @@ import
   sequtils,
   std/[terminal],
   strformat,
-  strformat,
-  strtabs,
   strutils,
-  sugar,
-  tables,
-  uri,
-  xmltree
-
-import config
-
+  tables
 
-type
-  Options* = Table[string, bool]
-  SearchResult* = tuple[title: string, url: string]
-  SearchResults* = seq[tuple[title: string, url: string]]
-  CommandLineOptions* = tuple[searchQuery: string, options: Options]
-  SelectionRange* = tuple[begin: int, until: int]
+import
+  config,
+  types
 
 
-# poEchoCmd can be added to options for debugging
 let
-  processOptions = {poStdErrToStdOut, poUsePath}
+  processOptions = {poStdErrToStdOut, poUsePath, poEchoCmd}
   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}"
 
 
@@ -46,15 +33,8 @@ proc selectMediaPlayer*(): string =
     return availablePlayers[0]
 
 
-proc getYoutubePage*(searchQuery: string): string =
-  let queryParam = encodeUrl(searchQuery)
-  let client = newHttpClient()
-  let response = get(client, &"https://www.youtube.com/results?hl=en&search_query={queryParam}")
-  $response.body
-
-
 proc getPeerTubeMagnetLink(url: string): string =
-  # Gets the magnet link of the best possible resolutino from PeerTube
+  ## Gets the magnet link of the best possible resolution from PeerTube
   let uuid = url.substr(find(url, PEERTUBE_REGEX) + "videos/watch/".len)
   let domainName = url.substr(8, find(url, '/', start=8) - 1)
   let apiURL = &"https://{domainName}/api/v1/videos/{uuid}"
@@ -64,31 +44,13 @@ proc getPeerTubeMagnetLink(url: string): string =
   jsonNode["files"][0]["magnetUri"].getStr()
 
 
-func extractTitlesAndUrls*(html: string): SearchResults =
-  {.noSideEffect.}:
-    parseHtml(html).findAll("a").
-      filter(a => "watch" in a.attrs["href"] and a.attrs.hasKey "title").
-      map(a => (a.attrs["title"], "https://www.youtube.com" & a.attrs["href"]))
-
-
 proc presentVideoOptions*(searchResults: SearchResults) =
   eraseScreen()
   for index, (title, url) in searchResults:
-    styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n"
-
-
-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
+    styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, "   ", url, "\n"
 
 
 func buildPlayerArgs(url: string, options: Table[string, bool], player: string): seq[string] =
-  let url =
-    # Playlists are only supported by MPV player. VLC needs a plugin.
-    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: ""
   filterIt([url, musicOnly, fullScreen], it != "")
@@ -125,9 +87,11 @@ proc download*(args: openArray[string], title: string) =
 func urlLongen(url: string): string = url.replace("youtu.be/", "www.youtube.com/watch?v=")
 
 
-func rewriteInvidiousToYouTube(url: string): string =
+func rewriteInvidiousToYouTube*(url: string): string =
   {.noSideEffect.}:
-    if rewriteInvidiousURLs: url.replace("invidio.us", "www.youtube.com") else: url
+    if rewriteInvidiousURLs and url.replace(".", "").contains("invidious"):
+       &"https://www.youtube.com/watch?v={url.split(\"=\")[1]}"
+    else: url
 
 
 func stripZshEscaping(url: string): string = url.replace("\\", "")
@@ -157,7 +121,10 @@ proc directDownload*(url: string, musicOnly: bool) =
   let args =
     if musicOnly: buildMusicDownloadArgs(url)
     else: buildVideoDownloadArgs(url)
-  discard execShellCmd(&"youtube-dl {args.join(\" \")}")
+  if isInstalled("aria2c"):
+    discard execShellCmd(&"youtube-dl {args.join(\" \")} --external-downloader aria2c --external-downloader-args '-x 16 -s 16 -k 2M'")
+  else:
+    discard execShellCmd(&"youtube-dl {args.join(\" \")}")
 
 
 proc offerSelection(searchResults: SearchResults, options: Table[string, bool], selectionRange: SelectionRange): string =