Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/OCR.py
	module/plugins/accounts/BayfilesCom.py
	module/plugins/accounts/CatShareNet.py
	module/plugins/accounts/DebridItaliaCom.py
	module/plugins/accounts/FourSharedCom.py
	module/plugins/accounts/FshareVn.py
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/accounts/LomafileCom.py
	module/plugins/accounts/RapiduNet.py
	module/plugins/accounts/RyushareCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addon/Checksum.py
	module/plugins/addon/ExternalScripts.py
	module/plugins/addon/ExtractArchive.py
	module/plugins/addon/MergeFiles.py
	module/plugins/addon/RestartSlow.py
	module/plugins/addon/SkipRev.py
	module/plugins/addon/UnSkipOnFail.py
	module/plugins/addon/UpdateManager.py
	module/plugins/addon/WindowsPhoneToastNotify.py
	module/plugins/container/CCF.py
	module/plugins/container/LinkList.py
	module/plugins/container/RSDF.py
	module/plugins/crypter/BitshareCom.py
	module/plugins/crypter/CrockoCom.py
	module/plugins/crypter/DataHu.py
	module/plugins/crypter/DepositfilesCom.py
	module/plugins/crypter/Dereferer.py
	module/plugins/crypter/DevhostStFolder.py
	module/plugins/crypter/DlProtectCom.py
	module/plugins/crypter/DontKnowMe.py
	module/plugins/crypter/EasybytezCom.py
	module/plugins/crypter/FilecloudIo.py
	module/plugins/crypter/FilecryptCc.py
	module/plugins/crypter/FilefactoryCom.py
	module/plugins/crypter/FilerNet.py
	module/plugins/crypter/FilestubeCom.py
	module/plugins/crypter/FiletramCom.py
	module/plugins/crypter/FreakhareCom.py
	module/plugins/crypter/FreetexthostCom.py
	module/plugins/crypter/FshareVn.py
	module/plugins/crypter/ImgurComAlbum.py
	module/plugins/crypter/JunocloudMe.py
	module/plugins/crypter/LinkSaveIn.py
	module/plugins/crypter/MegaRapidCz.py
	module/plugins/crypter/MultiUpOrg.py
	module/plugins/crypter/NetfolderIn.py
	module/plugins/crypter/NosvideoCom.py
	module/plugins/crypter/OneKhDe.py
	module/plugins/crypter/PastebinCom.py
	module/plugins/crypter/RapidfileshareNet.py
	module/plugins/crypter/RelinkUs.py
	module/plugins/crypter/TnyCz.py
	module/plugins/crypter/TurbobitNet.py
	module/plugins/crypter/TusfilesNet.py
	module/plugins/crypter/UploadableCh.py
	module/plugins/crypter/UploadedTo.py
	module/plugins/crypter/XFileSharingPro.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/BypassCaptcha.py
	module/plugins/hooks/Captcha9Kw.py
	module/plugins/hooks/CaptchaBrotherhood.py
	module/plugins/hooks/ClickAndLoad.py
	module/plugins/hooks/DeathByCaptcha.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/EasybytezCom.py
	module/plugins/hooks/ExpertDecoders.py
	module/plugins/hooks/FastixRu.py
	module/plugins/hooks/FreeWayMe.py
	module/plugins/hooks/ImageTyperz.py
	module/plugins/hooks/LinkdecrypterCom.py
	module/plugins/hooks/LinksnappyCom.py
	module/plugins/hooks/MegaDebridEu.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/MyfastfileCom.py
	module/plugins/hooks/OverLoadMe.py
	module/plugins/hooks/PremiumTo.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RPNetBiz.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/RehostTo.py
	module/plugins/hooks/SimplyPremiumCom.py
	module/plugins/hooks/SimplydebridCom.py
	module/plugins/hooks/UnrestrictLi.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/AlldebridCom.py
	module/plugins/hoster/BayfilesCom.py
	module/plugins/hoster/DebridItaliaCom.py
	module/plugins/hoster/DepositfilesCom.py
	module/plugins/hoster/DodanePl.py
	module/plugins/hoster/ExtabitCom.py
	module/plugins/hoster/FastixRu.py
	module/plugins/hoster/FastshareCz.py
	module/plugins/hoster/FileParadoxIn.py
	module/plugins/hoster/FileSharkPl.py
	module/plugins/hoster/FilerNet.py
	module/plugins/hoster/FileserveCom.py
	module/plugins/hoster/FreakshareCom.py
	module/plugins/hoster/FreeWayMe.py
	module/plugins/hoster/GigapetaCom.py
	module/plugins/hoster/IfileIt.py
	module/plugins/hoster/Keep2ShareCc.py
	module/plugins/hoster/LetitbitNet.py
	module/plugins/hoster/LinksnappyCom.py
	module/plugins/hoster/LomafileCom.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaDebridEu.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/MyfastfileCom.py
	module/plugins/hoster/OverLoadMe.py
	module/plugins/hoster/PremiumTo.py
	module/plugins/hoster/PremiumizeMe.py
	module/plugins/hoster/RPNetBiz.py
	module/plugins/hoster/RapidgatorNet.py
	module/plugins/hoster/RealdebridCom.py
	module/plugins/hoster/RehostTo.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/SendmywayCom.py
	module/plugins/hoster/ShareonlineBiz.py
	module/plugins/hoster/SimplyPremiumCom.py
	module/plugins/hoster/SimplydebridCom.py
	module/plugins/hoster/TusfilesNet.py
	module/plugins/hoster/UnibytesCom.py
	module/plugins/hoster/UnrestrictLi.py
	module/plugins/hoster/UploadedTo.py
	module/plugins/hoster/WebshareCz.py
	module/plugins/hoster/XFileSharingPro.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/hoster/ZeveraCom.py
	module/plugins/hoster/ZippyshareCom.py
	module/plugins/internal/AbstractExtractor.py
	module/plugins/internal/BasePlugin.py
	module/plugins/internal/CaptchaService.py
	module/plugins/internal/DeadCrypter.py
	module/plugins/internal/DeadHoster.py
	module/plugins/internal/MultiHoster.py
	module/plugins/internal/SimpleCrypter.py
	module/plugins/internal/SimpleHoster.py
	module/plugins/internal/UnRar.py
	module/plugins/internal/UnZip.py
	module/plugins/internal/XFSCrypter.py
	module/plugins/internal/XFSHoster.py

