From de8e430edadb0d6998e5387ee4cfe683cabcdf03 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 14 May 2018 14:41:04 -0500
Subject: [PATCH] yourupload: fix

---
 plugin.video.alfa/servers/yourupload.py | 26 +++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugin.video.alfa/servers/yourupload.py b/plugin.video.alfa/servers/yourupload.py
index db5b7647..aeda1f91 100755
--- a/plugin.video.alfa/servers/yourupload.py
+++ b/plugin.video.alfa/servers/yourupload.py
@@ -17,21 +17,27 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
-
     video_urls = []
     data = httptools.downloadpage(page_url).data
+    url1 = httptools.downloadpage(page_url, follow_redirects=False, only_headers=True).headers.get("location", "")
+    referer = {'Referer': page_url}
     url = scrapertools.find_single_match(data, '<meta property="og:video" content="([^"]+)"')
     if not url:
-        url = scrapertools.find_single_match(data, "file:\s*'([^']+)'")
+        if "download" in page_url:
+            url = httptools.downloadpage("https:" + url1, headers=referer, follow_redirects=False, only_headers=True).headers.get("location", "")
+        else:
+            url = scrapertools.find_single_match(data, "file:\s*'([^']+)'")
     if url:
-        url = "https://www.yourupload.com%s" % url
-        referer = {'Referer': page_url}
-        location = httptools.downloadpage(url, headers=referer, follow_redirects=False, only_headers=True)
-        media_url = location.headers["location"].replace("?start=0", "").replace("https", "http")
-        media_url += "|Referer=%s" % url
-        video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [yourupload]", media_url])
-
+        if "vidcache" not in url:
+            url = "https://www.yourupload.com%s" % url
+            location = httptools.downloadpage(url, headers=referer, follow_redirects=False, only_headers=True)
+            media_url = location.headers["location"].replace("?start=0", "").replace("https", "http")
+            ext = media_url[-4:]
+            media_url += "|Referer=%s" % url
+        else:
+            ext = url[-4:]
+            media_url = url +"|Referer=%s" % page_url
+        video_urls.append([ext + " [yourupload]", media_url])
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))
-
     return video_urls