1 files changed, 58 insertions, 60 deletions

diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py
index feedd7651..361d48c2d 100644
--- a/module/plugins/hoster/NoPremiumPl.py
+++ b/module/plugins/hoster/NoPremiumPl.py
@@ -1,75 +1,74 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleHoster import SimpleHoster
-from module.common.json_layer import json_loads as loads
-
-
-class NoPremiumPl(SimpleHoster):
-    __name__ = "NoPremiumPl"
-    __version__ = "0.01"
-    __type__ = "hoster"
-
-    __pattern__ = r"https?://direct\.nopremium\.pl.*"
-    __description__ = "NoPremium.pl hoster plugin"
-    __license__ = "GPLv3"
-    __authors__ = [("goddie", "dev@nopremium.pl")]
-
-    _api_url = "http://crypt.nopremium.pl"
-
-    _api_query = {"site": "nopremium",
-                  "output": "json",
-                  "username": "",
-                  "password": "",
-                  "url": ""}
-
-    _error_codes = {
-        0: "[%s] Incorrect login credentials",
-        1: "[%s] Not enough transfer to download - top-up your account",
-        2: "[%s] Incorrect / dead link",
-        3: "[%s] Error connecting to hosting, try again later",
-        9: "[%s] Premium account has expired",
-        15: "[%s] Hosting no longer supported",
-        80: "[%s] Too many incorrect login attempts, account blocked for 24h"
-    }
-
-    _usr = False
-    _pwd = False
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL = True
-
-    def get_username_password(self):
-        if not self.account:
-            self.fail(_("Please enter your %s account or deactivate this plugin") % "NoPremium.pl")
-        else:
-            data = self.account.getAccountData(self.user)
-            self._usr = data['usr']
-            self._pwd = data['pwd']
+from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster
+
+
+class NoPremiumPl(MultiHoster):
+    __name__    = "NoPremiumPl"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'https?://direct\.nopremium\.pl.+'
+
+    __description__ = """NoPremium.pl multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("goddie", "dev@nopremium.pl")]
+
+
+    API_URL = "http://crypt.nopremium.pl"
+
+    API_QUERY = {'site'    : "nopremium",
+                 'output'  : "json",
+                 'username': "",
+                 'password': "",
+                 'url'     : ""}
+
+    ERROR_CODES = {0 : "[%s] Incorrect login credentials",
+                   1 : "[%s] Not enough transfer to download - top-up your account",
+                   2 : "[%s] Incorrect / dead link",
+                   3 : "[%s] Error connecting to hosting, try again later",
+                   9 : "[%s] Premium account has expired",
+                   15: "[%s] Hosting no longer supported",
+                   80: "[%s] Too many incorrect login attempts, account blocked for 24h"}
+
+
+    def prepare(self):
+        super(NoPremiumPl, self).prepare()
+
+        data = self.account.getAccountData(self.user)
+
+        self.usr = data['usr']
+        self.pwd = data['pwd']
+
 
     def runFileQuery(self, url, mode=None):
-        query = self._api_query.copy()
-        query["username"] = self._usr
-        query["password"] = self._pwd
-        query["url"] = url
+        query = self.API_QUERY.copy()
+
+        query["username"] = self.usr
+        query["password"] = self.pwd
+        query["url"]      = url
 
         if mode == "fileinfo":
             query['check'] = 2
-            query['loc'] = 1
+            query['loc']   = 1
+
         self.logDebug(query)
 
-        return self.load(self._api_url, post=query)
+        return self.load(self.API_URL, post=query)
 
-    def process(self, pyfile):
-        self.get_username_password()
+
+    def handleFree(self, pyfile):
         try:
             data = self.runFileQuery(pyfile.url, 'fileinfo')
+
         except Exception:
             self.logDebug("runFileQuery error")
             self.tempOffline()
 
         try:
-            parsed = loads(data)
+            parsed = json_loads(data)
+
         except Exception:
             self.logDebug("loads error")
             self.tempOffline()
@@ -77,9 +76,9 @@ class NoPremiumPl(SimpleHoster):
         self.logDebug(parsed)
 
         if "errno" in parsed.keys():
-            if parsed["errno"] in self._error_codes:
+            if parsed["errno"] in self.ERROR_CODES:
                 # error code in known
-                self.fail(self._error_codes[parsed["errno"]] % self.__name__)
+                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)
             else:
                 # error code isn't yet added to plugin
                 self.fail(
@@ -97,9 +96,8 @@ class NoPremiumPl(SimpleHoster):
         pyfile.size = parsed["filesize"]
 
         try:
-            result_dl = self.runFileQuery(pyfile.url, 'filedownload')
+            self.link = self.runFileQuery(pyfile.url, 'filedownload')
+
         except Exception:
             self.logDebug("runFileQuery error #2")
             self.tempOffline()
-
-        self.download(result_dl, disposition=True)