1 files changed, 55 insertions, 60 deletions

diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py
index c6dfae9a6..8ab8cb7c4 100644
--- a/module/plugins/hoster/RPNetBiz.py
+++ b/module/plugins/hoster/RPNetBiz.py
@@ -2,84 +2,79 @@
 
 import re
 
-from pyload.plugin.Hoster import Hoster
-from pyload.utils import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
+from module.common.json_layer import json_loads
 
 
-class RPNetBiz(Hoster):
+class RPNetBiz(MultiHoster):
     __name__    = "RPNetBiz"
     __type__    = "hoster"
-    __version__ = "0.10"
+    __version__ = "0.14"
 
-    __description__ = """RPNet.biz hoster plugin"""
+    __description__ = """RPNet.biz multi-hoster plugin"""
     __license__     = "GPLv3"
 
-    __pattern__ = r'https?://.*rpnet\.biz'
+    __pattern__ = r'https?://.+rpnet\.biz'
     __authors__     = [("Dman", "dmanugm@gmail.com")]
 
 
     def setup(self):
         self.chunkLimit = -1
-        self.resumeDownload = True
 
 
-    def process(self, pyfile):
-        if re.match(self.__pattern__, pyfile.url):
-            link_status = {'generated': pyfile.url}
-        elif not self.account:
-            # Check account
-            self.logError(_("Please enter your %s account or deactivate this plugin") % "rpnet")
-            self.fail(_("No rpnet account provided"))
-        else:
-            (user, data) = self.account.selectAccount()
-
-            self.logDebug("Original URL: %s" % pyfile.url)
-            # Get the download link
-            res = self.load("https://premium.rpnet.biz/client_api.php",
-                            get={"username": user,
-                                 "password": data['password'],
-                                 "action": "generate",
-                                 "links": pyfile.url})
-
-            self.logDebug("JSON data: %s" % res)
-            link_status = json_loads(res)['links'][0]  # get the first link... since we only queried one
-
-            # Check if we only have an id as a HDD link
-            if 'id' in link_status:
-                self.logDebug("Need to wait at least 30 seconds before requery")
-                self.setWait(30)  # wait for 30 seconds
+    def handlePremium(self, pyfile):
+        user, data = self.account.selectAccount()
+
+        # Get the download link
+        res = self.load("https://premium.rpnet.biz/client_api.php",
+                        get={"username": user,
+                             "password": data['password'],
+                             "action"  : "generate",
+                             "links"   : pyfile.url})
+
+        self.logDebug("JSON data: %s" % res)
+        link_status = json_loads(res)['links'][0]  # get the first link... since we only queried one
+
+        # Check if we only have an id as a HDD link
+        if 'id' in link_status:
+            self.logDebug("Need to wait at least 30 seconds before requery")
+            self.setWait(30)  # wait for 30 seconds
+            self.wait()
+            # Lets query the server again asking for the status on the link,
+            # we need to keep doing this until we reach 100
+            max_tries = 30
+            my_try = 0
+            while (my_try <= max_tries):
+                self.logDebug("Try: %d ; Max Tries: %d" % (my_try, max_tries))
+                res = self.load("https://premium.rpnet.biz/client_api.php",
+                                get={"username": user,
+                                     "password": data['password'],
+                                     "action": "downloadInformation",
+                                     "id": link_status['id']})
+                self.logDebug("JSON data hdd query: %s" % res)
+                download_status = json_loads(res)['download']
+
+                if download_status['status'] == '100':
+                    link_status['generated'] = download_status['rpnet_link']
+                    self.logDebug("Successfully downloaded to rpnet HDD: %s" % link_status['generated'])
+                    break
+                else:
+                    self.logDebug("At %s%% for the file download" % download_status['status'])
+
+                self.setWait(30)
                 self.wait()
