summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/hook
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-07 19:54:24 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-07 19:54:24 +0200
commitbe459e0b409dcd5e04edd75be374bd35d4018e9a (patch)
tree3f73e813d20608ff0d23eada8214a5124c85bff5 /pyload/plugins/hook
parentMerge branch 'stable' into 0.4.10 (diff)
parentNew __authors__ key replaces __author_name__ and __author_mail__ + Whitespace... (diff)
downloadpyload-be459e0b409dcd5e04edd75be374bd35d4018e9a.tar.xz
Merge branch 'stable' into 0.4.10
Conflicts: module/plugins/internal/CaptchaService.py pyload/plugins/account/EasybytezCom.py pyload/plugins/account/TusfilesNet.py pyload/plugins/base/OCR.py pyload/plugins/crypter/MultiuploadCom.py pyload/plugins/crypter/UploadableChFolder.py pyload/plugins/hoster/DuploadOrg.py pyload/plugins/hoster/EpicShareNet.py pyload/plugins/hoster/LemUploadsCom.py pyload/plugins/hoster/LoadTo.py pyload/plugins/hoster/LomafileCom.py pyload/plugins/hoster/MegaFilesSe.py pyload/plugins/hoster/MegareleaseOrg.py pyload/plugins/hoster/PandaPlanet.py pyload/plugins/hoster/PotloadCom.py pyload/plugins/hoster/PremiumTo.py pyload/plugins/hoster/TurbobitNet.py pyload/plugins/internal/DeadCrypter.py pyload/plugins/internal/DeadHoster.py pyload/plugins/internal/SimpleCrypter.py pyload/plugins/internal/UpdateManager.py pyload/plugins/ocr/LinksaveIn.py
Diffstat (limited to 'pyload/plugins/hook')
-rw-r--r--pyload/plugins/hook/AlldebridCom.py3
-rw-r--r--pyload/plugins/hook/BypassCaptcha.py6
-rw-r--r--pyload/plugins/hook/Captcha9kw.py4
-rw-r--r--pyload/plugins/hook/CaptchaBrotherhood.py11
-rw-r--r--pyload/plugins/hook/DeathByCaptcha.py5
-rw-r--r--pyload/plugins/hook/DebridItaliaCom.py3
-rw-r--r--pyload/plugins/hook/EasybytezCom.py3
-rw-r--r--pyload/plugins/hook/ExpertDecoders.py7
-rw-r--r--pyload/plugins/hook/FastixRu.py3
-rw-r--r--pyload/plugins/hook/FreeWayMe.py3
-rw-r--r--pyload/plugins/hook/ImageTyperz.py5
-rw-r--r--pyload/plugins/hook/LinkdecrypterCom.py3
-rw-r--r--pyload/plugins/hook/LinksnappyCom.py3
-rw-r--r--pyload/plugins/hook/MegaDebridEu.py3
-rw-r--r--pyload/plugins/hook/MultishareCz.py4
-rw-r--r--pyload/plugins/hook/MyfastfileCom.py4
-rw-r--r--pyload/plugins/hook/OverLoadMe.py3
-rw-r--r--pyload/plugins/hook/PremiumTo.py6
-rw-r--r--pyload/plugins/hook/PremiumizeMe.py3
-rw-r--r--pyload/plugins/hook/RPNetBiz.py3
-rw-r--r--pyload/plugins/hook/RealdebridCom.py3
-rw-r--r--pyload/plugins/hook/RehostTo.py3
-rw-r--r--pyload/plugins/hook/SimplyPremiumCom.py3
-rw-r--r--pyload/plugins/hook/SimplydebridCom.py3
-rw-r--r--pyload/plugins/hook/UnrestrictLi.py3
-rw-r--r--pyload/plugins/hook/XFileSharingPro.py27
-rw-r--r--pyload/plugins/hook/ZeveraCom.py3
27 files changed, 62 insertions, 68 deletions
diff --git a/pyload/plugins/hook/AlldebridCom.py b/pyload/plugins/hook/AlldebridCom.py
index 8eade2941..dadf322b4 100644
--- a/pyload/plugins/hook/AlldebridCom.py
+++ b/pyload/plugins/hook/AlldebridCom.py
@@ -17,8 +17,7 @@ class AlldebridCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Alldebrid.com hook plugin"""
- __author_name__ = "Andy Voigt"
- __author_mail__ = "spamsales@online.de"
+ __authors__ = [("Andy Voigt", "spamsales@online.de")]
def getHoster(self):
diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index fdd1e567c..02b72c6d0 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -33,8 +33,10 @@ class BypassCaptcha(Hook):
("passkey", "password", "Passkey", "")]
__description__ = """Send captchas to BypassCaptcha.com"""
- __author_name__ = ("RaNaN", "Godofdream", "zoidberg")
- __author_mail__ = ("RaNaN@pyload.org", "soilfcition@gmail.com", "zoidberg@mujmail.cz")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("Godofdream", "soilfcition@gmail.com"),
+ ("zoidberg", "zoidberg@mujmail.cz")]
+
PYLOAD_KEY = "4f771155b640970d5607f919a615bdefc67e7d32"
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index 45890815c..c37bfc61f 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -30,8 +30,8 @@ class Captcha9kw(Hook):
("passkey", "password", "API key", "")]
__description__ = """Send captchas to 9kw.eu"""
- __author_name__ = "RaNaN"
- __author_mail__ = "RaNaN@pyload.org"
+ __authors__ = [("RaNaN", "RaNaN@pyload.org")]
+
API_URL = "://www.9kw.eu/index.cgi"
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index 8f6f8d68b..79216923e 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -5,7 +5,11 @@ from __future__ import with_statement
import StringIO
import pycurl
-from PIL import Image
+try:
+ from PIL import Image
+except ImportError:
+ import Image
+
from thread import start_new_thread
from time import sleep
from urllib import urlencode
@@ -40,8 +44,9 @@ class CaptchaBrotherhood(Hook):
("passkey", "password", "Password", "")]
__description__ = """Send captchas to CaptchaBrotherhood.com"""
- __author_name__ = ("RaNaN", "zoidberg")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("zoidberg", "zoidberg@mujmail.cz")]
+
API_URL = "http://www.captchabrotherhood.com/"
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index 6e7a585ad..293326d86 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -55,8 +55,9 @@ class DeathByCaptcha(Hook):
("force", "bool", "Force DBC even if client is connected", False)]
__description__ = """Send captchas to DeathByCaptcha.com"""
- __author_name__ = ("RaNaN", "zoidberg")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("zoidberg", "zoidberg@mujmail.cz")]
+
API_URL = "http://api.dbcapi.me/api/"
diff --git a/pyload/plugins/hook/DebridItaliaCom.py b/pyload/plugins/hook/DebridItaliaCom.py
index 4272b758f..4a12f052a 100644
--- a/pyload/plugins/hook/DebridItaliaCom.py
+++ b/pyload/plugins/hook/DebridItaliaCom.py
@@ -15,8 +15,7 @@ class DebridItaliaCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Debriditalia.com hook plugin"""
- __author_name__ = "stickell"
- __author_mail__ = "l.stickell@yahoo.it"
+ __authors__ = [("stickell", "l.stickell@yahoo.it")]
def getHoster(self):
diff --git a/pyload/plugins/hook/EasybytezCom.py b/pyload/plugins/hook/EasybytezCom.py
index 9d1cdc0db..c920f4069 100644
--- a/pyload/plugins/hook/EasybytezCom.py
+++ b/pyload/plugins/hook/EasybytezCom.py
@@ -15,8 +15,7 @@ class EasybytezCom(MultiHoster):
("hosterList", "str", "Hoster list (comma separated)", "")]
__description__ = """EasyBytez.com hook plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
def getHoster(self):
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index 3f0f64f1e..e843d8773 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -22,8 +22,9 @@ class ExpertDecoders(Hook):
("passkey", "password", "Access key", "")]
__description__ = """Send captchas to expertdecoders.com"""
- __author_name__ = ("RaNaN", "zoidberg")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("zoidberg", "zoidberg@mujmail.cz")]
+
API_URL = "http://www.fasttypers.org/imagepost.ashx"
@@ -55,7 +56,7 @@ class ExpertDecoders(Hook):
req.c.setopt(LOW_SPEED_TIME, 80)
try:
- result = req.load(self.API_URL, post={"action": "upload", "key": self.getConfig("passkey"),
+ result = req.load(self.API_URL, post={"action": "upload", "key": self.getConfig("passkey"),
"file": data, "gen_task_id": ticket})
finally:
req.close()
diff --git a/pyload/plugins/hook/FastixRu.py b/pyload/plugins/hook/FastixRu.py
index 9e2abd92a..8247a592c 100644
--- a/pyload/plugins/hook/FastixRu.py
+++ b/pyload/plugins/hook/FastixRu.py
@@ -16,8 +16,7 @@ class FastixRu(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Fastix.ru hook plugin"""
- __author_name__ = "Massimo Rosamilia"
- __author_mail__ = "max@spiritix.eu"
+ __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
def getHoster(self):
diff --git a/pyload/plugins/hook/FreeWayMe.py b/pyload/plugins/hook/FreeWayMe.py
index 635bc3415..2db2a1a4d 100644
--- a/pyload/plugins/hook/FreeWayMe.py
+++ b/pyload/plugins/hook/FreeWayMe.py
@@ -16,8 +16,7 @@ class FreeWayMe(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """FreeWay.me hook plugin"""
- __author_name__ = "Nicolas Giese"
- __author_mail__ = "james@free-way.me"
+ __authors__ = [("Nicolas Giese", "james@free-way.me")]
def getHoster(self):
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 7317f234d..b26eaceea 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -38,8 +38,9 @@ class ImageTyperz(Hook):
("force", "bool", "Force IT even if client is connected", False)]
__description__ = """Send captchas to ImageTyperz.com"""
- __author_name__ = ("RaNaN", "zoidberg")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("zoidberg", "zoidberg@mujmail.cz")]
+
SUBMIT_URL = "http://captchatypers.com/Forms/UploadFileAndGetTextNEW.ashx"
RESPOND_URL = "http://captchatypers.com/Forms/SetBadImage.ashx"
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index 418ec4ac4..ea1e54b30 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -15,8 +15,7 @@ class LinkdecrypterCom(Hook):
__config__ = [("activated", "bool", "Activated", False)]
__description__ = """Linkdecrypter.com hook plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
def coreReady(self):
diff --git a/pyload/plugins/hook/LinksnappyCom.py b/pyload/plugins/hook/LinksnappyCom.py
index 9086e3c2a..0cf913f60 100644
--- a/pyload/plugins/hook/LinksnappyCom.py
+++ b/pyload/plugins/hook/LinksnappyCom.py
@@ -17,8 +17,7 @@ class LinksnappyCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Linksnappy.com hook plugin"""
- __author_name__ = "stickell"
- __author_mail__ = "l.stickell@yahoo.it"
+ __authors__ = [("stickell", "l.stickell@yahoo.it")]
def getHoster(self):
diff --git a/pyload/plugins/hook/MegaDebridEu.py b/pyload/plugins/hook/MegaDebridEu.py
index 0345e47fa..bf6997117 100644
--- a/pyload/plugins/hook/MegaDebridEu.py
+++ b/pyload/plugins/hook/MegaDebridEu.py
@@ -14,8 +14,7 @@ class MegaDebridEu(MultiHoster):
("unloadFailing", "bool", "Revert to standard download if download fails", False)]
__description__ = """mega-debrid.eu hook plugin"""
- __author_name__ = "D.Ducatel"
- __author_mail__ = "dducatel@je-geek.fr"
+ __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")]
def getHoster(self):
diff --git a/pyload/plugins/hook/MultishareCz.py b/pyload/plugins/hook/MultishareCz.py
index 9e1bd50a4..d8396b44f 100644
--- a/pyload/plugins/hook/MultishareCz.py
+++ b/pyload/plugins/hook/MultishareCz.py
@@ -16,8 +16,8 @@ class MultishareCz(MultiHoster):
("hosterList", "str", "Hoster list (comma separated)", "uloz.to")]
__description__ = """MultiShare.cz hook plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"'
diff --git a/pyload/plugins/hook/MyfastfileCom.py b/pyload/plugins/hook/MyfastfileCom.py
index 216dcaf5d..e476c10b5 100644
--- a/pyload/plugins/hook/MyfastfileCom.py
+++ b/pyload/plugins/hook/MyfastfileCom.py
@@ -17,8 +17,8 @@ class MyfastfileCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Myfastfile.com hook plugin"""
- __author_name__ = "stickell"
- __author_mail__ = "l.stickell@yahoo.it"
+ __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
def getHoster(self):
diff --git a/pyload/plugins/hook/OverLoadMe.py b/pyload/plugins/hook/OverLoadMe.py
index fae4209f8..347509a8b 100644
--- a/pyload/plugins/hook/OverLoadMe.py
+++ b/pyload/plugins/hook/OverLoadMe.py
@@ -17,8 +17,7 @@ class OverLoadMe(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 12)]
__description__ = """Over-Load.me hook plugin"""
- __author_name__ = "marley"
- __author_mail__ = "marley@over-load.me"
+ __authors__ = [("marley", "marley@over-load.me")]
def getHoster(self):
diff --git a/pyload/plugins/hook/PremiumTo.py b/pyload/plugins/hook/PremiumTo.py
index b95b15b53..eb5f16a83 100644
--- a/pyload/plugins/hook/PremiumTo.py
+++ b/pyload/plugins/hook/PremiumTo.py
@@ -14,8 +14,10 @@ class PremiumTo(MultiHoster):
("hosterList", "str", "Hoster list (comma separated)", "")]
__description__ = """Premium.to hook plugin"""
- __author_name__ = ("RaNaN", "zoidberg", "stickell")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+ __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ ("zoidberg", "zoidberg@mujmail.cz"),
+ ("stickell", "l.stickell@yahoo.it")]
+
def getHoster(self):
diff --git a/pyload/plugins/hook/PremiumizeMe.py b/pyload/plugins/hook/PremiumizeMe.py
index b6d89adb6..9d18f45fc 100644
--- a/pyload/plugins/hook/PremiumizeMe.py
+++ b/pyload/plugins/hook/PremiumizeMe.py
@@ -17,8 +17,7 @@ class PremiumizeMe(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Premiumize.me hook plugin"""
- __author_name__ = "Florian Franzen"
- __author_mail__ = "FlorianFranzen@gmail.com"
+ __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
def getHoster(self):
diff --git a/pyload/plugins/hook/RPNetBiz.py b/pyload/plugins/hook/RPNetBiz.py
index b46e326e6..9e04f1dfd 100644
--- a/pyload/plugins/hook/RPNetBiz.py
+++ b/pyload/plugins/hook/RPNetBiz.py
@@ -17,8 +17,7 @@ class RPNetBiz(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """RPNet.biz hook plugin"""
- __author_name__ = "Dman"
- __author_mail__ = "dmanugm@gmail.com"
+ __authors__ = [("Dman", "dmanugm@gmail.com")]
def getHoster(self):
diff --git a/pyload/plugins/hook/RealdebridCom.py b/pyload/plugins/hook/RealdebridCom.py
index c1c519ace..8329da7e7 100644
--- a/pyload/plugins/hook/RealdebridCom.py
+++ b/pyload/plugins/hook/RealdebridCom.py
@@ -17,8 +17,7 @@ class RealdebridCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Real-Debrid.com hook plugin"""
- __author_name__ = "Devirex Hazzard"
- __author_mail__ = "naibaf_11@yahoo.de"
+ __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
def getHoster(self):
diff --git a/pyload/plugins/hook/RehostTo.py b/pyload/plugins/hook/RehostTo.py
index 059f36284..f38074a7b 100644
--- a/pyload/plugins/hook/RehostTo.py
+++ b/pyload/plugins/hook/RehostTo.py
@@ -16,8 +16,7 @@ class RehostTo(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", 24)]
__description__ = """Rehost.to hook plugin"""
- __author_name__ = "RaNaN"
- __author_mail__ = "RaNaN@pyload.org"
+ __authors__ = [("RaNaN", "RaNaN@pyload.org")]
def getHoster(self):
diff --git a/pyload/plugins/hook/SimplyPremiumCom.py b/pyload/plugins/hook/SimplyPremiumCom.py
index f0df36b22..62f5ba778 100644
--- a/pyload/plugins/hook/SimplyPremiumCom.py
+++ b/pyload/plugins/hook/SimplyPremiumCom.py
@@ -17,8 +17,7 @@ class SimplyPremiumCom(MultiHoster):
("interval", "int", "Reload interval in hours (0 to disable)", "24")]
__description__ = """Simply-Premium.com hook plugin"""
- __author_name__ = "EvolutionClip"
- __author_mail__ = "evolutionclip@live.de"
+ __authors__ = [("EvolutionClip", "evolutionclip@live.de")]
def getHoster(self):
diff --git a/pyload/plugins/hook/SimplydebridCom.py b/pyload/plugins/hook/SimplydebridCom.py
index f7c899a48..25373449b 100644
--- a/pyload/plugins/hook/SimplydebridCom.py
+++ b/pyload/plugins/hook/SimplydebridCom.py
@@ -14,8 +14,7 @@ class SimplydebridCom(MultiHoster):
("hosterList", "str", "Hoster list (comma separated)", "")]
__description__ = """Simply-Debrid.com hook plugin"""
- __author_name__ = "Kagenoshin"
- __author_mail__ = "kagenoshin@gmx.ch"
+ __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
def getHoster(self):
diff --git a/pyload/plugins/hook/UnrestrictLi.py b/pyload/plugins/hook/UnrestrictLi.py
index 2ca5ad907..4caedf550 100644
--- a/pyload/plugins/hook/UnrestrictLi.py
+++ b/pyload/plugins/hook/UnrestrictLi.py
@@ -18,8 +18,7 @@ class UnrestrictLi(MultiHoster):
("history", "bool", "Delete History", False)]
__description__ = """Unrestrict.li hook plugin"""
- __author_name__ = "stickell"
- __author_mail__ = "l.stickell@yahoo.it"
+ __authors__ = [("stickell", "l.stickell@yahoo.it")]
def getHoster(self):
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index e926d6655..d9ccda796 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -11,13 +11,12 @@ class XFileSharingPro(Hook):
__version__ = "0.12"
__config__ = [("activated", "bool", "Activated", True),
- ("loadDefault", "bool", "Include default (built-in) hoster list", True),
- ("includeList", "str", "Include hosters (comma separated)", ""),
- ("excludeList", "str", "Exclude hosters (comma separated)", "")]
+ ("load_default", "bool", "Include default (built-in) hoster list", True),
+ ("include_hosters", "str", "Include hosters (comma separated)", ""),
+ ("exclude_hosters", "str", "Exclude hosters (comma separated)", "")]
__description__ = """XFileSharingPro hook plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
def coreReady(self):
@@ -25,11 +24,11 @@ class XFileSharingPro(Hook):
def loadPattern(self):
- hosterList = self.getConfigSet('includeList')
- excludeList = self.getConfigSet('excludeList')
+ hoster_list = self.getConfigSet('include_hosters')
+ exclude_list = self.getConfigSet('exclude_hosters')
- if self.getConfig('loadDefault'):
- hosterList |= set((
+ if self.getConfig('load_default'):
+ hoster_list |= 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",
@@ -54,19 +53,19 @@ class XFileSharingPro(Hook):
"ddlanime.com", "fileforth.com", "loombo.com", "goldfile.eu", "putshare.com"
))
- hosterList -= (excludeList)
- hosterList -= set(('', u''))
+ hoster_list -= (exclude_list)
+ hoster_list -= set(('', u''))
- if not hosterList:
+ if not hoster_list:
self.unload()
return
- regexp = r"http://(?:[^/]*\.)?(%s)/(?:embed-)?\w{12}" % ("|".join(sorted(hosterList)).replace('.', '\.'))
+ regexp = r"http://(?:[^/]*\.)?(%s)/(?:embed-)?\w{12}" % ("|".join(sorted(hoster_list)).replace('.', '\.'))
dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']
dict['pattern'] = regexp
dict['re'] = re.compile(regexp)
- self.logDebug("Pattern loaded - handling %d hosters" % len(hosterList))
+ self.logDebug("Pattern loaded - handling %d hosters" % len(hoster_list))
def getConfigSet(self, option):
diff --git a/pyload/plugins/hook/ZeveraCom.py b/pyload/plugins/hook/ZeveraCom.py
index 155143f64..2a6168008 100644
--- a/pyload/plugins/hook/ZeveraCom.py
+++ b/pyload/plugins/hook/ZeveraCom.py
@@ -14,8 +14,7 @@ class ZeveraCom(MultiHoster):
("hosterList", "str", "Hoster list (comma separated)", "")]
__description__ = """Real-Debrid.com hook plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
def getHoster(self):