From 1fda47b23d128bda8effb4eb2b0ad65313313d91 Mon Sep 17 00:00:00 2001
From: vwheezy22 <vwhiz22@gmail.com>
Date: Tue, 27 Jul 2021 12:46:19 -0700
Subject: [PATCH] Get video id from new endpoint

---
 yuja-dl | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/yuja-dl b/yuja-dl
index 11a29d1..e2d45d8 100755
--- a/yuja-dl
+++ b/yuja-dl
@@ -8,8 +8,8 @@
 
 function download_url {
 	local url="$1"; local output="$2"
-	local id="$(echo "$url" | video_id)"
 	local sub="$(echo "$url" | subdomain)"
+    local id="$(video_metadata "$url" "$sub" | video_pid)"
 
 	local captions_key="$(get_metadata "$sub" "$id" | caption_file_key)"
 	local node_pid="$(get_metadata "$sub" "$id" | video_node_pid)"
@@ -39,6 +39,10 @@ function video_node_pid {
 	| jq -r .videoListNodePID
 }
 
+function video_pid {
+    jq -r .videoPID
+}
+
 #---------------------------------------
 
 function get_node_metadata {
@@ -79,16 +83,23 @@ function caption_url {
 
 #---------------------------------------
 
-function video_id {
-	sed 's%.*v=%%' \
-	| sed 's%&.*%%'
-}
-
 function subdomain {
 	awk -F '.' '{print $1}' \
 	| sed 's%.*//%%'
 }
 
+function video_uid {
+    sed 's%.*u=%%' \
+    | sed 's%&.*%%'
+}
+
+function video_metadata {
+    local url="$1"; local sub="$2"
+    local uid="$(echo "$url" | video_uid)"
+    curl -b "$COOKIES" -s \
+    "https://${sub}.yuja.com/V/VideoDecryptLogicServlet?u=${uid}"
+}
+
 # INVOCATION
 # --------------------------------------
 function usage {