Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 21 insertions, 11 deletions

diff --git a/pyload/plugin/addon/JustPremium.py b/pyload/plugin/addon/JustPremium.py
index d3c4d8eff..e69bc24f6 100644
--- a/pyload/plugin/addon/JustPremium.py
+++ b/pyload/plugin/addon/JustPremium.py
@@ -8,18 +8,24 @@ from pyload.plugin.Addon import Addon
 class JustPremium(Addon):
     __name__    = "JustPremium"
     __type__    = "addon"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
-    __config__ = [("excluded", "str", "Exclude hosters (comma separated)", "")]
+    __config__ = [("excluded", "str", "Exclude hosters (comma separated)", ""),
+                  ("included", "str", "Include hosters (comma separated)", "")]
 
-    __description__ = """Remove all not premium links from urls added"""
+    __description__ = """Remove not-premium links from added urls"""
     __license__     = "GPLv3"
-    __authors__     = [("mazleu", "mazleica@gmail.com"),
-                       ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("immenz", "immenz@gmx.net")]
+    __authors__     = [("mazleu"        , "mazleica@gmail.com"),
+                       ("Walter Purcaro", "vuolter@gmail.com" ),
+                       ("immenz"        , "immenz@gmx.net"    )]
 
 
     event_list = ["linksAdded"]
+    interval   = 0  #@TODO: Remove in 0.4.10
+
+
+    def setup(self):
+        self.info = {}  #@TODO: Remove in 0.4.10
 
 
     def linksAdded(self, links, pid):
@@ -32,14 +38,18 @@ class JustPremium(Addon):
                              if 'new_name' in hosterdict[hoster] \
                              and hosterdict[hoster]['new_name'] in premiumplugins)
 
-        #: Found at least one hoster with account or multihoster
-        if not any(True for pluginname in linkdict if pluginname in premiumplugins | multihosters):
-            return
-
         excluded = map(lambda domain: "".join(part.capitalize() for part in re.split(r'(\.|\d+)', domain) if part != '.'),
                        self.getConfig('excluded').replace(' ', '').replace(',', '|').replace(';', '|').split('|'))
+        included = map(lambda domain: "".join(part.capitalize() for part in re.split(r'(\.|\d+)', domain) if part != '.'),
+                       self.getConfig('included').replace(' ', '').replace(',', '|').replace(';', '|').split('|'))
+
+        hosterlist = (premiumplugins | multihosters).union(excluded).difference(included)
+
+        #: Found at least one hoster with account or multihoster
+        if not any( True for pluginname in linkdict if pluginname in hosterlist ):
+            return
 
-        for pluginname in set(linkdict.keys()) - (premiumplugins | multihosters).union(excluded):
+        for pluginname in set(linkdict.keys()) - hosterlist:
             self.logInfo(_("Remove links of plugin: %s") % pluginname)
             for link in linkdict[pluginname]:
                 self.logDebug("Remove link: %s" % link)