1 files changed, 51 insertions, 57 deletions
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index 116d98e47..99fe01257 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -2,82 +2,73 @@
 
 import re
 
-from datetime import datetime, timedelta
+from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
+from module.plugins.internal.SimpleHoster import secondsToMidnight
 
-from pyload.utils import json_loads
-from pyload.plugin.Hoster import Hoster
 
-
-def secondsToMidnight(gmt=0):
-    now = datetime.utcnow() + timedelta(hours=gmt)
-    if now.hour is 0 and now.minute < 10:
-        midnight = now
-    else:
-        midnight = now + timedelta(days=1)
-    midnight = midnight.replace(hour=0, minute=10, second=0, microsecond=0)
-    return int((midnight - now).total_seconds())
-
-
-class UnrestrictLi(Hoster):
+class UnrestrictLi(MultiHoster):
     __name__    = "UnrestrictLi"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.21"
 
-    __pattern__ = r'https?://(?:[^/]*\.)?(unrestrict|unr)\.li'
+    __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+'
 
-    __description__ = """Unrestrict.li hoster plugin"""
+    __description__ = """Unrestrict.li multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
+    LOGIN_ACCOUNT = False
+
+
     def setup(self):
-        self.chunkLimit = 16
+        self.chunkLimit     = 16
         self.resumeDownload = True
 
 
-    def process(self, pyfile):
-        if re.match(self.__pattern__, pyfile.url):
-            new_url = pyfile.url
-        elif not self.account:
-            self.logError(_("Please enter your %s account or deactivate this plugin") % "Unrestrict.li")
-            self.fail(_("No Unrestrict.li account provided"))
+    def handleFree(self, pyfile):
+        for _i in xrange(5):
+            self.html = self.load('https://unrestrict.li/unrestrict.php',
+                             post={'link': pyfile.url, 'domain': 'long'})
+
+            self.logDebug("JSON data: " + self.html)
+
+            if self.html:
+                break
         else:
-            self.logDebug("Old URL: %s" % pyfile.url)
-            for _i in xrange(5):
-                page = self.load('https://unrestrict.li/unrestrict.php',
-                                 post={'link': pyfile.url, 'domain': 'long'})
-                self.logDebug("JSON data: " + page)
-                if page != '':
-                    break
-            else:
-                self.logInfo(_("Unable to get API data, waiting 1 minute and retry"))
-                self.retry(5, 60, "Unable to get API data")
-
-            if 'Expired session' in page or ("You are not allowed to "
-                                             "download from this host" in page and self.premium):
-                self.account.relogin(self.user)
-                self.retry()
-            elif "File offline" in page:
-                self.offline()
-            elif "You are not allowed to download from this host" in page:
-                self.fail(_("You are not allowed to download from this host"))
-            elif "You have reached your daily limit for this host" in page:
-                self.logWarning(_("Reached daily limit for this host"))
-                self.retry(5, secondsToMidnight(gmt=2), "Daily limit for this host reached")
-            elif "ERROR_HOSTER_TEMPORARILY_UNAVAILABLE" in page:
-                self.logInfo(_("Hoster temporarily unavailable, waiting 1 minute and retry"))
-                self.retry(5, 60, "Hoster is temporarily unavailable")
-            page = json_loads(page)
-            new_url = page.keys()[0]
-            self.api_data = page[new_url]
-
-        if new_url != pyfile.url:
-            self.logDebug("New URL: " + new_url)
+            self.logInfo(_("Unable to get API data, waiting 1 minute and retry"))
+            self.retry(5, 60, "Unable to get API data")
+
+        if 'Expired session' in self.html \
+           or ("You are not allowed to download from this host" in self.html and self.premium):
+            self.account.relogin(self.user)
+            self.retry()
+
+        elif "File offline" in self.html:
+            self.offline()
+
+        elif "You are not allowed to download from this host" in self.html:
+            self.fail(_("You are not allowed to download from this host"))
+
+        elif "You have reached your daily limit for this host" in self.html:
+            self.logWarning(_("Reached daily limit for this host"))
+            self.retry(5, secondsToMidnight(gmt=2), "Daily limit for this host reached")
+
+        elif "ERROR_HOSTER_TEMPORARILY_UNAVAILABLE" in self.html:
+            self.logInfo(_("Hoster temporarily unavailable, waiting 1 minute and retry"))
+            self.retry(5, 60, "Hoster is temporarily unavailable")
+
+        self.html     = json_loads(self.html)
+        self.link     = self.html.keys()[0]
+        self.api_data = self.html[self.link]
 
         if hasattr(self, 'api_data'):
             self.setNameSize()
 
-        self.download(new_url, disposition=True)
+
+    def checkFile(self):
+        super(UnrestrictLi, self).checkFile()
 
         if self.getConfig("history"):
             self.load("https://unrestrict.li/history/", get={'delete': "all"})
@@ -89,3 +80,6 @@ class UnrestrictLi(Hoster):
             self.pyfile.name = self.api_data['name']
         if 'size' in self.api_data:
             self.pyfile.size = self.api_data['size']
+
+
+getInfo = create_getInfo(UnrestrictLi)