diff options
| author | 2013-06-08 15:25:59 +0200 | |
|---|---|---|
| committer | 2013-06-08 15:25:59 +0200 | |
| commit | ec016666a766da2e0c48bff4b959aa7d7d8b20a6 (patch) | |
| tree | 6ecb7dbf93eddd3fa0757521e35b8418d8ed4988 /module/plugins/hooks | |
| parent | EasybytezCom: version increase after 4a567fcddf6fdd4c2787f9d0153bfdb176993d15 (diff) | |
| parent | XvidstageCom: Implemented as hook plugin (XFileSharingPro) and removed hoster... (diff) | |
| download | pyload-ec016666a766da2e0c48bff4b959aa7d7d8b20a6.tar.xz | |
Merge pull request #155 from 4Christopher/XvidstageCom-fix
XvidstageCom: The plugin is now implemented as pure XFileSharingPro.
Diffstat (limited to 'module/plugins/hooks')
| -rw-r--r-- | module/plugins/hooks/XFileSharingPro.py | 46 | 
1 files changed, 23 insertions, 23 deletions
| diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index 105c70113..ceaec96c6 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -5,7 +5,7 @@ import re  class XFileSharingPro(Hook):      __name__ = "XFileSharingPro" -    __version__ = "0.04" +    __version__ = "0.05"      __type__ = "hook"      __config__ = [ ("activated" , "bool" , "Activated"  , "True"),                     ("loadDefault", "bool", "Include default (built-in) hoster list" , "True"), @@ -14,57 +14,57 @@ class XFileSharingPro(Hook):      __description__ = """Hoster URL pattern loader for the generic XFileSharingPro plugin"""      __author_name__ = ("zoidberg")      __author_mail__ = ("zoidberg@mujmail.cz") -           +      def coreReady(self):          self.loadPattern() -       -    def loadPattern(self):          + +    def loadPattern(self):          hosterList = self.getConfigSet('includeList') -        excludeList = self.getConfigSet('excludeList')          -         -        if self.getConfig('loadDefault'):         +        excludeList = self.getConfigSet('excludeList') + +        if self.getConfig('loadDefault'):              hosterList |= set((              #WORKING HOSTERS:              "aieshare.com", "asixfiles.com", "banashare.com", "cyberlocker.ch", "eyesfile.co", "eyesfile.com", -            "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com",  -            "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be",   -            #NOT TESTED:             -            "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com",  +            "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com", +            "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be", "xvidstage.com", +            #NOT TESTED: +            "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com",              "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", "rockdizfile.com", "limfile.com" -            "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", "shareswift.com", "sharingonline.com", "6ybh-upload.com",  -            "skipfile.com", "spaadyshare.com", "space4file.com", "uploadbaz.com", "uploadc.com",  -            "uploaddot.com", "uploadfloor.com", "uploadic.com", "uploadville.com", "vidbull.com", "zalaa.com",  +            "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", "shareswift.com", "sharingonline.com", "6ybh-upload.com", +            "skipfile.com", "spaadyshare.com", "space4file.com", "uploadbaz.com", "uploadc.com", +            "uploaddot.com", "uploadfloor.com", "uploadic.com", "uploadville.com", "vidbull.com", "zalaa.com",              "zomgupload.com", "kupload.org", "movbay.org", "multishare.org", "omegave.org", "toucansharing.org", "uflinq.org",              "banicrazy.info", "flowhot.info", "upbrasil.info", "shareyourfilez.biz", "bzlink.us", "cloudcache.cc", "fileserver.cc"              "farshare.to", "filemaze.ws", "filehost.ws", "filestock.ru", "moidisk.ru", "4up.im", "100shared.com",              #WRONG FILE NAME: -            "sendmyway.com", "upchi.co.il", "180upload.com",  +            "sendmyway.com", "upchi.co.il", "180upload.com",              #NOT WORKING:              "amonshare.com", "imageporter.com", "file4safe.com",              #DOWN OR BROKEN:              "ddlanime.com", "fileforth.com", "loombo.com", "goldfile.eu", "putshare.com" -            ))              -               +            )) +          hosterList -= (excludeList)          hosterList -= set(('', u'')) -         +          if not hosterList:              self.unload()              return -                                             +          regexp = r"http://(?:[^/]*\.)?(%s)/\w{12}" % ("|".join(sorted(hosterList)).replace('.','\.'))          #self.logDebug(regexp) -         +          dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']          dict["pattern"] = regexp          dict["re"] = re.compile(regexp)          self.logDebug("Pattern loaded - handling %d hosters" % len(hosterList)) -         +      def getConfigSet(self, option):          s = self.getConfig(option).lower().replace('|',',').replace(';',',')          return set([x.strip() for x in s.split(',')]) -         +      def unload(self):          dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']          dict["pattern"] = r"^unmatchable$" -        dict["re"] = re.compile(r"^unmatchable$")
\ No newline at end of file +        dict["re"] = re.compile(r"^unmatchable$") | 