-                # Lets query the server again asking for the status on the link,
-                # we need to keep doing this until we reach 100
-                max_tries = 30
-                my_try = 0
-                while (my_try <= max_tries):
-                    self.logDebug("Try: %d ; Max Tries: %d" % (my_try, max_tries))
-                    res = self.load("https://premium.rpnet.biz/client_api.php",
-                                    get={"username": user,
-                                         "password": data['password'],
-                                         "action": "downloadInformation",
-                                         "id": link_status['id']})
-                    self.logDebug("JSON data hdd query: %s" % res)
-                    download_status = json_loads(res)['download']
-
-                    if download_status['status'] == '100':
-                        link_status['generated'] = download_status['rpnet_link']
-                        self.logDebug("Successfully downloaded to rpnet HDD: %s" % link_status['generated'])
-                        break
-                    else:
-                        self.logDebug("At %s%% for the file download" % download_status['status'])
-
-                    self.setWait(30)
-                    self.wait()
-                    my_try += 1
-
-                if my_try > max_tries:  # We went over the limit!
-                    self.fail(_("Waited for about 15 minutes for download to finish but failed"))
+                my_try += 1
+
+            if my_try > max_tries:  # We went over the limit!
+                self.fail(_("Waited for about 15 minutes for download to finish but failed"))
 
         if 'generated' in link_status:
-            self.download(link_status['generated'], disposition=True)
+            self.link = link_status['generated']
+            return
         elif 'error' in link_status:
             self.fail(link_status['error'])
         else:
             self.fail(_("Something went wrong, not supposed to enter here"))
+
+
+getInfo = create_getInfo(RPNetBiz)