X-Git-Url: http://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/6697cfd20fbad109b18302ab0bb2c094bfdc4b5c..HEAD:/src/peertube.nim

diff --git a/src/peertube.nim b/src/peertube.nim
index 36f1054..16b6d23 100644
--- a/src/peertube.nim
+++ b/src/peertube.nim
@@ -5,14 +5,20 @@ import
   strformat,
   strutils
 
-let 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}"
+let PEERTUBE_REGEX = re"w\/[0-9a-zA-z]{22}"
 
-proc getPeerTubeMagnetLink*(url: string): string =
+proc getPeerTubeMagnetLink*(url: string, musicOnly: bool): string =
   ## Gets the magnet link of the best possible resolution from PeerTube
-  let uuid = url.substr(find(url, PEERTUBE_REGEX) + "videos/watch/".len)
+  let uuid = url.substr(find(url, PEERTUBE_REGEX) + "w/".len)
   let domainName = url.substr(8, find(url, '/', start=8) - 1)
   let apiURL = &"https://{domainName}/api/v1/videos/{uuid}"
   let client = newHttpClient()
   let response = get(client, apiURL)
   let jsonNode = parseJson($response.body)
-  jsonNode["files"][0]["magnetUri"].getStr()
+  var files = jsonNode["files"]
+  if len(jsonNode["files"]) == 0:
+    files = jsonNode["streamingPlaylists"][0]["files"]
+  if musicOnly:
+    files[len(files)-1]["magnetUri"].getStr()
+  else:
+    files[0]["magnetUri"].getStr()