Fix all recent bugs. Shift to Invidious API.

[nimcoon.git] / src / lib.nim

diff --git a/src/lib.nim b/src/lib.nim
index e43cfd7033adc2f832b90a67fc248c2d86813006..33b15d933dcde8e8dd2b2675890254b6d5d2a3c1 100644 (file)
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -16,7 +16,7 @@ import
 
 
 let
-  processOptions = {poStdErrToStdOut, poUsePath} # poEchoCmd can be added to options for debugging
+  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}"
 
 
@@ -87,12 +87,14 @@ 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.strip(chars={'\\'})
+func stripZshEscaping(url: string): string = url.replace("\\", "")
 
 
 func sanitizeURL*(url: string): string =