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, 60 insertions, 61 deletions

diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py
index f2e00cbf1..a87e7533f 100644
--- a/module/plugins/hoster/SimplyPremiumCom.py
+++ b/module/plugins/hoster/SimplyPremiumCom.py
@@ -4,79 +4,78 @@ import re
 
 from datetime import datetime, timedelta
 
-from pyload.plugin.Hoster import Hoster
-from pyload.plugin.hoster.UnrestrictLi import secondsToMidnight
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
+from module.plugins.internal.SimpleHoster import secondsToMidnight
 
 
-class SimplyPremiumCom(Hoster):
+class SimplyPremiumCom(MultiHoster):
     __name__    = "SimplyPremiumCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.08"
 
-    __pattern__ = r'https?://.*(simply-premium)\.com'
+    __pattern__ = r'https?://.+simply-premium\.com'
 
-    __description__ = """Simply-Premium.com hoster plugin"""
+    __description__ = """Simply-Premium.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def setup(self):
         self.chunkLimit = 16
-        self.resumeDownload = False
 
 
-    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") % "Simply-Premium.com")
-            self.fail(_("No Simply-Premium.com account provided"))
+    def checkErrors(self):
+        if '<valid>0</valid>' 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 "NOTFOUND" in self.html:
+            self.offline()
+
+        elif "downloadlimit" in self.html:
+            self.logWarning(_("Reached maximum connctions"))
+            self.retry(5, 60, _("Reached maximum connctions"))
+
+        elif "trafficlimit" in self.html:
+            self.logWarning(_("Reached daily limit for this host"))
+            self.retry(wait_time=secondsToMidnight(gmt=2), reason="Daily limit for this host reached")
+
+        elif "hostererror" in self.html:
+            self.logWarning(_("Hoster temporarily unavailable, waiting 1 minute and retry"))
+            self.retry(5, 60, _("Hoster is temporarily unavailable"))
+
+
+    def handlePremium(self, pyfile):
+        for i in xrange(5):
+            self.html = self.load("http://www.simply-premium.com/premium.php", get={'info': "", 'link': self.pyfile.url})
+
+            if self.html:
+                self.logDebug("JSON data: " + self.html)
+                break
         else:
-            self.logDebug("Old URL: %s" % pyfile.url)
-            for i in xrange(5):
-                page = self.load("http://www.simply-premium.com/premium.php", get={'info': "", 'link': pyfile.url})
-                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 '<valid>0</valid>' 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 "NOTFOUND" in page:
-                self.offline()
-            elif "downloadlimit" in page:
-                self.logWarning(_("Reached maximum connctions"))
-                self.retry(5, 60, "Reached maximum connctions")
-            elif "trafficlimit" in page:
-                self.logWarning(_("Reached daily limit for this host"))
-                self.retry(wait_time=secondsToMidnight(gmt=2), "Daily limit for this host reached")
-            elif "hostererror" in page:
-                self.logWarning(_("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]
-
-            try:
-                self.pyfile.name = re.search(r'<name>([^<]+)</name>', page).group(1)
-            except AttributeError:
-                self.pyfile.name = ""
-
-            try:
-                self.pyfile.size = re.search(r'<size>(\d+)</size>', page).group(1)
-            except AttributeError:
-                self.pyfile.size = 0
-
-            try:
-                new_url = re.search(r'<download>([^<]+)</download>', page).group(1)
-            except AttributeError:
-                new_url = 'http://www.simply-premium.com/premium.php?link=' + pyfile.url
-
-        if new_url != pyfile.url:
-            self.logDebug("New URL: " + new_url)
-
-        self.download(new_url, disposition=True)
+            self.logInfo(_("Unable to get API data, waiting 1 minute and retry"))
+            self.retry(5, 60, _("Unable to get API data"))
+
+        self.checkErrors()
+
+        try:
+            self.pyfile.name = re.search(r'<name>([^<]+)</name>', self.html).group(1)
+
+        except AttributeError:
+            self.pyfile.name = ""
+
+        try:
+            self.pyfile.size = re.search(r'<size>(\d+)</size>', self.html).group(1)
+
+        except AttributeError:
+            self.pyfile.size = 0
+
+        try:
+            self.link = re.search(r'<download>([^<]+)</download>', self.html).group(1)
+
+        except AttributeError:
+            self.link = 'http://www.simply-premium.com/premium.php?link=' + self.pyfile.url
+
+
+getInfo = create_getInfo(SimplyPremiumCom)