UploadedTo indirect download fix

2 files changed, 13 insertions, 1 deletions

diff --git a/module/network/Request.py b/module/network/Request.py
index d1280f591..9155185fd 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -154,6 +154,7 @@ class Request:
                 self.pycurl.setopt(pycurl.NOPROGRESS, 1)
                 self.pycurl.setopt(pycurl.NOBODY, 1)
                 self.pycurl.perform()
+                self.lastEffectiveURL = self.pycurl.getinfo(pycurl.EFFECTIVE_URL)
                 self.pycurl.setopt(pycurl.NOPROGRESS, 0)
                 self.pycurl.setopt(pycurl.NOBODY, 0)
                 return self.header
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 0d487be46..6079003bf 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -125,10 +125,21 @@ class UploadedTo(Plugin):
             return False
         else:
             return True
-
+    
+    def cleanUrl(self, url):
+        url = url.replace("ul.to/", "uploaded.to/file/")
+        url = url.replace("/?id=", "/file/")
+        url = url.replace("?id=", "file/")
+        url = re.sub("/\?(.*?)&id=", "/file/", url, 1)
+        return url
+    
     def proceed(self, url, location):
         if self.config['premium']:
             self.req.load("http://uploaded.to/login", None, { "email" : self.config['username'], "password" : self.config['password']}, cookies=True)
+            self.req.load(url, cookies=True, just_header=True)
+            if self.cleanUrl(self.req.lastEffectiveURL) == self.cleanUrl(url):
+                self.logger.info("UploadedTo indirect download")
+                url = self.cleanUrl(url)+"?redirect"
             self.req.download(url, location, cookies=True)
         else:
             self.req.download(url, location, cookies=False, post={"download_submit": "Free Download"})