diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-04-11 11:50:52 +0200 |
|---|---|---|
| committer |  Stefano <l.stickell@yahoo.it>
| 2014-04-21 17:16:42 +0200 |
| commit | 8dbe6073781bb0e9425f17cd5e7ce7bf525f20c6 (patch) | |
| tree | 3eaf4a773633502b712d3a74a3348fee298feb32 | |
| parent | RyushareCom: Code cosmetics (diff) | |
| download | pyload-8dbe6073781bb0e9425f17cd5e7ce7bf525f20c6.tar.xz | |
Fix __author_name__ and __author_mail__
Merges vuolter/pyload@6c57a37
(cherry picked from commit ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846)
Conflicts:
module/plugins/Account.py
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hoster.py
module/plugins/hooks/MultiDebridCom.py
module/plugins/hooks/UnrestrictLi.py
237 files changed, 463 insertions, 433 deletions
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 0222ad65f..955cc3c7f 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -26,8 +26,8 @@ class FreeWayMe(Account): __version__ = "0.11" __type__ = "account" __description__ = """FreeWayMe account plugin""" - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") + __author_name__ = "Nicolas Giese" + __author_mail__ = "james@free-way.me" def loadAccountInfo(self, user, req): status = self.getAccountStatus(user, req) diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index e288181eb..23ec10f7d 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -7,8 +7,8 @@ class OverLoadMe(Account): __version__ = "0.01" __type__ = "account" __description__ = """Over-Load.me account plugin""" - __author_name__ = ("marley") - __author_mail__ = ("marley@over-load.me") + __author_name__ = "marley" + __author_mail__ = "marley@over-load.me" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py index 1427bdc13..ad1cae67f 100644 --- a/module/plugins/crypter/DailymotionBatch.py +++ b/module/plugins/crypter/DailymotionBatch.py @@ -31,8 +31,8 @@ class DailymotionBatch(Crypter): __pattern__ = r"https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)" __version__ = "0.01" __description__ = """Dailymotion channel & playlist decrypter""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def api_response(self, ref, req=None): url = urljoin("https://api.dailymotion.com/", ref) diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 49b932fc0..eae836038 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -8,6 +8,7 @@ class NosvideoCom(SimpleCrypter): __version__ = "0.01" __description__ = """Nosvideo.com Plugin""" __author_name__ = "igel" + __author_mail__ = "igelkun@myopera.com" LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"' TITLE_PATTERN = r"<[tT]itle>Watch (?P<title>.+)</[tT]itle>" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index d393507c7..444eb53f6 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -28,8 +28,8 @@ class TnyCz(SimpleCrypter): __pattern__ = r"http://(?:www\.)?tny\.cz/\w+" __version__ = "0.01" __description__ = """Tny.cz Plugin""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" TITLE_PATTERN = r'<title>(?P<title>.+) - .+</title>' diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py index 30d76cb8e..021ce2246 100644 --- a/module/plugins/hooks/FreeWayMe.py +++ b/module/plugins/hooks/FreeWayMe.py @@ -30,8 +30,8 @@ class FreeWayMe(MultiHoster): ("hosterList", "str", "Hoster list (comma separated)", ""), ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") + __author_name__ = "Nicolas Giese" + __author_mail__ = "james@free-way.me" def getHoster(self): hostis = getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMe.py index bc8f9f5cb..09ceea3ad 100644 --- a/module/plugins/hooks/OverLoadMe.py +++ b/module/plugins/hooks/OverLoadMe.py @@ -15,8 +15,8 @@ class OverLoadMe(MultiHoster): ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "12")] __description__ = """Over-Load.me hook plugin""" - __author_name__ = ("marley") - __author_email__ = ("marley@over-load.me") + __author_name__ = "marley" + __author_mail__ = "marley@over-load.me" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 5439c10c1..2cb0d36c2 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -25,8 +25,8 @@ class FreeWayMe(Hoster): __type__ = "hoster" __pattern__ = r"https://free-way.me/.*" __description__ = """FreeWayMe hoster plugin""" - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") + __author_name__ = "Nicolas Giese" + __author_mail__ = "james@free-way.me" def setup(self): self.resumeDownload = False diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 5735390bb..f7e3d2657 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -12,6 +12,7 @@ class NosuploadCom(XFileSharingPro): __pattern__ = r"http://(?:www\.)?nosupload\.com/\?d=\w{12}" __description__ = """nosupload.com hoster plugin""" __author_name__ = "igel" + __author_mail__ = "igelkun@myopera.com" HOSTER_NAME = "nosupload.com" diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 658b3940f..33c041973 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -15,8 +15,8 @@ class OverLoadMe(Hoster): __type__ = "hoster" __pattern__ = r"https?://.*overload\.me.*" __description__ = """Over-Load.me hoster plugin""" - __author_name__ = ("marley") - __author_mail__ = ("marley@over-load.me") + __author_name__ = "marley" + __author_mail__ = "marley@over-load.me" def getFilename(self, url): try: diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py index 7e6d16236..6cccf4cab 100644 --- a/module/plugins/hoster/SoundcloudCom.py +++ b/module/plugins/hoster/SoundcloudCom.py @@ -12,8 +12,8 @@ class SoundcloudCom(Hoster): __pattern__ = r"https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)" __version__ = "0.1" __description__ = """SoundCloud.com audio download hoster""" - __author_name__ = ("Peekayy") - __author_mail__ = ("peekayy.dev@gmail.com") + __author_name__ = "Peekayy" + __author_mail__ = "peekayy.dev@gmail.com" def process(self, pyfile): # default UserAgent of HTTPRequest fails for this hoster so we use this one diff --git a/pyload/plugins/accounts/AlldebridCom.py b/pyload/plugins/accounts/AlldebridCom.py index a353b1744..ea173d19d 100644 --- a/pyload/plugins/accounts/AlldebridCom.py +++ b/pyload/plugins/accounts/AlldebridCom.py @@ -12,8 +12,8 @@ class AlldebridCom(MultiHoster): __version__ = "0.22" __type__ = "account" __description__ = """AllDebrid.com account plugin""" - __author_name__ = ("Andy, Voigt") - __author_mail__ = ("spamsales@online.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/pyload/plugins/accounts/BayfilesCom.py b/pyload/plugins/accounts/BayfilesCom.py index bf5cc54af..a74952724 100644 --- a/pyload/plugins/accounts/BayfilesCom.py +++ b/pyload/plugins/accounts/BayfilesCom.py @@ -28,8 +28,8 @@ class BayfilesCom(Account): __version__ = "0.02" __type__ = "account" __description__ = """bayfiles.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): for i in range(2): diff --git a/pyload/plugins/accounts/BitshareCom.py b/pyload/plugins/accounts/BitshareCom.py index de1e19f51..4fe01aa5b 100644 --- a/pyload/plugins/accounts/BitshareCom.py +++ b/pyload/plugins/accounts/BitshareCom.py @@ -25,7 +25,8 @@ class BitshareCom(Account): __version__ = "0.12" __type__ = "account" __description__ = """Bitshare account plugin""" - __author_name__ = ("Paul King") + __author_name__ = "Paul King" + __author_mail__ = "" def loadAccountInfo(self, user, req): page = req.load("http://bitshare.com/mysettings.html") diff --git a/pyload/plugins/accounts/CramitIn.py b/pyload/plugins/accounts/CramitIn.py index b0334b191..be7baff9d 100644 --- a/pyload/plugins/accounts/CramitIn.py +++ b/pyload/plugins/accounts/CramitIn.py @@ -7,7 +7,7 @@ class CramitIn(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """cramit.in account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://cramit.in/" diff --git a/pyload/plugins/accounts/CyberlockerCh.py b/pyload/plugins/accounts/CyberlockerCh.py index 0eaa262eb..1deac2730 100644 --- a/pyload/plugins/accounts/CyberlockerCh.py +++ b/pyload/plugins/accounts/CyberlockerCh.py @@ -8,8 +8,8 @@ class CyberlockerCh(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """CyberlockerCh account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" MAIN_PAGE = "http://cyberlocker.ch/" diff --git a/pyload/plugins/accounts/DdlstorageCom.py b/pyload/plugins/accounts/DdlstorageCom.py index 7404348a4..08ff537da 100644 --- a/pyload/plugins/accounts/DdlstorageCom.py +++ b/pyload/plugins/accounts/DdlstorageCom.py @@ -15,8 +15,8 @@ class DdlstorageCom(XFSPAccount): __version__ = "1.00" __type__ = "account" __description__ = """DDLStorage.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" MAIN_PAGE = "http://ddlstorage.com/" diff --git a/pyload/plugins/accounts/DebridItaliaCom.py b/pyload/plugins/accounts/DebridItaliaCom.py index 30bfa65f9..530bfa470 100644 --- a/pyload/plugins/accounts/DebridItaliaCom.py +++ b/pyload/plugins/accounts/DebridItaliaCom.py @@ -26,8 +26,8 @@ class DebridItaliaCom(MultiHoster): __version__ = "0.1" __type__ = "account" __description__ = """debriditalia.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|" diff --git a/pyload/plugins/accounts/EasybytezCom.py b/pyload/plugins/accounts/EasybytezCom.py index ffd132ba3..b14031779 100644 --- a/pyload/plugins/accounts/EasybytezCom.py +++ b/pyload/plugins/accounts/EasybytezCom.py @@ -30,8 +30,8 @@ class EasybytezCom(Account): __version__ = "0.04" __type__ = "account" __description__ = """EasyBytez.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = r'Premium account expire:</TD><TD><b>([^<]+)</b>' TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>' diff --git a/pyload/plugins/accounts/EgoFilesCom.py b/pyload/plugins/accounts/EgoFilesCom.py index 9c2b918c3..67a4a1aca 100644 --- a/pyload/plugins/accounts/EgoFilesCom.py +++ b/pyload/plugins/accounts/EgoFilesCom.py @@ -12,8 +12,8 @@ class EgoFilesCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """egofiles.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" PREMIUM_ACCOUNT_PATTERN = '<br/>\s*Premium: (?P<P>[^/]*) / Traffic left: (?P<T>[\d.]*) (?P<U>\w*)\s*\\n\s*<br/>' diff --git a/pyload/plugins/accounts/EuroshareEu.py b/pyload/plugins/accounts/EuroshareEu.py index 830c1db3f..e0c8a9e4a 100644 --- a/pyload/plugins/accounts/EuroshareEu.py +++ b/pyload/plugins/accounts/EuroshareEu.py @@ -28,8 +28,8 @@ class EuroshareEu(Account): __version__ = "0.01" __type__ = "account" __description__ = """euroshare.eu account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): self.relogin(user) diff --git a/pyload/plugins/accounts/FastixRu.py b/pyload/plugins/accounts/FastixRu.py index 3e1896e44..14ac6ef70 100644 --- a/pyload/plugins/accounts/FastixRu.py +++ b/pyload/plugins/accounts/FastixRu.py @@ -7,8 +7,8 @@ class FastixRu(Account): __version__ = "0.02" __type__ = "account" __description__ = """Fastix account plugin""" - __author_name__ = ("Massimo, Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/pyload/plugins/accounts/FilejungleCom.py b/pyload/plugins/accounts/FilejungleCom.py index 2f2a6012d..fb56693d9 100644 --- a/pyload/plugins/accounts/FilejungleCom.py +++ b/pyload/plugins/accounts/FilejungleCom.py @@ -28,8 +28,8 @@ class FilejungleCom(Account): __version__ = "0.11" __type__ = "account" __description__ = """filejungle.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" login_timeout = 60 diff --git a/pyload/plugins/accounts/FilerNet.py b/pyload/plugins/accounts/FilerNet.py index 45ce5ab37..66988c338 100644 --- a/pyload/plugins/accounts/FilerNet.py +++ b/pyload/plugins/accounts/FilerNet.py @@ -27,8 +27,8 @@ class FilerNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """Filer.net account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />' WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>" diff --git a/pyload/plugins/accounts/FilerioCom.py b/pyload/plugins/accounts/FilerioCom.py index 8b0b5f54f..61626c317 100644 --- a/pyload/plugins/accounts/FilerioCom.py +++ b/pyload/plugins/accounts/FilerioCom.py @@ -7,7 +7,7 @@ class FilerioCom(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """FileRio.in account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://filerio.in/" diff --git a/pyload/plugins/accounts/FilesMailRu.py b/pyload/plugins/accounts/FilesMailRu.py index ea976bd44..c316ebf42 100644 --- a/pyload/plugins/accounts/FilesMailRu.py +++ b/pyload/plugins/accounts/FilesMailRu.py @@ -25,8 +25,8 @@ class FilesMailRu(Account): __version__ = "0.1" __type__ = "account" __description__ = """filesmail.ru account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): return {"validuntil": None, "trafficleft": None} diff --git a/pyload/plugins/accounts/FileserveCom.py b/pyload/plugins/accounts/FileserveCom.py index d4056891a..d6f286cfd 100644 --- a/pyload/plugins/accounts/FileserveCom.py +++ b/pyload/plugins/accounts/FileserveCom.py @@ -28,8 +28,8 @@ class FileserveCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """fileserve.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/pyload/plugins/accounts/FourSharedCom.py b/pyload/plugins/accounts/FourSharedCom.py index 69a465671..ba692d2db 100644 --- a/pyload/plugins/accounts/FourSharedCom.py +++ b/pyload/plugins/accounts/FourSharedCom.py @@ -26,8 +26,8 @@ class FourSharedCom(Account): __version__ = "0.01" __type__ = "account" __description__ = """FourSharedCom account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): #fixme diff --git a/pyload/plugins/accounts/FreakshareCom.py b/pyload/plugins/accounts/FreakshareCom.py index cdf45114a..dd666f653 100644 --- a/pyload/plugins/accounts/FreakshareCom.py +++ b/pyload/plugins/accounts/FreakshareCom.py @@ -27,8 +27,8 @@ class FreakshareCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """freakshare.com account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): page = req.load("http://freakshare.com/") diff --git a/pyload/plugins/accounts/Ftp.py b/pyload/plugins/accounts/Ftp.py index 681d14cea..b454cba7a 100644 --- a/pyload/plugins/accounts/Ftp.py +++ b/pyload/plugins/accounts/Ftp.py @@ -8,7 +8,7 @@ class Ftp(Account): __version__ = "0.01" __type__ = "account" __description__ = """Ftp dummy account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" login_timeout = info_threshold = 1000000 diff --git a/pyload/plugins/accounts/HellshareCz.py b/pyload/plugins/accounts/HellshareCz.py index 4718ade99..0759912e6 100644 --- a/pyload/plugins/accounts/HellshareCz.py +++ b/pyload/plugins/accounts/HellshareCz.py @@ -28,8 +28,8 @@ class HellshareCz(Account): __version__ = "0.14" __type__ = "account" __description__ = """hellshare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>' diff --git a/pyload/plugins/accounts/Http.py b/pyload/plugins/accounts/Http.py index de9490b2c..0afb5b3f7 100644 --- a/pyload/plugins/accounts/Http.py +++ b/pyload/plugins/accounts/Http.py @@ -8,12 +8,12 @@ class Http(Account): __version__ = "0.01" __type__ = "account" __description__ = """Http dummy account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" __config__ = [("domain", "str", "Domain", "")] login_timeout = info_threshold = 1000000 def login(self, req): - pass
\ No newline at end of file + pass diff --git a/pyload/plugins/accounts/LetitbitNet.py b/pyload/plugins/accounts/LetitbitNet.py index bcc004b91..9e2f570b3 100644 --- a/pyload/plugins/accounts/LetitbitNet.py +++ b/pyload/plugins/accounts/LetitbitNet.py @@ -24,8 +24,8 @@ class LetitbitNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """Letitbit.net account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): ## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ## diff --git a/pyload/plugins/accounts/MegasharesCom.py b/pyload/plugins/accounts/MegasharesCom.py index e7d5f9ca9..4c44ddfad 100644 --- a/pyload/plugins/accounts/MegasharesCom.py +++ b/pyload/plugins/accounts/MegasharesCom.py @@ -11,8 +11,8 @@ class MegasharesCom(Account): __version__ = "0.02" __type__ = "account" __description__ = """megashares.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>' diff --git a/pyload/plugins/accounts/MultiDebridCom.py b/pyload/plugins/accounts/MultiDebridCom.py index a98b8abae..5d3536684 100644 --- a/pyload/plugins/accounts/MultiDebridCom.py +++ b/pyload/plugins/accounts/MultiDebridCom.py @@ -26,8 +26,8 @@ class MultiDebridCom(MultiHoster): __version__ = "0.01" __type__ = "account" __description__ = """Multi-debrid.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): if 'days_left' in self.json_data: diff --git a/pyload/plugins/accounts/MultishareCz.py b/pyload/plugins/accounts/MultishareCz.py index a50ced431..baf156abf 100644 --- a/pyload/plugins/accounts/MultishareCz.py +++ b/pyload/plugins/accounts/MultishareCz.py @@ -29,8 +29,8 @@ class MultishareCz(MultiHoster): __version__ = "0.02" __type__ = "account" __description__ = """multishare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+) (?P<U>\w+)</strong>' ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">' diff --git a/pyload/plugins/accounts/PremiumizeMe.py b/pyload/plugins/accounts/PremiumizeMe.py index 8b4569f06..e2f85e394 100644 --- a/pyload/plugins/accounts/PremiumizeMe.py +++ b/pyload/plugins/accounts/PremiumizeMe.py @@ -7,8 +7,8 @@ class PremiumizeMe(MultiHoster): __version__ = "0.11" __type__ = "account" __description__ = """Premiumize.Me account plugin""" - __author_name__ = ("Florian Franzen") - __author_mail__ = ("FlorianFranzen@gmail.com") + __author_name__ = "Florian Franzen" + __author_mail__ = "FlorianFranzen@gmail.com" def loadAccountInfo(self, user, req): # Get user data from premiumize.me diff --git a/pyload/plugins/accounts/QuickshareCz.py b/pyload/plugins/accounts/QuickshareCz.py index 1af7cbffd..514db235f 100644 --- a/pyload/plugins/accounts/QuickshareCz.py +++ b/pyload/plugins/accounts/QuickshareCz.py @@ -27,8 +27,8 @@ class QuickshareCz(Account): __version__ = "0.01" __type__ = "account" __description__ = """quickshare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): html = req.load("http://www.quickshare.cz/premium", decode=True) diff --git a/pyload/plugins/accounts/RPNetBiz.py b/pyload/plugins/accounts/RPNetBiz.py index ceb5e6bbb..6c5b76653 100644 --- a/pyload/plugins/accounts/RPNetBiz.py +++ b/pyload/plugins/accounts/RPNetBiz.py @@ -7,8 +7,8 @@ class RPNetBiz(Account): __version__ = "0.1" __type__ = "account" __description__ = """RPNet.biz account plugin""" - __author_name__ = ("Dman") - __author_mail__ = ("dmanugm@gmail.com") + __author_name__ = "Dman" + __author_mail__ = "dmanugm@gmail.com" def loadAccountInfo(self, user, req): # Get account information from rpnet.biz diff --git a/pyload/plugins/accounts/RapidgatorNet.py b/pyload/plugins/accounts/RapidgatorNet.py index 8a02b712c..5fae5ea7e 100644 --- a/pyload/plugins/accounts/RapidgatorNet.py +++ b/pyload/plugins/accounts/RapidgatorNet.py @@ -26,8 +26,8 @@ class RapidgatorNet(Account): __version__ = "0.04" __type__ = "account" __description__ = """rapidgator.net account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" API_URL = 'http://rapidgator.net/api/user' diff --git a/pyload/plugins/accounts/RapidshareCom.py b/pyload/plugins/accounts/RapidshareCom.py index b2066cd1e..bc41ac5e1 100644 --- a/pyload/plugins/accounts/RapidshareCom.py +++ b/pyload/plugins/accounts/RapidshareCom.py @@ -25,8 +25,8 @@ class RapidshareCom(Account): __version__ = "0.22" __type__ = "account" __description__ = """Rapidshare.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/pyload/plugins/accounts/RarefileNet.py b/pyload/plugins/accounts/RarefileNet.py index f4ae4a79a..c79bc2cc5 100644 --- a/pyload/plugins/accounts/RarefileNet.py +++ b/pyload/plugins/accounts/RarefileNet.py @@ -7,7 +7,7 @@ class RarefileNet(XFSPAccount): __version__ = "0.02" __type__ = "account" __description__ = """RareFile.net account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://rarefile.net/" diff --git a/pyload/plugins/accounts/RealdebridCom.py b/pyload/plugins/accounts/RealdebridCom.py index 84c61f2e8..f0be58719 100644 --- a/pyload/plugins/accounts/RealdebridCom.py +++ b/pyload/plugins/accounts/RealdebridCom.py @@ -8,8 +8,8 @@ class RealdebridCom(MultiHoster): __version__ = "0.43" __type__ = "account" __description__ = """Real-Debrid.com account plugin""" - __author_name__ = ("Devirex, Hazzard") - __author_mail__ = ("naibaf_11@yahoo.de") + __author_name__ = "Devirex Hazzard" + __author_mail__ = "naibaf_11@yahoo.de" def loadAccountInfo(self, req): if self.pin_code: diff --git a/pyload/plugins/accounts/RehostTo.py b/pyload/plugins/accounts/RehostTo.py index 58c91801b..f040ddbb1 100644 --- a/pyload/plugins/accounts/RehostTo.py +++ b/pyload/plugins/accounts/RehostTo.py @@ -6,8 +6,8 @@ class RehostTo(Account): __version__ = "0.1" __type__ = "account" __description__ = """Rehost.to account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/pyload/plugins/accounts/ReloadCc.py b/pyload/plugins/accounts/ReloadCc.py index b3c26c6d3..3bc28ee9f 100644 --- a/pyload/plugins/accounts/ReloadCc.py +++ b/pyload/plugins/accounts/ReloadCc.py @@ -11,8 +11,8 @@ class ReloadCc(Account): __type__ = "account" __description__ = """Reload.Cc account plugin""" - __author_name__ = ("Reload Team") - __author_mail__ = ("hello@reload.cc") + __author_name__ = "Reload Team" + __author_mail__ = "hello@reload.cc" def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/accounts/ShareRapidCom.py b/pyload/plugins/accounts/ShareRapidCom.py index b532768b1..776773eb6 100644 --- a/pyload/plugins/accounts/ShareRapidCom.py +++ b/pyload/plugins/accounts/ShareRapidCom.py @@ -11,6 +11,7 @@ class ShareRapidCom(Account): __type__ = "account" __description__ = """ShareRapid account plugin""" __author_name__ = ("MikyWoW", "zoidberg") + __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz") login_timeout = 60 diff --git a/pyload/plugins/accounts/SimplydebridCom.py b/pyload/plugins/accounts/SimplydebridCom.py index 0b4c82a3b..e1c432860 100644 --- a/pyload/plugins/accounts/SimplydebridCom.py +++ b/pyload/plugins/accounts/SimplydebridCom.py @@ -9,8 +9,8 @@ class SimplydebridCom(MultiHoster): __version__ = "0.1" __type__ = "account" __description__ = """Simply-Debrid.com account plugin""" - __author_name__ = ("Kagenoshin") - __author_mail__ = ("kagenoshin@gmx.ch") + __author_name__ = "Kagenoshin" + __author_mail__ = "kagenoshin@gmx.ch" def loadAccountInfo(self, user, req): get_data = {'login': 2, 'u': self.loginname, 'p': self.password} diff --git a/pyload/plugins/accounts/StahnuTo.py b/pyload/plugins/accounts/StahnuTo.py index 6e2b1c96d..e371a89b1 100644 --- a/pyload/plugins/accounts/StahnuTo.py +++ b/pyload/plugins/accounts/StahnuTo.py @@ -28,8 +28,8 @@ class StahnuTo(Account): __version__ = "0.02" __type__ = "account" __description__ = """StahnuTo account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" #login_timeout = 60 diff --git a/pyload/plugins/accounts/TurbobitNet.py b/pyload/plugins/accounts/TurbobitNet.py index 5d4471c30..73615b13a 100644 --- a/pyload/plugins/accounts/TurbobitNet.py +++ b/pyload/plugins/accounts/TurbobitNet.py @@ -28,8 +28,8 @@ class TurbobitNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """TurbobitNet account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" #login_timeout = 60 diff --git a/pyload/plugins/accounts/UlozTo.py b/pyload/plugins/accounts/UlozTo.py index 429a32db3..e1596e164 100644 --- a/pyload/plugins/accounts/UlozTo.py +++ b/pyload/plugins/accounts/UlozTo.py @@ -11,7 +11,7 @@ class UlozTo(Account): __type__ = "account" __description__ = """uloz.to account plugin""" __author_name__ = ("zoidberg", "pulpe") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_mail__ = "zoidberg@mujmail.cz" TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([0-9.]+) MB"' diff --git a/pyload/plugins/accounts/UnrestrictLi.py b/pyload/plugins/accounts/UnrestrictLi.py index bfa81a6ef..1c5263e28 100644 --- a/pyload/plugins/accounts/UnrestrictLi.py +++ b/pyload/plugins/accounts/UnrestrictLi.py @@ -24,8 +24,8 @@ class UnrestrictLi(MultiHoster): __version__ = "0.03" __type__ = "account" __description__ = """Unrestrict.li account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json') diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py index ac1f3fd35..a9e86e297 100644 --- a/pyload/plugins/accounts/UploadedTo.py +++ b/pyload/plugins/accounts/UploadedTo.py @@ -28,8 +28,8 @@ class UploadedTo(Account): __version__ = "0.26" __type__ = "account" __description__ = """ul.net account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/accounts/UploadheroCom.py b/pyload/plugins/accounts/UploadheroCom.py index 12463f285..c43dcfbd1 100644 --- a/pyload/plugins/accounts/UploadheroCom.py +++ b/pyload/plugins/accounts/UploadheroCom.py @@ -13,8 +13,8 @@ class UploadheroCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """Uploadhero.co account plugin""" - __author_name__ = ("mcmyst") - __author_mail__ = ("mcmyst@hotmail.fr") + __author_name__ = "mcmyst" + __author_mail__ = "mcmyst@hotmail.fr" def loadAccountInfo(self, user, req): premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.') diff --git a/pyload/plugins/accounts/UploadingCom.py b/pyload/plugins/accounts/UploadingCom.py index d13df4f9d..187434b19 100644 --- a/pyload/plugins/accounts/UploadingCom.py +++ b/pyload/plugins/accounts/UploadingCom.py @@ -28,8 +28,8 @@ class UploadingCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """uploading.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): src = req.load("http://uploading.com/") diff --git a/pyload/plugins/accounts/UptoboxCom.py b/pyload/plugins/accounts/UptoboxCom.py index 17ca81f68..0215254bd 100644 --- a/pyload/plugins/accounts/UptoboxCom.py +++ b/pyload/plugins/accounts/UptoboxCom.py @@ -7,8 +7,8 @@ class UptoboxCom(XFSPAccount): __version__ = "0.02" __type__ = "account" __description__ = """DDLStorage.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://uptobox.com/" diff --git a/pyload/plugins/accounts/WarserverCz.py b/pyload/plugins/accounts/WarserverCz.py index 2c871eb6d..62c7e19fa 100644 --- a/pyload/plugins/accounts/WarserverCz.py +++ b/pyload/plugins/accounts/WarserverCz.py @@ -28,8 +28,8 @@ class WarserverCz(Account): __version__ = "0.02" __type__ = "account" __description__ = """Warserver.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = ur'<li>Neomezené stahování do: <strong>(.+?)<' TRAFFIC_LEFT_PATTERN = ur'<li>Kredit: <strong>(.+?)<' diff --git a/pyload/plugins/accounts/YibaishiwuCom.py b/pyload/plugins/accounts/YibaishiwuCom.py index c4eab74dc..75aae25b9 100644 --- a/pyload/plugins/accounts/YibaishiwuCom.py +++ b/pyload/plugins/accounts/YibaishiwuCom.py @@ -27,8 +27,8 @@ class YibaishiwuCom(Account): __version__ = "0.01" __type__ = "account" __description__ = """115.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}' diff --git a/pyload/plugins/accounts/ZeveraCom.py b/pyload/plugins/accounts/ZeveraCom.py index 8f05f1d76..dcba478df 100644 --- a/pyload/plugins/accounts/ZeveraCom.py +++ b/pyload/plugins/accounts/ZeveraCom.py @@ -9,8 +9,8 @@ class ZeveraCom(MultiHoster): __version__ = "0.21" __type__ = "account" __description__ = """Zevera.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): data = self.getAPIData(req) diff --git a/pyload/plugins/addons/AlldebridCom.py b/pyload/plugins/addons/AlldebridCom.py index 775e6adc3..1e6680632 100644 --- a/pyload/plugins/addons/AlldebridCom.py +++ b/pyload/plugins/addons/AlldebridCom.py @@ -19,8 +19,8 @@ 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") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/pyload/plugins/addons/Captcha9kw.py b/pyload/plugins/addons/Captcha9kw.py index 6a9de24de..85331a2c2 100755 --- a/pyload/plugins/addons/Captcha9kw.py +++ b/pyload/plugins/addons/Captcha9kw.py @@ -42,8 +42,8 @@ class Captcha9kw(Hook): "False"), ("timeout", "int", "Timeout (max. 300)", "300"), ("passkey", "password", "API key", ""), ] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" API_URL = "://www.9kw.eu/index.cgi" diff --git a/pyload/plugins/addons/CaptchaTrader.py b/pyload/plugins/addons/CaptchaTrader.py index 51bb75a17..df54ec70b 100644 --- a/pyload/plugins/addons/CaptchaTrader.py +++ b/pyload/plugins/addons/CaptchaTrader.py @@ -49,8 +49,8 @@ class CaptchaTrader(Hook): ("username", "str", "Username", ""), ("force", "bool", "Force CT even if client is connected", False), ("passkey", "password", "Password", ""), ] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" SUBMIT_URL = "http://api.captchatrader.com/submit" RESPOND_URL = "http://api.captchatrader.com/respond" diff --git a/pyload/plugins/addons/DebridItaliaCom.py b/pyload/plugins/addons/DebridItaliaCom.py index 71ebac85c..49733c244 100644 --- a/pyload/plugins/addons/DebridItaliaCom.py +++ b/pyload/plugins/addons/DebridItaliaCom.py @@ -29,8 +29,8 @@ 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") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getHoster(self): return ["netload.in", "hotfile.com", "rapidshare.com", "multiupload.com", diff --git a/pyload/plugins/addons/EasybytezCom.py b/pyload/plugins/addons/EasybytezCom.py index cc55da9c0..2228973e4 100644 --- a/pyload/plugins/addons/EasybytezCom.py +++ b/pyload/plugins/addons/EasybytezCom.py @@ -13,8 +13,8 @@ class EasybytezCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """EasyBytez.com hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def getHoster(self): self.account = self.core.accountManager.getAccountPlugin(self.__name__) diff --git a/pyload/plugins/addons/Ev0InFetcher.py b/pyload/plugins/addons/Ev0InFetcher.py index 912cb5964..0267dd4a7 100644 --- a/pyload/plugins/addons/Ev0InFetcher.py +++ b/pyload/plugins/addons/Ev0InFetcher.py @@ -32,8 +32,8 @@ class Ev0InFetcher(Hook): ("quality", "xvid;x264;rmvb", "Video Format", "xvid"), ("hoster", "str", "Hoster to use (comma seperated)", "NetloadIn,RapidshareCom,MegauploadCom,HotfileCom")] - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.interval = self.getConfig("interval") * 60 diff --git a/pyload/plugins/addons/FastixRu.py b/pyload/plugins/addons/FastixRu.py index 25c9a1a67..b7d1dd05d 100644 --- a/pyload/plugins/addons/FastixRu.py +++ b/pyload/plugins/addons/FastixRu.py @@ -16,8 +16,8 @@ class FastixRu(MultiHoster): ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Fastix hook plugin""" - __author_name__ = ("Massimo, Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def getHoster(self): page = getURL( diff --git a/pyload/plugins/addons/HotFolder.py b/pyload/plugins/addons/HotFolder.py index e44c1e172..39e135db1 100644 --- a/pyload/plugins/addons/HotFolder.py +++ b/pyload/plugins/addons/HotFolder.py @@ -39,8 +39,8 @@ class HotFolder(Hook): ("keep", "bool", "Keep added containers", "True"), ("file", "str", "Link file", "links.txt")] __threaded__ = [] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.de") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.de" def setup(self): self.interval = 10 diff --git a/pyload/plugins/addons/IRCInterface.py b/pyload/plugins/addons/IRCInterface.py index 66fd15dcc..f71897ff2 100644 --- a/pyload/plugins/addons/IRCInterface.py +++ b/pyload/plugins/addons/IRCInterface.py @@ -48,8 +48,8 @@ class IRCInterface(Thread, Addon): ("info_file", "bool", "Inform about every file finished", "False"), ("info_pack", "bool", "Inform about every package finished", "True"), ("captcha", "bool", "Send captcha requests", "True")] - __author_name__ = ("Jeix") - __author_mail__ = ("Jeix@hasnomail.com") + __author_name__ = "Jeix" + __author_mail__ = "Jeix@hasnomail.com" def __init__(self, core, manager): Thread.__init__(self) diff --git a/pyload/plugins/addons/LinkdecrypterCom.py b/pyload/plugins/addons/LinkdecrypterCom.py index 8f656eb99..550cc0d62 100644 --- a/pyload/plugins/addons/LinkdecrypterCom.py +++ b/pyload/plugins/addons/LinkdecrypterCom.py @@ -28,7 +28,8 @@ class LinkdecrypterCom(Hook): __version__ = "0.19" __description__ = """linkdecrypter.com - regexp loader""" __config__ = [("activated", "bool", "Activated", "False")] - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def coreReady(self): try: diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index 869b5b6f8..e7f35d406 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -34,8 +34,8 @@ class MergeFiles(Hook): __description__ = "Merges parts splitted with hjsplit" __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] - __author_name__ = ("and9000") - __author_mail__ = ("me@has-no-mail.com") + __author_name__ = "and9000" + __author_mail__ = "me@has-no-mail.com" def setup(self): # nothing to do diff --git a/pyload/plugins/addons/MultiHome.py b/pyload/plugins/addons/MultiHome.py index 473e6dcb1..e0895f706 100644 --- a/pyload/plugins/addons/MultiHome.py +++ b/pyload/plugins/addons/MultiHome.py @@ -28,8 +28,8 @@ class MultiHome(Hook): __description__ = """ip address changer""" __config__ = [("activated", "bool", "Activated", "False"), ("interfaces", "str", "Interfaces", "None")] - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.register = {} diff --git a/pyload/plugins/addons/MultishareCz.py b/pyload/plugins/addons/MultishareCz.py index fc35bb785..75a6fd6a0 100644 --- a/pyload/plugins/addons/MultishareCz.py +++ b/pyload/plugins/addons/MultishareCz.py @@ -14,8 +14,8 @@ class MultishareCz(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")] __description__ = """MultiShare.cz hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"' diff --git a/pyload/plugins/addons/PremiumizeMe.py b/pyload/plugins/addons/PremiumizeMe.py index 07630420c..d6d2577a7 100644 --- a/pyload/plugins/addons/PremiumizeMe.py +++ b/pyload/plugins/addons/PremiumizeMe.py @@ -16,8 +16,8 @@ class PremiumizeMe(MultiHoster): ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Florian Franzen") - __author_mail__ = ("FlorianFranzen@gmail.com") + __author_name__ = "Florian Franzen" + __author_mail__ = "FlorianFranzen@gmail.com" def getHoster(self): # If no accounts are available there will be no hosters available diff --git a/pyload/plugins/addons/RPNetBiz.py b/pyload/plugins/addons/RPNetBiz.py index 69976ffc9..85ba72a46 100644 --- a/pyload/plugins/addons/RPNetBiz.py +++ b/pyload/plugins/addons/RPNetBiz.py @@ -13,8 +13,8 @@ class RPNetBiz(MultiHoster): ("hosterList", "str", "Hoster list (comma separated)", ""), ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Dman") - __author_mail__ = ("dmanugm@gmail.com") + __author_name__ = "Dman" + __author_mail__ = "dmanugm@gmail.com" def getHoster(self): # No hosts supported if no account diff --git a/pyload/plugins/addons/RealdebridCom.py b/pyload/plugins/addons/RealdebridCom.py index 41e988495..a77fac096 100644 --- a/pyload/plugins/addons/RealdebridCom.py +++ b/pyload/plugins/addons/RealdebridCom.py @@ -16,8 +16,8 @@ class RealdebridCom(MultiHoster): ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("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") + __author_name__ = "Devirex Hazzard" + __author_mail__ = "naibaf_11@yahoo.de" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/pyload/plugins/addons/RehostTo.py b/pyload/plugins/addons/RehostTo.py index 6e24988c8..8b110fa53 100644 --- a/pyload/plugins/addons/RehostTo.py +++ b/pyload/plugins/addons/RehostTo.py @@ -16,8 +16,8 @@ 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") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def getHoster(self): page = getURL("http://rehost.to/api.php?cmd=get_supported_och_dl&long_ses=%s" % self.long_ses) diff --git a/pyload/plugins/addons/ReloadCc.py b/pyload/plugins/addons/ReloadCc.py index d07923624..c4b805d70 100644 --- a/pyload/plugins/addons/ReloadCc.py +++ b/pyload/plugins/addons/ReloadCc.py @@ -14,8 +14,8 @@ class ReloadCc(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] - __author_name__ = ("Reload Team") - __author_mail__ = ("hello@reload.cc") + __author_name__ = "Reload Team" + __author_mail__ = "hello@reload.cc" interval = 0 # Disable periodic calls diff --git a/pyload/plugins/addons/RestartFailed.py b/pyload/plugins/addons/RestartFailed.py index 64853194a..8b4dd98a3 100644 --- a/pyload/plugins/addons/RestartFailed.py +++ b/pyload/plugins/addons/RestartFailed.py @@ -26,8 +26,8 @@ class RestartFailed(Hook): __description__ = "Periodically restart all failed downloads in queue" __config__ = [("activated", "bool", "Activated", "False"), ("interval", "int", "Interval in minutes", "90")] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" event_list = ["pluginConfigChanged"] diff --git a/pyload/plugins/addons/SimplydebridCom.py b/pyload/plugins/addons/SimplydebridCom.py index 3272df567..71f003ce9 100644 --- a/pyload/plugins/addons/SimplydebridCom.py +++ b/pyload/plugins/addons/SimplydebridCom.py @@ -12,8 +12,8 @@ class SimplydebridCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """Simply-Debrid.com hook plugin""" - __author_name__ = ("Kagenoshin") - __author_mail__ = ("kagenoshin@gmx.ch") + __author_name__ = "Kagenoshin" + __author_mail__ = "kagenoshin@gmx.ch" def getHoster(self): page = getURL("http://simply-debrid.com/api.php?list=1") diff --git a/pyload/plugins/addons/UnSkipOnFail.py b/pyload/plugins/addons/UnSkipOnFail.py index 455832b09..8750ab47f 100644 --- a/pyload/plugins/addons/UnSkipOnFail.py +++ b/pyload/plugins/addons/UnSkipOnFail.py @@ -28,8 +28,8 @@ class UnSkipOnFail(Hook): __version__ = '0.01' __description__ = 'When a download fails, restart "skipped" duplicates.' __config__ = [('activated', 'bool', 'Activated', True), ] - __author_name__ = ('hagg',) - __author_mail__ = ('') + __author_name__ = "hagg" + __author_mail__ = "" def downloadFailed(self, pyfile): pyfile_name = basename(pyfile.name) diff --git a/pyload/plugins/addons/UpdateManager.py b/pyload/plugins/addons/UpdateManager.py index 62031e6a4..37ea1b67c 100644 --- a/pyload/plugins/addons/UpdateManager.py +++ b/pyload/plugins/addons/UpdateManager.py @@ -35,8 +35,8 @@ class UpdateManager(Hook): __config__ = [("activated", "bool", "Activated", "True"), ("interval", "int", "Check interval in minutes", "480"), ("debug", "bool", "Check for plugin changes when in debug mode", False)] - __author_name__ = ("RaNaN") - __author_mail__ = ("ranan@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "ranan@pyload.org" URL = "http://get.pyload.org/check2/%s/" MIN_TIME = 3 * 60 * 60 # 3h minimum check interval diff --git a/pyload/plugins/addons/WindowsPhoneToastNotify.py b/pyload/plugins/addons/WindowsPhoneToastNotify.py index d110f7896..e96004657 100644 --- a/pyload/plugins/addons/WindowsPhoneToastNotify.py +++ b/pyload/plugins/addons/WindowsPhoneToastNotify.py @@ -22,8 +22,8 @@ class WindowsPhoneToastNotify(Hook): __name__ = "WindowsPhoneToastNotify" __version__ = "0.02" __description__ = """Send push notifications to Windows Phone.""" - __author_name__ = ("Andy Voigt") - __author_mail__ = ("phone-support@hotmail.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "phone-support@hotmail.de" __config__ = [("activated", "bool", "Activated", False), ("force", "bool", "Force even if client is connected", False), ("pushId", "str", "pushId", ""), diff --git a/pyload/plugins/addons/XFileSharingPro.py b/pyload/plugins/addons/XFileSharingPro.py index 24d51ed60..914777dec 100644 --- a/pyload/plugins/addons/XFileSharingPro.py +++ b/pyload/plugins/addons/XFileSharingPro.py @@ -14,8 +14,8 @@ class XFileSharingPro(Hook): ("includeList", "str", "Include hosters (comma separated)", ""), ("excludeList", "str", "Exclude hosters (comma separated)", "")] __description__ = """Hoster URL pattern loader for the generic XFileSharingPro plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def coreReady(self): self.loadPattern() diff --git a/pyload/plugins/addons/XMPPInterface.py b/pyload/plugins/addons/XMPPInterface.py index adffc04e3..0e92b6f2b 100644 --- a/pyload/plugins/addons/XMPPInterface.py +++ b/pyload/plugins/addons/XMPPInterface.py @@ -39,8 +39,8 @@ class XMPPInterface(IRCInterface, JabberClient): ("info_file", "bool", "Inform about every file finished", "False"), ("info_pack", "bool", "Inform about every package finished", "True"), ("captcha", "bool", "Send captcha requests", "True")] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" implements(IMessageHandlersProvider) diff --git a/pyload/plugins/addons/ZeveraCom.py b/pyload/plugins/addons/ZeveraCom.py index fb84886d1..5fbf20b56 100644 --- a/pyload/plugins/addons/ZeveraCom.py +++ b/pyload/plugins/addons/ZeveraCom.py @@ -12,8 +12,8 @@ class ZeveraCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """Real-Debrid.com hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def getHoster(self): page = getURL("http://www.zevera.com/jDownloader.ashx?cmd=gethosters") diff --git a/pyload/plugins/crypter/BitshareComFolder.py b/pyload/plugins/crypter/BitshareComFolder.py index b77ddb9d9..86754915d 100644 --- a/pyload/plugins/crypter/BitshareComFolder.py +++ b/pyload/plugins/crypter/BitshareComFolder.py @@ -24,8 +24,8 @@ class BitshareComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?bitshare\.com/\?d=\w+" __version__ = "0.01" __description__ = """Bitshare.com Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>' TITLE_PATTERN = r'View public folder "(?P<title>.+)"</h1>' diff --git a/pyload/plugins/crypter/C1neonCom.py b/pyload/plugins/crypter/C1neonCom.py index c1e9013b3..5506820af 100644 --- a/pyload/plugins/crypter/C1neonCom.py +++ b/pyload/plugins/crypter/C1neonCom.py @@ -9,5 +9,5 @@ class C1neonCom(DeadCrypter): __pattern__ = r"http://(www\.)?c1neon.com/.*?" __version__ = "0.05" __description__ = """C1neon.Com Container Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py index ab7ff1099..8013f34f2 100644 --- a/pyload/plugins/crypter/CCF.py +++ b/pyload/plugins/crypter/CCF.py @@ -15,8 +15,8 @@ class CCF(Crypter): __version__ = "0.2" __pattern__ = r"(?!http://).*\.ccf$" __description__ = """CCF Container Convert Plugin""" - __author_name__ = ("Willnix") - __author_mail__ = ("Willnix@pyload.org") + __author_name__ = "Willnix" + __author_mail__ = "Willnix@pyload.org" def decrypt(self, pyfile): diff --git a/pyload/plugins/crypter/CrockoComFolder.py b/pyload/plugins/crypter/CrockoComFolder.py index ffa8039a1..fa616fb28 100644 --- a/pyload/plugins/crypter/CrockoComFolder.py +++ b/pyload/plugins/crypter/CrockoComFolder.py @@ -9,7 +9,7 @@ class CrockoComFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?crocko.com/f/.*" __version__ = "0.01" __description__ = """Crocko.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
\ No newline at end of file diff --git a/pyload/plugins/crypter/CryptItCom.py b/pyload/plugins/crypter/CryptItCom.py index 679e891b9..7fe0cb036 100644 --- a/pyload/plugins/crypter/CryptItCom.py +++ b/pyload/plugins/crypter/CryptItCom.py @@ -9,5 +9,5 @@ class CryptItCom(DeadCrypter): __pattern__ = r"http://[\w\.]*?crypt-it\.com/(s|e|d|c)/[\w]+" __version__ = "0.11" __description__ = """Crypt.It.com Container Plugin""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.de") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.de" diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py index 9ccda3ed2..5d352702f 100644 --- a/pyload/plugins/crypter/CzshareComFolder.py +++ b/pyload/plugins/crypter/CzshareComFolder.py @@ -10,8 +10,8 @@ class CzshareComFolder(Crypter): __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/folders/.*" __version__ = "0.1" __description__ = """Czshare.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>' LINK_PATTERN = r'<td class="col2"><a href="([^"]+)">info</a></td>' diff --git a/pyload/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py index 822addca1..c92d3acca 100644 --- a/pyload/plugins/crypter/DDLMusicOrg.py +++ b/pyload/plugins/crypter/DDLMusicOrg.py @@ -13,8 +13,8 @@ class DDLMusicOrg(Crypter): __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+" __version__ = "0.3" __description__ = """ddl-music.org Container Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.multiDL = False diff --git a/pyload/plugins/crypter/DataHuFolder.py b/pyload/plugins/crypter/DataHuFolder.py index f710f60d7..cbc4289e5 100644 --- a/pyload/plugins/crypter/DataHuFolder.py +++ b/pyload/plugins/crypter/DataHuFolder.py @@ -27,7 +27,7 @@ class DataHuFolder(SimpleCrypter): __version__ = "0.03" __description__ = """Data.hu Folder Plugin""" __author_name__ = ("crash", "stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r"<a href='(http://data\.hu/get/.+)' target='_blank'>\1</a>" TITLE_PATTERN = ur'<title>(?P<title>.+) Let\xf6lt\xe9se</title>' diff --git a/pyload/plugins/crypter/DepositfilesComFolder.py b/pyload/plugins/crypter/DepositfilesComFolder.py index 15c317acf..2bb32b072 100644 --- a/pyload/plugins/crypter/DepositfilesComFolder.py +++ b/pyload/plugins/crypter/DepositfilesComFolder.py @@ -9,7 +9,7 @@ class DepositfilesComFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?depositfiles.com/folders/\w+" __version__ = "0.01" __description__ = """Depositfiles.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">' diff --git a/pyload/plugins/crypter/Dereferer.py b/pyload/plugins/crypter/Dereferer.py index 7b7c34fee..46001918f 100644 --- a/pyload/plugins/crypter/Dereferer.py +++ b/pyload/plugins/crypter/Dereferer.py @@ -27,8 +27,8 @@ class Dereferer(Crypter): __pattern__ = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)' __version__ = "0.1" __description__ = """Crypter for dereferers""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def decrypt(self, pyfile): link = re.match(self.__pattern__, self.pyfile.url).group('url') diff --git a/pyload/plugins/crypter/DontKnowMe.py b/pyload/plugins/crypter/DontKnowMe.py index 0791e3c22..03a016d27 100644 --- a/pyload/plugins/crypter/DontKnowMe.py +++ b/pyload/plugins/crypter/DontKnowMe.py @@ -12,8 +12,8 @@ class DontKnowMe(Crypter): __pattern__ = r"http://dontknow.me/at/\?.+$" __version__ = "0.1" __description__ = """DontKnowMe""" - __author_name__ = ("selaux") - __author_mail__ = ("") + __author_name__ = "selaux" + __author_mail__ = "" LINK_PATTERN = r"http://dontknow.me/at/\?(.+)$" diff --git a/pyload/plugins/crypter/DownloadVimeoCom.py b/pyload/plugins/crypter/DownloadVimeoCom.py index 562672599..9b5fd552a 100644 --- a/pyload/plugins/crypter/DownloadVimeoCom.py +++ b/pyload/plugins/crypter/DownloadVimeoCom.py @@ -13,8 +13,9 @@ class DownloadVimeoCom(Crypter): ## The download from dailymotion failed with a 403 __version__ = '0.1' __description__ = """Video Download Plugin based on downloadvimeo.com""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" + BASE_URL = 'http://downloadvimeo.com' def decrypt(self, pyfile): diff --git a/pyload/plugins/crypter/DuckCryptInfo.py b/pyload/plugins/crypter/DuckCryptInfo.py index 64302c800..6a157a9c0 100644 --- a/pyload/plugins/crypter/DuckCryptInfo.py +++ b/pyload/plugins/crypter/DuckCryptInfo.py @@ -11,8 +11,8 @@ class DuckCryptInfo(Crypter): __pattern__ = r"http://(?:www\.)?duckcrypt.info/(folder|wait|link)/(\w+)/?(\w*)" __version__ = "0.02" __description__ = """DuckCrypt.Info Container Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" TIMER_PATTERN = r'<span id="timer">(.*)</span>' diff --git a/pyload/plugins/crypter/DuploadOrgFolder.py b/pyload/plugins/crypter/DuploadOrgFolder.py index a1918f055..3f179cd34 100644 --- a/pyload/plugins/crypter/DuploadOrgFolder.py +++ b/pyload/plugins/crypter/DuploadOrgFolder.py @@ -24,7 +24,7 @@ class DuploadOrgFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?dupload\.org/folder/\d+/" __version__ = "0.01" __description__ = """Dupload.org Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<td style="[^"]+"><a href="(http://[^"]+)" target="_blank">[^<]+</a></td>' diff --git a/pyload/plugins/crypter/EasybytezComFolder.py b/pyload/plugins/crypter/EasybytezComFolder.py index 104ec3fd7..0e28fc35e 100644 --- a/pyload/plugins/crypter/EasybytezComFolder.py +++ b/pyload/plugins/crypter/EasybytezComFolder.py @@ -24,8 +24,8 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)" __version__ = "0.05" __description__ = """Easybytez Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g<ID>?per_page=10000")] diff --git a/pyload/plugins/crypter/EmbeduploadCom.py b/pyload/plugins/crypter/EmbeduploadCom.py index 122c0f671..956fa6bfb 100644 --- a/pyload/plugins/crypter/EmbeduploadCom.py +++ b/pyload/plugins/crypter/EmbeduploadCom.py @@ -13,8 +13,8 @@ class EmbeduploadCom(Crypter): __description__ = """EmbedUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "embedupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>' diff --git a/pyload/plugins/crypter/FilebeerInfoFolder.py b/pyload/plugins/crypter/FilebeerInfoFolder.py index b6bf4fd07..311c1960a 100644 --- a/pyload/plugins/crypter/FilebeerInfoFolder.py +++ b/pyload/plugins/crypter/FilebeerInfoFolder.py @@ -9,6 +9,6 @@ class FilebeerInfoFolder(DeadCrypter): __pattern__ = r"http://(?:www\.)?filebeer\.info/(\d+~f).*" __version__ = "0.02" __description__ = """Filebeer.info Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" diff --git a/pyload/plugins/crypter/FilefactoryComFolder.py b/pyload/plugins/crypter/FilefactoryComFolder.py index 64b8ac37e..547b8e873 100644 --- a/pyload/plugins/crypter/FilefactoryComFolder.py +++ b/pyload/plugins/crypter/FilefactoryComFolder.py @@ -10,8 +10,8 @@ class FilefactoryComFolder(Crypter): __pattern__ = r"(http://(www\.)?filefactory\.com/f/\w+).*" __version__ = "0.1" __description__ = """Filefactory.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<table class="items" cellspacing="0" cellpadding="0">(.*?)</table>' LINK_PATTERN = r'<td class="name"><a href="([^"]+)">' diff --git a/pyload/plugins/crypter/FileserveComFolder.py b/pyload/plugins/crypter/FileserveComFolder.py index 42481c15e..0bf42f56e 100644 --- a/pyload/plugins/crypter/FileserveComFolder.py +++ b/pyload/plugins/crypter/FileserveComFolder.py @@ -11,8 +11,8 @@ class FileserveComFolder(Crypter): __pattern__ = r"http://(?:www\.)?fileserve.com/list/\w+" __version__ = "0.11" __description__ = """FileServeCom.com Folder Plugin""" - __author_name__ = ("fionnc") - __author_mail__ = ("fionnc@gmail.com") + __author_name__ = "fionnc" + __author_mail__ = "fionnc@gmail.com" FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>' LINK_PATTERN = r'<a href="([^"]+)" class="sheet_icon wbold">' diff --git a/pyload/plugins/crypter/FilestubeCom.py b/pyload/plugins/crypter/FilestubeCom.py index bb90e63b8..2595fa72a 100644 --- a/pyload/plugins/crypter/FilestubeCom.py +++ b/pyload/plugins/crypter/FilestubeCom.py @@ -24,8 +24,8 @@ class FilestubeCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+" __version__ = "0.03" __description__ = """Filestube.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r"<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)" TITLE_PATTERN = r"<h1\s*> (?P<title>.+) download\s*</h1>" diff --git a/pyload/plugins/crypter/FreakhareComFolder.py b/pyload/plugins/crypter/FreakhareComFolder.py index 519a468f3..1e86afdc1 100644 --- a/pyload/plugins/crypter/FreakhareComFolder.py +++ b/pyload/plugins/crypter/FreakhareComFolder.py @@ -26,8 +26,8 @@ class FreakhareComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?freakshare\.com/folder/.+" __version__ = "0.01" __description__ = """Freakhare.com Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<a href="(http://freakshare.com/files/[^"]+)" target="_blank">' TITLE_PATTERN = r'Folder:</b> (?P<title>.+)' diff --git a/pyload/plugins/crypter/FreetexthostCom.py b/pyload/plugins/crypter/FreetexthostCom.py index 8d165abe4..7c838e609 100644 --- a/pyload/plugins/crypter/FreetexthostCom.py +++ b/pyload/plugins/crypter/FreetexthostCom.py @@ -26,8 +26,8 @@ class FreetexthostCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?freetexthost\.com/\w+" __version__ = "0.01" __description__ = """Freetexthost.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getLinks(self): m = re.search(r'<div id="contentsinner">\s*(.+)<div class="viewcount">', self.html, re.DOTALL) diff --git a/pyload/plugins/crypter/FshareVnFolder.py b/pyload/plugins/crypter/FshareVnFolder.py index 2d7a3c490..77217ff54 100644 --- a/pyload/plugins/crypter/FshareVnFolder.py +++ b/pyload/plugins/crypter/FshareVnFolder.py @@ -9,7 +9,7 @@ class FshareVnFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?fshare.vn/folder/.*" __version__ = "0.01" __description__ = """Fshare.vn Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">' diff --git a/pyload/plugins/crypter/GooGl.py b/pyload/plugins/crypter/GooGl.py index bcb1d7494..7b78af926 100644 --- a/pyload/plugins/crypter/GooGl.py +++ b/pyload/plugins/crypter/GooGl.py @@ -25,8 +25,8 @@ class GooGl(Crypter): __pattern__ = r"https?://(www\.)?goo\.gl/\w+" __version__ = "0.01" __description__ = """Goo.gl Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" API_URL = 'https://www.googleapis.com/urlshortener/v1/url' diff --git a/pyload/plugins/crypter/HotfileFolderCom.py b/pyload/plugins/crypter/HotfileFolderCom.py index 79691ad01..3836bcb34 100644 --- a/pyload/plugins/crypter/HotfileFolderCom.py +++ b/pyload/plugins/crypter/HotfileFolderCom.py @@ -12,8 +12,8 @@ class HotfileFolderCom(Crypter): __pattern__ = r"http://(?:www\.)?hotfile.com/list/\w+/\w+" __version__ = "0.1" __description__ = """HotfileFolder Download Plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def decrypt(self, pyfile): html = self.load(pyfile.url) diff --git a/pyload/plugins/crypter/ILoadTo.py b/pyload/plugins/crypter/ILoadTo.py index d155f4bb6..ca6dd5026 100644 --- a/pyload/plugins/crypter/ILoadTo.py +++ b/pyload/plugins/crypter/ILoadTo.py @@ -9,5 +9,5 @@ class ILoadTo(DeadCrypter): __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/" __version__ = "0.11" __description__ = """iload.to Crypter Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py index 129da6608..d75ab463c 100644 --- a/pyload/plugins/crypter/LinkSaveIn.py +++ b/pyload/plugins/crypter/LinkSaveIn.py @@ -21,8 +21,8 @@ class LinkSaveIn(Crypter): __pattern__ = r"http://(www\.)?linksave.in/(?P<id>\w+)$" __version__ = "2.01" __description__ = """LinkSave.in Crypter Plugin""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" # Constants _JK_KEY_ = "jk" diff --git a/pyload/plugins/crypter/LinkdecrypterCom.py b/pyload/plugins/crypter/LinkdecrypterCom.py index 6a11c98b0..1880e03eb 100644 --- a/pyload/plugins/crypter/LinkdecrypterCom.py +++ b/pyload/plugins/crypter/LinkdecrypterCom.py @@ -26,6 +26,7 @@ class LinkdecrypterCom(Crypter): __version__ = "0.27" __description__ = """linkdecrypter.com""" __author_name__ = ("zoidberg", "flowlee") + __author_mail__ = ("zoidberg@mujmail.cz", "") TEXTAREA_PATTERN = r'<textarea name="links" wrap="off" readonly="1" class="caja_des">(.+)</textarea>' PASSWORD_PATTERN = r'<input type="text" name="password"' diff --git a/pyload/plugins/crypter/LixIn.py b/pyload/plugins/crypter/LixIn.py index 52abe1b3c..6e4d8fe89 100644 --- a/pyload/plugins/crypter/LixIn.py +++ b/pyload/plugins/crypter/LixIn.py @@ -12,8 +12,8 @@ class LixIn(Crypter): __pattern__ = r"http://(www.)?lix.in/(?P<id>.*)" __version__ = "0.22" __description__ = """Lix.in Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" CAPTCHA_PATTERN = '<img src="(?P<image>captcha_img.php\?.*?)"' SUBMIT_PATTERN = r"value='continue.*?'" diff --git a/pyload/plugins/crypter/LofCc.py b/pyload/plugins/crypter/LofCc.py index 458609881..e3aec6b73 100644 --- a/pyload/plugins/crypter/LofCc.py +++ b/pyload/plugins/crypter/LofCc.py @@ -9,5 +9,5 @@ class LofCc(DeadCrypter): __pattern__ = r"http://lof.cc/(.*)" __version__ = "0.21" __description__ = """lof.cc Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" diff --git a/pyload/plugins/crypter/MediafireComFolder.py b/pyload/plugins/crypter/MediafireComFolder.py index 3709d3349..1c0c389da 100644 --- a/pyload/plugins/crypter/MediafireComFolder.py +++ b/pyload/plugins/crypter/MediafireComFolder.py @@ -12,8 +12,8 @@ class MediafireComFolder(Crypter): __pattern__ = r"http://(\w*\.)*mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))" __version__ = "0.14" __description__ = """Mediafire.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_KEY_PATTERN = r"var afI= '(\w+)';" FILE_URL_PATTERN = '<meta property="og:url" content="http://www.mediafire.com/\?(\w+)"/>' diff --git a/pyload/plugins/crypter/Movie2kTo.py b/pyload/plugins/crypter/Movie2kTo.py index c9c3f8f2d..8119ba814 100644 --- a/pyload/plugins/crypter/Movie2kTo.py +++ b/pyload/plugins/crypter/Movie2kTo.py @@ -9,5 +9,5 @@ class Movie2kTo(DeadCrypter): __pattern__ = r"http://(?:www\.)?movie2k\.to/(.*)\.html" __version__ = "0.51" __description__ = """Movie2k.to Container Plugin""" - __author_name__ = ("4Christopher") - __author_mail__ = ("4Christopher@gmx.de") + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" diff --git a/pyload/plugins/crypter/MultiloadCz.py b/pyload/plugins/crypter/MultiloadCz.py index 055d72375..dcc27f2e7 100644 --- a/pyload/plugins/crypter/MultiloadCz.py +++ b/pyload/plugins/crypter/MultiloadCz.py @@ -12,8 +12,8 @@ class MultiloadCz(Crypter): __description__ = """multiload.cz""" __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>' LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">' diff --git a/pyload/plugins/crypter/MultiuploadCom.py b/pyload/plugins/crypter/MultiuploadCom.py index 111ecdf6c..f54566b10 100644 --- a/pyload/plugins/crypter/MultiuploadCom.py +++ b/pyload/plugins/crypter/MultiuploadCom.py @@ -15,8 +15,8 @@ class MultiuploadCom(Crypter): __description__ = """MultiUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "multiupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" ML_LINK_PATTERN = r'<div id="downloadbutton_" style=""><a href="([^"]+)"' diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py index a2e6d039e..55b90c0e4 100644 --- a/pyload/plugins/crypter/OneKhDe.py +++ b/pyload/plugins/crypter/OneKhDe.py @@ -13,8 +13,8 @@ class OneKhDe(Crypter): __pattern__ = r"http://(www\.)?1kh.de/f/" __version__ = "0.1" __description__ = """1kh.de Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" def __init__(self, parent): Crypter.__init__(self, parent) diff --git a/pyload/plugins/crypter/OronComFolder.py b/pyload/plugins/crypter/OronComFolder.py index 98d7e8242..93ca6888a 100755 --- a/pyload/plugins/crypter/OronComFolder.py +++ b/pyload/plugins/crypter/OronComFolder.py @@ -9,5 +9,5 @@ class OronComFolder(DeadCrypter): __pattern__ = r"http://(?:www\.)?oron.com/folder/\w+" __version__ = "0.11" __description__ = """Oron.com Folder Plugin""" - __author_name__ = ("DHMH") - __author_mail__ = ("webmaster@pcProfil.de") + __author_name__ = "DHMH" + __author_mail__ = "webmaster@pcProfil.de" diff --git a/pyload/plugins/crypter/PastebinCom.py b/pyload/plugins/crypter/PastebinCom.py index 942ab613b..fe5acfa93 100644 --- a/pyload/plugins/crypter/PastebinCom.py +++ b/pyload/plugins/crypter/PastebinCom.py @@ -24,8 +24,8 @@ class PastebinCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?pastebin\.com/\w+" __version__ = "0.01" __description__ = """Pastebin.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>' TITLE_PATTERN = r'<div class="paste_box_line1" title="(?P<title>[^"]+)">' diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCzFolder.py index 18ac68eec..51947fed3 100644 --- a/pyload/plugins/crypter/QuickshareCzFolder.py +++ b/pyload/plugins/crypter/QuickshareCzFolder.py @@ -10,8 +10,8 @@ class QuickshareCzFolder(Crypter): __pattern__ = r"http://(www\.)?quickshare.cz/slozka-\d+.*" __version__ = "0.1" __description__ = """Quickshare.cz Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' LINK_PATTERN = r'(http://www.quickshare.cz/\S+)' diff --git a/pyload/plugins/crypter/RSLayerCom.py b/pyload/plugins/crypter/RSLayerCom.py index 0dc7ddf4e..cce24c972 100644 --- a/pyload/plugins/crypter/RSLayerCom.py +++ b/pyload/plugins/crypter/RSLayerCom.py @@ -9,5 +9,5 @@ class RSLayerCom(DeadCrypter): __pattern__ = r"http://(www\.)?rs-layer.com/directory-" __version__ = "0.21" __description__ = """RS-Layer.com Container Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("none") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py index 104968e06..d2562ca86 100644 --- a/pyload/plugins/crypter/RelinkUs.py +++ b/pyload/plugins/crypter/RelinkUs.py @@ -15,8 +15,8 @@ class RelinkUs(Crypter): __pattern__ = r"http://(www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)" __version__ = "3.0" __description__ = """Relink.us Crypter Plugin""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" # Constants PREFERRED_LINK_SOURCES = ['cnl2', 'dlc', 'web'] diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py index 85cf552c8..725e629ab 100644 --- a/pyload/plugins/crypter/SafelinkingNet.py +++ b/pyload/plugins/crypter/SafelinkingNet.py @@ -15,8 +15,8 @@ class SafelinkingNet(Crypter): __pattern__ = r'https?://safelinking.net/([pd])/\w+' __version__ = '0.1' __description__ = 'Safelinking.net Crypter Plugin' - __author_name__ = 'quareevo' - __author_mail__ = 'quareevo@arcor.de' + __author_name__ = "quareevo" + __author_mail__ = "quareevo@arcor.de" __Solvemedia_pattern__ = "solvemediaApiKey = '([\w\.\-_]+)';" diff --git a/pyload/plugins/crypter/SecuredIn.py b/pyload/plugins/crypter/SecuredIn.py index 4c3bbf4a6..603f9d9b0 100644 --- a/pyload/plugins/crypter/SecuredIn.py +++ b/pyload/plugins/crypter/SecuredIn.py @@ -9,5 +9,5 @@ class SecuredIn(DeadCrypter): __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html" __version__ = "0.21" __description__ = """secured.in Container Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" diff --git a/pyload/plugins/crypter/ShareLinksBiz.py b/pyload/plugins/crypter/ShareLinksBiz.py index 09ac21873..09c300bf7 100644 --- a/pyload/plugins/crypter/ShareLinksBiz.py +++ b/pyload/plugins/crypter/ShareLinksBiz.py @@ -14,8 +14,8 @@ class ShareLinksBiz(Crypter): __pattern__ = r"(?P<base>http://[\w\.]*?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?" __version__ = "1.13" __description__ = """Share-Links.biz Crypter""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" def setup(self): self.baseUrl = None diff --git a/pyload/plugins/crypter/ShareRapidComFolder.py b/pyload/plugins/crypter/ShareRapidComFolder.py index 951c09d45..cccf3da91 100644 --- a/pyload/plugins/crypter/ShareRapidComFolder.py +++ b/pyload/plugins/crypter/ShareRapidComFolder.py @@ -9,7 +9,7 @@ class ShareRapidComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/(slozka/.+)" __version__ = "0.01" __description__ = """Share-Rapid.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">' diff --git a/pyload/plugins/crypter/SpeedLoadOrgFolder.py b/pyload/plugins/crypter/SpeedLoadOrgFolder.py index 7472e28fe..d03a81648 100644 --- a/pyload/plugins/crypter/SpeedLoadOrgFolder.py +++ b/pyload/plugins/crypter/SpeedLoadOrgFolder.py @@ -24,5 +24,5 @@ class SpeedLoadOrgFolder(DeadCrypter): __pattern__ = r"http://(www\.)?speedload\.org/(\d+~f$|folder/\d+/)" __version__ = "0.3" __description__ = """Speedload Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" diff --git a/pyload/plugins/crypter/StealthTo.py b/pyload/plugins/crypter/StealthTo.py index 45a14f5a2..793bcfe30 100644 --- a/pyload/plugins/crypter/StealthTo.py +++ b/pyload/plugins/crypter/StealthTo.py @@ -12,8 +12,8 @@ class StealthTo(Crypter): __pattern__ = r"http://(www\.)?stealth.to/folder/" __version__ = "0.1" __description__ = """Stealth.to Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" def __init__(self, parent): Crypter.__init__(self, parent) diff --git a/pyload/plugins/crypter/TrailerzoneInfo.py b/pyload/plugins/crypter/TrailerzoneInfo.py index cdd84bbc6..5a6455789 100644 --- a/pyload/plugins/crypter/TrailerzoneInfo.py +++ b/pyload/plugins/crypter/TrailerzoneInfo.py @@ -9,5 +9,5 @@ class TrailerzoneInfo(DeadCrypter): __pattern__ = r"http://(www\.)?trailerzone.info/.*?" __version__ = "0.03" __description__ = """TrailerZone.info Crypter Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" diff --git a/pyload/plugins/crypter/UlozToFolder.py b/pyload/plugins/crypter/UlozToFolder.py index a5ccfc753..d927be6b6 100644 --- a/pyload/plugins/crypter/UlozToFolder.py +++ b/pyload/plugins/crypter/UlozToFolder.py @@ -10,8 +10,8 @@ class UlozToFolder(Crypter): __pattern__ = r"http://.*(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(m|soubory)/.*" __version__ = "0.2" __description__ = """Uloz.to Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>' LINK_PATTERN = r'<br /><a href="/([^"]+)">[^<]+</a>' diff --git a/pyload/plugins/crypter/UploadedToFolder.py b/pyload/plugins/crypter/UploadedToFolder.py index 88d4e04e8..464ef2cc9 100644 --- a/pyload/plugins/crypter/UploadedToFolder.py +++ b/pyload/plugins/crypter/UploadedToFolder.py @@ -26,8 +26,8 @@ class UploadedToFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)" __version__ = "0.3" __description__ = """UploadedTo Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick=' TITLE_PATTERN = r'<title>(?P<title>[^<]+)</title>' diff --git a/pyload/plugins/crypter/WiiReloadedOrg.py b/pyload/plugins/crypter/WiiReloadedOrg.py index df70c5aea..8768952fe 100644 --- a/pyload/plugins/crypter/WiiReloadedOrg.py +++ b/pyload/plugins/crypter/WiiReloadedOrg.py @@ -9,5 +9,5 @@ class WiiReloadedOrg(DeadCrypter): __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+" __version__ = "0.11" __description__ = """Wii-Reloaded.org Crypter Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("none") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/pyload/plugins/crypter/XupPl.py b/pyload/plugins/crypter/XupPl.py index 09832f037..7ad0b22e0 100644 --- a/pyload/plugins/crypter/XupPl.py +++ b/pyload/plugins/crypter/XupPl.py @@ -7,8 +7,8 @@ class XupPl(Crypter): __pattern__ = r"https?://.*\.xup\.pl/.*" __version__ = "0.1" __description__ = """Xup.pl Crypter Plugin""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" def decrypt(self, pyfile): header = self.load(self.pyfile.url, just_header=True) diff --git a/pyload/plugins/crypter/YoutubeBatch.py b/pyload/plugins/crypter/YoutubeBatch.py index 696f3927e..cccade063 100644 --- a/pyload/plugins/crypter/YoutubeBatch.py +++ b/pyload/plugins/crypter/YoutubeBatch.py @@ -36,8 +36,8 @@ class YoutubeBatch(Crypter): __config__ = [("likes", "bool", "Grab user (channel) liked videos", "False"), ("favorites", "bool", "Grab user (channel) favorite videos", "False"), ("uploads", "bool", "Grab channel unplaylisted videos", "True")] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def api_response(self, ref, req): req.update({"key": API_KEY}) diff --git a/pyload/plugins/hoster/AlldebridCom.py b/pyload/plugins/hoster/AlldebridCom.py index 82f4531a6..7634c2460 100644 --- a/pyload/plugins/hoster/AlldebridCom.py +++ b/pyload/plugins/hoster/AlldebridCom.py @@ -15,8 +15,8 @@ class AlldebridCom(Hoster): __pattern__ = r"https?://.*alldebrid\..*" __description__ = """Alldebrid.com hoster plugin""" - __author_name__ = ("Andy, Voigt") - __author_mail__ = ("spamsales@online.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def getFilename(self, url): try: diff --git a/pyload/plugins/hoster/BasePlugin.py b/pyload/plugins/hoster/BasePlugin.py index 50d1f229b..7ea1dba17 100644 --- a/pyload/plugins/hoster/BasePlugin.py +++ b/pyload/plugins/hoster/BasePlugin.py @@ -15,8 +15,8 @@ class BasePlugin(Hoster): __pattern__ = r"^unmatchable$" __version__ = "0.19" __description__ = """Base Plugin when any other didnt fit""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def setup(self): self.chunkLimit = -1 diff --git a/pyload/plugins/hoster/BezvadataCz.py b/pyload/plugins/hoster/BezvadataCz.py index daed65095..8c8fed6bf 100644 --- a/pyload/plugins/hoster/BezvadataCz.py +++ b/pyload/plugins/hoster/BezvadataCz.py @@ -27,8 +27,8 @@ class BezvadataCz(SimpleHoster): __pattern__ = r"http://(\w*\.)*bezvadata.cz/stahnout/.*" __version__ = "0.24" __description__ = """BezvaData.cz""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<p><b>Soubor: (?P<N>[^<]+)</b></p>' FILE_SIZE_PATTERN = r'<li><strong>Velikost:</strong> (?P<S>[^<]+)</li>' diff --git a/pyload/plugins/hoster/BillionuploadsCom.py b/pyload/plugins/hoster/BillionuploadsCom.py index 91e869c59..eb54ad714 100644 --- a/pyload/plugins/hoster/BillionuploadsCom.py +++ b/pyload/plugins/hoster/BillionuploadsCom.py @@ -8,8 +8,8 @@ class BillionuploadsCom(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*?billionuploads.com/\w{12}" __version__ = "0.01" __description__ = """billionuploads.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>' FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>' diff --git a/pyload/plugins/hoster/BitshareCom.py b/pyload/plugins/hoster/BitshareCom.py index 2b3f7777f..f633fb71f 100644 --- a/pyload/plugins/hoster/BitshareCom.py +++ b/pyload/plugins/hoster/BitshareCom.py @@ -13,8 +13,8 @@ class BitshareCom(SimpleHoster): __pattern__ = r"http://(www\.)?bitshare\.com/(files/(?P<id1>[a-zA-Z0-9]+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>[a-zA-Z0-9]+))" __version__ = "0.49" __description__ = """Bitshare.Com File Download Hoster""" - __author_name__ = ("paulking", "fragonib") - __author_mail__ = (None, "fragonib[AT]yahoo[DOT]es") + __author_name__ = ("Paul King", "fragonib") + __author_mail__ = ("", "fragonib[AT]yahoo[DOT]es") HOSTER_DOMAIN = "bitshare.com" FILE_OFFLINE_PATTERN = r'(>We are sorry, but the requested file was not found in our database|>Error - File not available<|The file was deleted either by the uploader, inactivity or due to copyright claim)' diff --git a/pyload/plugins/hoster/BoltsharingCom.py b/pyload/plugins/hoster/BoltsharingCom.py index cc8b1c7e6..40bd06564 100644 --- a/pyload/plugins/hoster/BoltsharingCom.py +++ b/pyload/plugins/hoster/BoltsharingCom.py @@ -9,8 +9,8 @@ class BoltsharingCom(DeadHoster): __pattern__ = r"http://(?:\w*\.)*?boltsharing.com/\w{12}" __version__ = "0.02" __description__ = """Boltsharing.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(BoltsharingCom) diff --git a/pyload/plugins/hoster/CatShareNet.py b/pyload/plugins/hoster/CatShareNet.py index 66d46c2e8..b5540e399 100644 --- a/pyload/plugins/hoster/CatShareNet.py +++ b/pyload/plugins/hoster/CatShareNet.py @@ -11,8 +11,8 @@ class CatShareNet(SimpleHoster): __pattern__ = r"http://(www\.)?catshare.net/\w{16}.*" __version__ = "0.01" __description__ = """CatShare.net Download Hoster""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" FILE_INFO_PATTERN = r'<h3 class="pull-left"[^>]+>(?P<N>.*)</h3>\s+<h3 class="pull-right"[^>]+>(?P<S>.*)</h3>' FILE_OFFLINE_PATTERN = r'Podany plik zosta' diff --git a/pyload/plugins/hoster/ChipDe.py b/pyload/plugins/hoster/ChipDe.py index 8e13b914d..48442aefc 100644 --- a/pyload/plugins/hoster/ChipDe.py +++ b/pyload/plugins/hoster/ChipDe.py @@ -11,8 +11,8 @@ class ChipDe(Crypter): __pattern__ = r"http://(?:www\.)?chip.de/video/.*\.html" __version__ = "0.1" __description__ = """Chip.de Container Plugin""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" def decrypt(self, pyfile): self.html = self.load(pyfile.url) diff --git a/pyload/plugins/hoster/CramitIn.py b/pyload/plugins/hoster/CramitIn.py index 68df322f5..a810dc69f 100644 --- a/pyload/plugins/hoster/CramitIn.py +++ b/pyload/plugins/hoster/CramitIn.py @@ -8,8 +8,8 @@ class CramitIn(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*cramit.in/\w{12}" __version__ = "0.04" __description__ = """Cramit.in hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' DIRECT_LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"' diff --git a/pyload/plugins/hoster/CrockoCom.py b/pyload/plugins/hoster/CrockoCom.py index 5bd1a945c..6eb299c87 100644 --- a/pyload/plugins/hoster/CrockoCom.py +++ b/pyload/plugins/hoster/CrockoCom.py @@ -12,8 +12,8 @@ class CrockoCom(SimpleHoster): __pattern__ = r"http://(www\.)?(crocko|easy-share).com/\w+" __version__ = "0.16" __description__ = """Crocko Download Hoster""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)' FILE_SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>' diff --git a/pyload/plugins/hoster/CzshareCom.py b/pyload/plugins/hoster/CzshareCom.py index 58573d329..65a685cc3 100644 --- a/pyload/plugins/hoster/CzshareCom.py +++ b/pyload/plugins/hoster/CzshareCom.py @@ -30,7 +30,8 @@ class CzshareCom(SimpleHoster): __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/(\d+/|download.php\?).*" __version__ = "0.93" __description__ = """CZshare.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>' FILE_SIZE_PATTERN = r'<div class="tab" id="category">(?:\s*<p>[^\n]*</p>)*\s*Velikost:\s*(?P<S>[0-9., ]+)(?P<U>[kKMG])i?B\s*</div>' diff --git a/pyload/plugins/hoster/DailymotionCom.py b/pyload/plugins/hoster/DailymotionCom.py index 0822b0c52..93eceeff4 100644 --- a/pyload/plugins/hoster/DailymotionCom.py +++ b/pyload/plugins/hoster/DailymotionCom.py @@ -63,8 +63,8 @@ class DailymotionCom(Hoster): __version__ = "0.2" __config__ = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "HD 720p")] __description__ = """Dailymotion Video Download Hoster""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def setup(self): self.resumeDownload = self.multiDL = True diff --git a/pyload/plugins/hoster/DataHu.py b/pyload/plugins/hoster/DataHu.py index 7abd93d1f..390b40628 100644 --- a/pyload/plugins/hoster/DataHu.py +++ b/pyload/plugins/hoster/DataHu.py @@ -30,7 +30,7 @@ class DataHu(SimpleHoster): __version__ = "0.01" __description__ = """Data.hu Download Hoster""" __author_name__ = ("crash", "stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = ur'<title>(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se</title>' FILE_OFFLINE_PATTERN = ur'Az adott f\xe1jl nem l\xe9tezik' diff --git a/pyload/plugins/hoster/DataportCz.py b/pyload/plugins/hoster/DataportCz.py index 1e24388d7..9f30752b0 100644 --- a/pyload/plugins/hoster/DataportCz.py +++ b/pyload/plugins/hoster/DataportCz.py @@ -25,7 +25,8 @@ class DataportCz(SimpleHoster): __pattern__ = r"http://(?:.*?\.)?dataport.cz/file/(.*)" __version__ = "0.37" __description__ = """Dataport.cz plugin - free only""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<span itemprop="name">(?P<N>[^<]+)</span>' FILE_SIZE_PATTERN = r'<td class="fil">Velikost</td>\s*<td>(?P<S>[^<]+)</td>' diff --git a/pyload/plugins/hoster/DateiTo.py b/pyload/plugins/hoster/DateiTo.py index d7760d940..7841460b3 100644 --- a/pyload/plugins/hoster/DateiTo.py +++ b/pyload/plugins/hoster/DateiTo.py @@ -27,8 +27,8 @@ class DateiTo(SimpleHoster): __pattern__ = r"http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html" __version__ = "0.02" __description__ = """Datei.to plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'Dateiname:</td>\s*<td colspan="2"><strong>(?P<N>.*?)</' FILE_SIZE_PATTERN = r'Dateigröße:</td>\s*<td colspan="2">(?P<S>.*?)</' diff --git a/pyload/plugins/hoster/DebridItaliaCom.py b/pyload/plugins/hoster/DebridItaliaCom.py index ebea0ac13..0e68984d9 100644 --- a/pyload/plugins/hoster/DebridItaliaCom.py +++ b/pyload/plugins/hoster/DebridItaliaCom.py @@ -31,8 +31,8 @@ class DebridItaliaCom(Hoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __pattern__ = r"https?://.*debriditalia\.com" __description__ = """Debriditalia.com hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def setup(self): self.chunkLimit = -1 diff --git a/pyload/plugins/hoster/DuploadOrg.py b/pyload/plugins/hoster/DuploadOrg.py index 6ee2bcc7b..055d934d5 100644 --- a/pyload/plugins/hoster/DuploadOrg.py +++ b/pyload/plugins/hoster/DuploadOrg.py @@ -24,8 +24,8 @@ class DuploadOrg(XFileSharingPro): __pattern__ = r"http://(www\.)?dupload\.org/\w{12}" __version__ = "0.01" __description__ = """Dupload.grg hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" HOSTER_NAME = "dupload.org" diff --git a/pyload/plugins/hoster/EdiskCz.py b/pyload/plugins/hoster/EdiskCz.py index c172e7447..e92ecf4d2 100644 --- a/pyload/plugins/hoster/EdiskCz.py +++ b/pyload/plugins/hoster/EdiskCz.py @@ -26,7 +26,8 @@ class EdiskCz(SimpleHoster): __pattern__ = r"http://(\w*\.)?edisk.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.*" __version__ = "0.21" __description__ = """Edisk.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" URL_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">' FILE_INFO_PATTERN = r'<span class="fl" title="(?P<N>[^"]+)">\s*.*?\((?P<S>[0-9.]*) (?P<U>[kKMG])i?B\)</h1></span>' diff --git a/pyload/plugins/hoster/EgoFilesCom.py b/pyload/plugins/hoster/EgoFilesCom.py index 22ca99931..a454751b5 100644 --- a/pyload/plugins/hoster/EgoFilesCom.py +++ b/pyload/plugins/hoster/EgoFilesCom.py @@ -30,8 +30,8 @@ class EgoFilesCom(SimpleHoster): __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)" __version__ = "0.13" __description__ = """Egofiles.com Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r'<div class="down-file">\s+(?P<N>[^\t]+)\s+<div class="file-properties">\s+(File size|Rozmiar): (?P<S>[\w.]+) (?P<U>\w+) \|' FILE_OFFLINE_PATTERN = r'(File size|Rozmiar): 0 KB' diff --git a/pyload/plugins/hoster/EuroshareEu.py b/pyload/plugins/hoster/EuroshareEu.py index 03bec8bbd..d0f87aede 100644 --- a/pyload/plugins/hoster/EuroshareEu.py +++ b/pyload/plugins/hoster/EuroshareEu.py @@ -26,7 +26,8 @@ class EuroshareEu(SimpleHoster): __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" __version__ = "0.25" __description__ = """Euroshare.eu""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>' FILE_OFFLINE_PATTERN = ur'<h2>S.bor sa nena.iel</h2>|Požadovaná stránka neexistuje!' diff --git a/pyload/plugins/hoster/ExtabitCom.py b/pyload/plugins/hoster/ExtabitCom.py index 0678185ed..807f388fe 100644 --- a/pyload/plugins/hoster/ExtabitCom.py +++ b/pyload/plugins/hoster/ExtabitCom.py @@ -29,7 +29,8 @@ class ExtabitCom(SimpleHoster): __pattern__ = r"http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)" __version__ = "0.5" __description__ = """Extabit.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<th>File:</th>\s*<td class="col-fileinfo">\s*<div title="(?P<N>[^"]+)">' FILE_SIZE_PATTERN = r'<th>Size:</th>\s*<td class="col-fileinfo">(?P<S>[^<]+)</td>' diff --git a/pyload/plugins/hoster/FastixRu.py b/pyload/plugins/hoster/FastixRu.py index 8805081c9..39091d769 100644 --- a/pyload/plugins/hoster/FastixRu.py +++ b/pyload/plugins/hoster/FastixRu.py @@ -13,8 +13,8 @@ class FastixRu(Hoster): __type__ = "hoster" __pattern__ = r"http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>[a-zA-Z0-9]{24})" __description__ = """Fastix hoster plugin""" - __author_name__ = ("Massimo Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def getFilename(self, url): try: diff --git a/pyload/plugins/hoster/FileApeCom.py b/pyload/plugins/hoster/FileApeCom.py index 2a5daf16a..de1597d87 100644 --- a/pyload/plugins/hoster/FileApeCom.py +++ b/pyload/plugins/hoster/FileApeCom.py @@ -10,7 +10,8 @@ class FileApeCom(DeadHoster): __pattern__ = r"http://(www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+" __version__ = "0.12" __description__ = """FileApe Download Hoster""" - __author_name__ = ("espes") + __author_name__ = "espes" + __author_mail__ = "" getInfo = create_getInfo(FileApeCom) diff --git a/pyload/plugins/hoster/FilebeerInfo.py b/pyload/plugins/hoster/FilebeerInfo.py index d1bef9e6e..15cacfb49 100644 --- a/pyload/plugins/hoster/FilebeerInfo.py +++ b/pyload/plugins/hoster/FilebeerInfo.py @@ -9,8 +9,8 @@ class FilebeerInfo(DeadHoster): __pattern__ = r"http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+).*" __version__ = "0.03" __description__ = """Filebeer.info plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(FilebeerInfo) diff --git a/pyload/plugins/hoster/FilecloudIo.py b/pyload/plugins/hoster/FilecloudIo.py index c7684a05d..26e421b06 100644 --- a/pyload/plugins/hoster/FilecloudIo.py +++ b/pyload/plugins/hoster/FilecloudIo.py @@ -29,6 +29,7 @@ class FilecloudIo(SimpleHoster): __version__ = "0.02" __description__ = """Filecloud.io (formerly Ifile.it) plugin - free account only""" __author_name__ = ("zoidberg", "stickell") + __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") FILE_SIZE_PATTERN = r'{var __ab1 = (?P<S>\d+);}' FILE_NAME_PATTERN = r'id="aliasSpan">(?P<N>.*?) <' diff --git a/pyload/plugins/hoster/FilefactoryCom.py b/pyload/plugins/hoster/FilefactoryCom.py index 37987059b..14caba01c 100644 --- a/pyload/plugins/hoster/FilefactoryCom.py +++ b/pyload/plugins/hoster/FilefactoryCom.py @@ -26,8 +26,8 @@ class FilefactoryCom(SimpleHoster): __pattern__ = r"https?://(?:www\.)?filefactory\.com/file/(?P<id>[a-zA-Z0-9]+)" __version__ = "0.47" __description__ = """Filefactory.Com File Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r'<div id="file_name"[^>]*>\s*<h2>(?P<N>[^<]+)</h2>\s*<div id="file_info">\s*(?P<S>[\d.]+) (?P<U>\w+) uploaded' DIRECT_LINK_PATTERN = r'<a href="(https?://[^"]+)"[^>]*><i[^>]*></i> Download with FileFactory Premium</a>' diff --git a/pyload/plugins/hoster/FilejungleCom.py b/pyload/plugins/hoster/FilejungleCom.py index 0fb0b6150..e8857257a 100644 --- a/pyload/plugins/hoster/FilejungleCom.py +++ b/pyload/plugins/hoster/FilejungleCom.py @@ -26,8 +26,8 @@ class FilejungleCom(FileserveCom): __pattern__ = r"http://(?:www\.)?filejungle\.com/f/(?P<id>[^/]+).*" __version__ = "0.51" __description__ = """Filejungle.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" URLS = ['http://www.filejungle.com/f/', 'http://www.filejungle.com/check_links.php', 'http://www.filejungle.com/checkReCaptcha.php'] diff --git a/pyload/plugins/hoster/FilepostCom.py b/pyload/plugins/hoster/FilepostCom.py index 0c3cb925b..b7a7e1d50 100644 --- a/pyload/plugins/hoster/FilepostCom.py +++ b/pyload/plugins/hoster/FilepostCom.py @@ -35,8 +35,8 @@ class FilepostCom(SimpleHoster): __pattern__ = r"https?://(?:www\.)?(?:filepost\.com/files|fp.io)/([^/]+).*" __version__ = "0.27" __description__ = """Filepost.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'<input type="text" id="url" value=\'<a href[^>]*>(?P<N>[^>]+?) - (?P<S>[0-9\.]+ [kKMG]i?B)</a>\' class="inp_text"/>' #FILE_INFO_PATTERN = r'<h1>(?P<N>[^<]+)</h1>\s*<div class="ul">\s*<ul>\s*<li><span>Size:</span> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B</li>' diff --git a/pyload/plugins/hoster/FilerNet.py b/pyload/plugins/hoster/FilerNet.py index 609fa15e9..62ae81862 100644 --- a/pyload/plugins/hoster/FilerNet.py +++ b/pyload/plugins/hoster/FilerNet.py @@ -33,8 +33,8 @@ class FilerNet(SimpleHoster): __pattern__ = r"https?://(www\.)?filer\.net/get/(\w+)" __version__ = "0.03" __description__ = """Filer.net Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r'<h1 class="page-header">Free Download (?P<N>\S+) <small>(?P<S>[\w.]+) (?P<U>\w+)</small></h1>' FILE_OFFLINE_PATTERN = r'Nicht gefunden' diff --git a/pyload/plugins/hoster/FilerioCom.py b/pyload/plugins/hoster/FilerioCom.py index 7adffc4ed..bfed700ad 100644 --- a/pyload/plugins/hoster/FilerioCom.py +++ b/pyload/plugins/hoster/FilerioCom.py @@ -8,8 +8,8 @@ class FilerioCom(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*(filerio\.(in|com)|filekeen\.com)/\w{12}" __version__ = "0.02" __description__ = """FileRio.in hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_OFFLINE_PATTERN = '<b>"File Not Found"</b>|File has been removed due to Copyright Claim' HOSTER_NAME = "filerio.in" diff --git a/pyload/plugins/hoster/FilesMailRu.py b/pyload/plugins/hoster/FilesMailRu.py index 2b87c309e..04ca2926c 100644 --- a/pyload/plugins/hoster/FilesMailRu.py +++ b/pyload/plugins/hoster/FilesMailRu.py @@ -35,8 +35,8 @@ class FilesMailRu(Hoster): __pattern__ = r"http://files\.mail\.ru/.*" __version__ = "0.31" __description__ = """Files.Mail.Ru One-Klick Hoster""" - __author_name__ = ("oZiRiz") - __author_mail__ = ("ich@oziriz.de") + __author_name__ = "oZiRiz" + __author_mail__ = "ich@oziriz.de" def setup(self): if not self.account: diff --git a/pyload/plugins/hoster/FileserveCom.py b/pyload/plugins/hoster/FileserveCom.py index a9ff24d19..b75b13841 100644 --- a/pyload/plugins/hoster/FileserveCom.py +++ b/pyload/plugins/hoster/FileserveCom.py @@ -48,7 +48,7 @@ class FileserveCom(Hoster): __pattern__ = r"http://(?:www\.)?fileserve\.com/file/(?P<id>[^/]+).*" __version__ = "0.51" __description__ = """Fileserve.Com File Download Hoster""" - __author_name__ = ("jeix", "mkaay", "paul king", "zoidberg") + __author_name__ = ("jeix", "mkaay", "Paul King", "zoidberg") __author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "", "zoidberg@mujmail.cz") URLS = ['http://www.fileserve.com/file/', 'http://www.fileserve.com/link-checker.php', diff --git a/pyload/plugins/hoster/FileshareInUa.py b/pyload/plugins/hoster/FileshareInUa.py index 11adc4e9c..5e82057dc 100644 --- a/pyload/plugins/hoster/FileshareInUa.py +++ b/pyload/plugins/hoster/FileshareInUa.py @@ -10,8 +10,8 @@ class FileshareInUa(Hoster): __pattern__ = r"http://(?:\w*\.)*?fileshare.in.ua/[A-Za-z0-9]+" __version__ = "0.01" __description__ = """fileshare.in.ua hoster plugin""" - __author_name__ = ("fwannmacher") - __author_mail__ = ("felipe@warhammerproject.com") + __author_name__ = "fwannmacher" + __author_mail__ = "felipe@warhammerproject.com" HOSTER_NAME = "fileshare.in.ua" PATTERN_FILENAME = r'<h3 class="b-filename">(.*?)</h3>' diff --git a/pyload/plugins/hoster/FreevideoCz.py b/pyload/plugins/hoster/FreevideoCz.py index 3d8921c38..4c97516dc 100644 --- a/pyload/plugins/hoster/FreevideoCz.py +++ b/pyload/plugins/hoster/FreevideoCz.py @@ -41,7 +41,8 @@ class FreevideoCz(Hoster): __pattern__ = r"http://www.freevideo.cz/vase-videa/(.*)\.html" __version__ = "0.2" __description__ = """freevideo.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" URL_PATTERN = r'clip: {\s*url: "([^"]+)"' FILE_OFFLINE_PATTERN = r'<h2 class="red-corner-full">Str.nka nebyla nalezena</h2>' diff --git a/pyload/plugins/hoster/FshareVn.py b/pyload/plugins/hoster/FshareVn.py index fa0bcb253..cde3c3408 100644 --- a/pyload/plugins/hoster/FshareVn.py +++ b/pyload/plugins/hoster/FshareVn.py @@ -30,8 +30,8 @@ class FshareVn(SimpleHoster): __pattern__ = r"http://(www\.)?fshare.vn/file/.*" __version__ = "0.16" __description__ = """FshareVn Download Hoster""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[0-9,.]+)\s*(?P<U>[kKMG])i?B<\\/p>' FILE_OFFLINE_PATTERN = r'<div class=\\"f_left file_w\\"|<\\/p>\\t\\t\\t\\t\\r\\n\\t\\t<p><\\/p>\\t\\t\\r\\n\\t\\t<p>0 KB<\\/p>' diff --git a/pyload/plugins/hoster/GamefrontCom.py b/pyload/plugins/hoster/GamefrontCom.py index c82cfdf50..71f5b4eb9 100644 --- a/pyload/plugins/hoster/GamefrontCom.py +++ b/pyload/plugins/hoster/GamefrontCom.py @@ -10,8 +10,8 @@ class GamefrontCom(Hoster): __pattern__ = r"http://(?:\w*\.)*?gamefront.com/files/[A-Za-z0-9]+" __version__ = "0.04" __description__ = """gamefront.com hoster plugin""" - __author_name__ = ("fwannmacher") - __author_mail__ = ("felipe@warhammerproject.com") + __author_name__ = "fwannmacher" + __author_mail__ = "felipe@warhammerproject.com" HOSTER_NAME = "gamefront.com" PATTERN_FILENAME = r'<title>(.*?) | Game Front' diff --git a/pyload/plugins/hoster/GigapetaCom.py b/pyload/plugins/hoster/GigapetaCom.py index de5d94513..1c6200f62 100644 --- a/pyload/plugins/hoster/GigapetaCom.py +++ b/pyload/plugins/hoster/GigapetaCom.py @@ -29,8 +29,8 @@ class GigapetaCom(SimpleHoster): __pattern__ = r"http://(?:www\.)?gigapeta\.com/dl/\w+" __version__ = "0.01" __description__ = """GigaPeta.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" SH_COOKIES = [("http://gigapeta.com", "lang", "us")] FILE_NAME_PATTERN = r'<img src=".*" alt="file" />-->\s*(?P<N>.*?)\s*</td>' diff --git a/pyload/plugins/hoster/GooIm.py b/pyload/plugins/hoster/GooIm.py index f96e6e6cc..f0051b082 100644 --- a/pyload/plugins/hoster/GooIm.py +++ b/pyload/plugins/hoster/GooIm.py @@ -26,8 +26,8 @@ class GooIm(SimpleHoster): __pattern__ = r"http://(?:www\.)?goo\.im/.+" __version__ = "0.02" __description__ = """Goo.im hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_NAME_PATTERN = r'<h3>Filename: (?P<N>.+)</h3>' FILE_OFFLINE_PATTERN = r'The file you requested was not found' diff --git a/pyload/plugins/hoster/HellshareCz.py b/pyload/plugins/hoster/HellshareCz.py index 5fdcca7ae..84b359695 100644 --- a/pyload/plugins/hoster/HellshareCz.py +++ b/pyload/plugins/hoster/HellshareCz.py @@ -26,7 +26,8 @@ class HellshareCz(SimpleHoster): __pattern__ = r"(http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+).*" __version__ = "0.82" __description__ = """Hellshare.cz - premium only""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>' FILE_SIZE_PATTERN = r'<strong id="FileSize_master">(?P<S>[0-9.]*) (?P<U>[kKMG])i?B</strong>' diff --git a/pyload/plugins/hoster/HellspyCz.py b/pyload/plugins/hoster/HellspyCz.py index 1bb595599..077d1debb 100644 --- a/pyload/plugins/hoster/HellspyCz.py +++ b/pyload/plugins/hoster/HellspyCz.py @@ -25,8 +25,8 @@ class HellspyCz(DeadHoster): __pattern__ = r"http://(?:\w*\.)*(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj.pl)(/\S+/\d+)/?.*" __version__ = "0.28" __description__ = """HellSpy.cz""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(HellspyCz) diff --git a/pyload/plugins/hoster/HugefilesNet.py b/pyload/plugins/hoster/HugefilesNet.py index 8f13f2bc9..6c3822860 100644 --- a/pyload/plugins/hoster/HugefilesNet.py +++ b/pyload/plugins/hoster/HugefilesNet.py @@ -27,8 +27,8 @@ class HugefilesNet(XFileSharingPro): __pattern__ = r"http://(www\.)?hugefiles\.net/\w{12}" __version__ = "0.01" __description__ = """Hugefiles.net hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" HOSTER_NAME = "hugefiles.net" diff --git a/pyload/plugins/hoster/HundredEightyUploadCom.py b/pyload/plugins/hoster/HundredEightyUploadCom.py index 3cf32d338..9b4fb96f7 100644 --- a/pyload/plugins/hoster/HundredEightyUploadCom.py +++ b/pyload/plugins/hoster/HundredEightyUploadCom.py @@ -27,8 +27,8 @@ class HundredEightyUploadCom(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)?180upload\.com/(\w+).*" __version__ = "0.01" __description__ = """180upload.com hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>.+)</td></tr>-->' FILE_SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.]+) (?P<U>[A-Z]+)\s*<small>' diff --git a/pyload/plugins/hoster/IFileWs.py b/pyload/plugins/hoster/IFileWs.py index 160fe641c..3aa369aec 100644 --- a/pyload/plugins/hoster/IFileWs.py +++ b/pyload/plugins/hoster/IFileWs.py @@ -8,8 +8,8 @@ class IFileWs(XFileSharingPro): __pattern__ = r"http://(www\.)?ifile\.ws/\w+(/.+)?" __version__ = "0.01" __description__ = """Ifile.ws hoster plugin""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" FILE_INFO_PATTERN = '<h1\s+style="display:inline;">(?P<N>[^<]+)</h1>\s+\[(?P<S>[^]]+)\]' FILE_OFFLINE_PATTERN = 'File Not Found|The file was removed by administrator' diff --git a/pyload/plugins/hoster/IcyFilesCom.py b/pyload/plugins/hoster/IcyFilesCom.py index d0b101717..a42cc8b9a 100644 --- a/pyload/plugins/hoster/IcyFilesCom.py +++ b/pyload/plugins/hoster/IcyFilesCom.py @@ -25,8 +25,8 @@ class IcyFilesCom(DeadHoster): __pattern__ = r"http://(?:www\.)?icyfiles\.com/(.*)" __version__ = "0.06" __description__ = """IcyFiles.com plugin - free only""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" getInfo = create_getInfo(IcyFilesCom) diff --git a/pyload/plugins/hoster/IfileIt.py b/pyload/plugins/hoster/IfileIt.py index 0e3bdd227..b14aab4c8 100644 --- a/pyload/plugins/hoster/IfileIt.py +++ b/pyload/plugins/hoster/IfileIt.py @@ -28,7 +28,8 @@ class IfileIt(SimpleHoster): __pattern__ = r"^unmatchable$" __version__ = "0.27" __description__ = """Ifile.it""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" #EVAL_PATTERN = r'(eval\(function\(p,a,c,k,e,d\).*)' #DEC_PATTERN = r"requestBtn_clickEvent[^}]*url:\s*([^,]+)" diff --git a/pyload/plugins/hoster/IfolderRu.py b/pyload/plugins/hoster/IfolderRu.py index 14e568f8f..2c8014230 100644 --- a/pyload/plugins/hoster/IfolderRu.py +++ b/pyload/plugins/hoster/IfolderRu.py @@ -26,8 +26,8 @@ class IfolderRu(SimpleHoster): __pattern__ = r"http://(?:[^.]*\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+).*" __version__ = "0.38" __description__ = """rusfolder.com / ifolder.ru""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_SIZE_REPLACEMENTS = [(u'Кб', 'KB'), (u'Мб', 'MB'), (u'Гб', 'GB')] FILE_NAME_PATTERN = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>' diff --git a/pyload/plugins/hoster/JumbofilesCom.py b/pyload/plugins/hoster/JumbofilesCom.py index 1b8a2d73b..b976c2aa1 100644 --- a/pyload/plugins/hoster/JumbofilesCom.py +++ b/pyload/plugins/hoster/JumbofilesCom.py @@ -9,8 +9,8 @@ class JumbofilesCom(SimpleHoster): __pattern__ = r"http://(?:\w*\.)*jumbofiles.com/(\w{12}).*" __version__ = "0.02" __description__ = """JumboFiles.com hoster plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" FILE_INFO_PATTERN = '<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.]+)\s*(?P<U>[KMG][bB])\)</small></TD></TR>' FILE_OFFLINE_PATTERN = 'Not Found or Deleted / Disabled due to inactivity or DMCA' diff --git a/pyload/plugins/hoster/Keep2shareCC.py b/pyload/plugins/hoster/Keep2shareCC.py index 59308690c..67175b7ab 100644 --- a/pyload/plugins/hoster/Keep2shareCC.py +++ b/pyload/plugins/hoster/Keep2shareCC.py @@ -31,8 +31,8 @@ class Keep2shareCC(SimpleHoster): __pattern__ = r"https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)" __version__ = "0.10" __description__ = """Keep2share.cc hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_NAME_PATTERN = r'File: <span>(?P<N>.+)</span>' FILE_SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>' diff --git a/pyload/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py index 08e44d9f6..3096db1f1 100644 --- a/pyload/plugins/hoster/LuckyShareNet.py +++ b/pyload/plugins/hoster/LuckyShareNet.py @@ -13,8 +13,8 @@ class LuckyShareNet(SimpleHoster): __pattern__ = r"https?://(www\.)?luckyshare.net/(?P<ID>\d{10,})" __version__ = "0.02" __description__ = """LuckyShare.net Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r"<h1 class='file_name'>(?P<N>\S+)</h1>\s*<span class='file_size'>Filesize: (?P<S>[\d.]+)(?P<U>\w+)</span>" FILE_OFFLINE_PATTERN = 'There is no such file available' diff --git a/pyload/plugins/hoster/MegasharesCom.py b/pyload/plugins/hoster/MegasharesCom.py index 26cf8ab8e..a0aebe7c6 100644 --- a/pyload/plugins/hoster/MegasharesCom.py +++ b/pyload/plugins/hoster/MegasharesCom.py @@ -27,8 +27,8 @@ class MegasharesCom(SimpleHoster): __pattern__ = r"http://(\w+\.)?megashares.com/.*" __version__ = "0.24" __description__ = """megashares.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = '<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">' FILE_SIZE_PATTERN = '<strong><span class="black">Filesize:</span></strong> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B<br />' diff --git a/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py index 5d8754ee7..d100a6c66 100644 --- a/pyload/plugins/hoster/MovReelCom.py +++ b/pyload/plugins/hoster/MovReelCom.py @@ -9,8 +9,8 @@ class MovReelCom(XFileSharingPro): __pattern__ = r"http://movreel.com/.*" __version__ = "1.20" __description__ = """MovReel.com hoster plugin""" - __author_name__ = ("JorisV83") - __author_mail__ = ("jorisv83-pyload@yahoo.com") + __author_name__ = "JorisV83" + __author_mail__ = "jorisv83-pyload@yahoo.com" #FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>' #FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>' diff --git a/pyload/plugins/hoster/MultiDebridCom.py b/pyload/plugins/hoster/MultiDebridCom.py index e38a16cbb..7598be3fc 100644 --- a/pyload/plugins/hoster/MultiDebridCom.py +++ b/pyload/plugins/hoster/MultiDebridCom.py @@ -32,8 +32,8 @@ class MultiDebridCom(Hoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __pattern__ = r"http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/" __description__ = """Multi-debrid.com hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def setup(self): self.chunkLimit = -1 diff --git a/pyload/plugins/hoster/MultishareCz.py b/pyload/plugins/hoster/MultishareCz.py index f9289a923..598e17c03 100644 --- a/pyload/plugins/hoster/MultishareCz.py +++ b/pyload/plugins/hoster/MultishareCz.py @@ -27,7 +27,8 @@ class MultishareCz(SimpleHoster): __pattern__ = r"http://(?:\w*\.)?multishare.cz/stahnout/(?P<ID>\d+).*" __version__ = "0.34" __description__ = """MultiShare.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = ur'(?:<li>Název|Soubor): <strong>(?P<N>[^<]+)</strong><(?:/li><li|br)>Velikost: <strong>(?P<S>[^<]+)</strong>' FILE_OFFLINE_PATTERN = ur'<h1>Stáhnout soubor</h1><p><strong>Požadovaný soubor neexistuje.</strong></p>' diff --git a/pyload/plugins/hoster/MyvideoDe.py b/pyload/plugins/hoster/MyvideoDe.py index 1bd73e376..f858e7313 100644 --- a/pyload/plugins/hoster/MyvideoDe.py +++ b/pyload/plugins/hoster/MyvideoDe.py @@ -11,8 +11,8 @@ class MyvideoDe(Hoster): __pattern__ = r"http://(www\.)?myvideo.de/watch/" __version__ = "0.9" __description__ = """Myvideo.de Video Download Hoster""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" def process(self, pyfile): self.pyfile = pyfile diff --git a/pyload/plugins/hoster/NarodRu.py b/pyload/plugins/hoster/NarodRu.py index 590268910..771c15865 100644 --- a/pyload/plugins/hoster/NarodRu.py +++ b/pyload/plugins/hoster/NarodRu.py @@ -27,7 +27,8 @@ class NarodRu(SimpleHoster): __pattern__ = r"http://(www\.)?narod(\.yandex)?\.ru/(disk|start/[0-9]+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+" __version__ = "0.1" __description__ = """Narod.ru""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<dt class="name">(?:<[^<]*>)*(?P<N>[^<]+)</dt>' FILE_SIZE_PATTERN = r'<dd class="size">(?P<S>\d[^<]*)</dd>' diff --git a/pyload/plugins/hoster/NowDownloadEu.py b/pyload/plugins/hoster/NowDownloadEu.py index fb00e933e..24d8f3f1c 100644 --- a/pyload/plugins/hoster/NowDownloadEu.py +++ b/pyload/plugins/hoster/NowDownloadEu.py @@ -28,7 +28,7 @@ class NowDownloadEu(SimpleHoster): __version__ = "0.05" __description__ = """NowDownloadCh""" __author_name__ = ("godofdream", "Walter Purcaro") - __author_mail__ = ("", "vuolter@gmail.com") + __author_mail__ = ("soilfiction@gmail.com", "vuolter@gmail.com") FILE_INFO_PATTERN = r'Downloading</span> <br> (?P<N>.*) (?P<S>[0-9,.]+) (?P<U>[kKMG])i?B </h4>' FILE_OFFLINE_PATTERN = r'(This file does not exist!)' diff --git a/pyload/plugins/hoster/PornhostCom.py b/pyload/plugins/hoster/PornhostCom.py index 1d340694b..a3ef6a427 100644 --- a/pyload/plugins/hoster/PornhostCom.py +++ b/pyload/plugins/hoster/PornhostCom.py @@ -11,8 +11,8 @@ class PornhostCom(Hoster): __pattern__ = r'http://[\w\.]*?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)' __version__ = "0.2" __description__ = """Pornhost.com Download Hoster""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.de") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.de" def process(self, pyfile): self.download_html() diff --git a/pyload/plugins/hoster/PornhubCom.py b/pyload/plugins/hoster/PornhubCom.py index 7bbb8d919..56f5ede2a 100644 --- a/pyload/plugins/hoster/PornhubCom.py +++ b/pyload/plugins/hoster/PornhubCom.py @@ -11,8 +11,8 @@ class PornhubCom(Hoster): __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+' __version__ = "0.5" __description__ = """Pornhub.com Download Hoster""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.de") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.de" def process(self, pyfile): self.download_html() diff --git a/pyload/plugins/hoster/PremiumizeMe.py b/pyload/plugins/hoster/PremiumizeMe.py index c5c09857f..2a5dac0b4 100644 --- a/pyload/plugins/hoster/PremiumizeMe.py +++ b/pyload/plugins/hoster/PremiumizeMe.py @@ -13,8 +13,8 @@ class PremiumizeMe(Hoster): # create the regex patterns for us using getHosters in our PremiumizeMe hook. __pattern__ = None - __author_name__ = ("Florian Franzen") - __author_mail__ = ("FlorianFranzen@gmail.com") + __author_name__ = "Florian Franzen" + __author_mail__ = "FlorianFranzen@gmail.com" def process(self, pyfile): # Check account diff --git a/pyload/plugins/hoster/QuickshareCz.py b/pyload/plugins/hoster/QuickshareCz.py index a781d7eff..14f8a0f53 100644 --- a/pyload/plugins/hoster/QuickshareCz.py +++ b/pyload/plugins/hoster/QuickshareCz.py @@ -28,7 +28,8 @@ class QuickshareCz(SimpleHoster): __pattern__ = r"http://.*quickshare.cz/stahnout-soubor/.*" __version__ = "0.54" __description__ = """Quickshare.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<th width="145px">Název:</th>\s*<td style="word-wrap:break-word;">(?P<N>[^<]+)</td>' FILE_SIZE_PATTERN = r'<th>Velikost:</th>\s*<td>(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</td>' diff --git a/pyload/plugins/hoster/RPNetBiz.py b/pyload/plugins/hoster/RPNetBiz.py index ae8ccf8a9..5462b1e47 100644 --- a/pyload/plugins/hoster/RPNetBiz.py +++ b/pyload/plugins/hoster/RPNetBiz.py @@ -10,8 +10,8 @@ class RPNetBiz(Hoster): __type__ = "hoster" __description__ = """RPNet.Biz hoster plugin""" __pattern__ = r"https?://.*rpnet\.biz" - __author_name__ = ("Dman") - __author_mail__ = ("dmanugm@gmail.com") + __author_name__ = "Dman" + __author_mail__ = "dmanugm@gmail.com" def setup(self): self.chunkLimit = -1 diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py index 1ede51953..aff92f799 100644 --- a/pyload/plugins/hoster/RarefileNet.py +++ b/pyload/plugins/hoster/RarefileNet.py @@ -12,8 +12,8 @@ class RarefileNet(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*rarefile.net/\w{12}" __version__ = "0.03" __description__ = """Rarefile.net hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<td><font color="red">(?P<N>.*?)</font></td>' FILE_SIZE_PATTERN = r'<td>Size : (?P<S>.+?) ' diff --git a/pyload/plugins/hoster/RealdebridCom.py b/pyload/plugins/hoster/RealdebridCom.py index 40ee96df9..73be32e70 100644 --- a/pyload/plugins/hoster/RealdebridCom.py +++ b/pyload/plugins/hoster/RealdebridCom.py @@ -18,8 +18,8 @@ class RealdebridCom(Hoster): __pattern__ = r"https?://.*real-debrid\..*" __description__ = """Real-Debrid.com hoster plugin""" - __author_name__ = ("Devirex, Hazzard") - __author_mail__ = ("naibaf_11@yahoo.de") + __author_name__ = "Devirex Hazzard" + __author_mail__ = "naibaf_11@yahoo.de" def getFilename(self, url): try: diff --git a/pyload/plugins/hoster/RedtubeCom.py b/pyload/plugins/hoster/RedtubeCom.py index caf33eeac..3c341e997 100644 --- a/pyload/plugins/hoster/RedtubeCom.py +++ b/pyload/plugins/hoster/RedtubeCom.py @@ -12,8 +12,8 @@ class RedtubeCom(Hoster): __pattern__ = r'http://[\w\.]*?redtube\.com/\d+' __version__ = "0.2" __description__ = """Redtube.com Download Hoster""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.de") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.de" def process(self, pyfile): self.download_html() diff --git a/pyload/plugins/hoster/RehostTo.py b/pyload/plugins/hoster/RehostTo.py index bb6110415..595f87e6f 100644 --- a/pyload/plugins/hoster/RehostTo.py +++ b/pyload/plugins/hoster/RehostTo.py @@ -11,8 +11,8 @@ class RehostTo(Hoster): __type__ = "hoster" __pattern__ = r"https?://.*rehost.to\..*" __description__ = """rehost.com hoster plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def getFilename(self, url): return unquote(url.rsplit("/", 1)[1]) diff --git a/pyload/plugins/hoster/ReloadCc.py b/pyload/plugins/hoster/ReloadCc.py index 2295c792a..cae72bb1c 100644 --- a/pyload/plugins/hoster/ReloadCc.py +++ b/pyload/plugins/hoster/ReloadCc.py @@ -15,8 +15,8 @@ class ReloadCc(Hoster): # create the regex patterns for us using getHosters in our ReloadCc hook. __pattern__ = None - __author_name__ = ("Reload Team") - __author_mail__ = ("hello@reload.cc") + __author_name__ = "Reload Team" + __author_mail__ = "hello@reload.cc" def process(self, pyfile): # Check account diff --git a/pyload/plugins/hoster/RgHostNet.py b/pyload/plugins/hoster/RgHostNet.py index a46b51733..227dbbb2d 100644 --- a/pyload/plugins/hoster/RgHostNet.py +++ b/pyload/plugins/hoster/RgHostNet.py @@ -11,8 +11,8 @@ class RgHostNet(SimpleHoster): __pattern__ = r"http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?" __version__ = "0.01" __description__ = """RgHost.net Download Hoster""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" FILE_INFO_PATTERN = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>' FILE_OFFLINE_PATTERN = r'File is deleted|this page is not found' diff --git a/pyload/plugins/hoster/SecureUploadEu.py b/pyload/plugins/hoster/SecureUploadEu.py index dc220c508..c4386af16 100644 --- a/pyload/plugins/hoster/SecureUploadEu.py +++ b/pyload/plugins/hoster/SecureUploadEu.py @@ -8,8 +8,8 @@ class SecureUploadEu(XFileSharingPro): __pattern__ = r"http://(www\.)?secureupload\.eu/(\w){12}(/\w+)" __version__ = "0.01" __description__ = """SecureUpload.eu hoster plugin""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" HOSTER_NAME = "secureupload.eu" FILE_INFO_PATTERN = '<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>' diff --git a/pyload/plugins/hoster/SendmywayCom.py b/pyload/plugins/hoster/SendmywayCom.py index 9b4fc14bc..595a6860c 100644 --- a/pyload/plugins/hoster/SendmywayCom.py +++ b/pyload/plugins/hoster/SendmywayCom.py @@ -8,8 +8,8 @@ class SendmywayCom(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*?sendmyway.com/\w{12}" __version__ = "0.01" __description__ = """SendMyWay hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<p class="file-name" ><.*?>\s*(?P<N>.+)' FILE_SIZE_PATTERN = r'<small>\((?P<S>\d+) bytes\)</small>' diff --git a/pyload/plugins/hoster/SendspaceCom.py b/pyload/plugins/hoster/SendspaceCom.py index 729ee17bc..22b3a8ebe 100644 --- a/pyload/plugins/hoster/SendspaceCom.py +++ b/pyload/plugins/hoster/SendspaceCom.py @@ -26,7 +26,8 @@ class SendspaceCom(SimpleHoster): __pattern__ = r"http://(www\.)?sendspace.com/file/.*" __version__ = "0.13" __description__ = """sendspace.com plugin - free only""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" DOWNLOAD_URL_PATTERN = r'<a id="download_button" href="([^"]+)"' FILE_NAME_PATTERN = r'<h2 class="bgray">\s*<(?:b|strong)>(?P<N>[^<]+)</' diff --git a/pyload/plugins/hoster/Share4webCom.py b/pyload/plugins/hoster/Share4webCom.py index ead808024..df927f823 100644 --- a/pyload/plugins/hoster/Share4webCom.py +++ b/pyload/plugins/hoster/Share4webCom.py @@ -10,7 +10,8 @@ class Share4webCom(UnibytesCom): __pattern__ = r"http://(www\.)?share4web\.com/get/\w+" __version__ = "0.1" __description__ = """Share4web.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" DOMAIN = 'http://www.share4web.com' diff --git a/pyload/plugins/hoster/Share76Com.py b/pyload/plugins/hoster/Share76Com.py index 81a169527..583eddbd0 100644 --- a/pyload/plugins/hoster/Share76Com.py +++ b/pyload/plugins/hoster/Share76Com.py @@ -9,7 +9,8 @@ class Share76Com(DeadHoster): __pattern__ = r"http://(?:\w*\.)*?share76.com/\w{12}" __version__ = "0.04" __description__ = """share76.com hoster plugin""" - __author_name__ = ("me") + __author_name__ = "me" + __author_mail__ = "" getInfo = create_getInfo(Share76Com) diff --git a/pyload/plugins/hoster/ShareRapidCom.py b/pyload/plugins/hoster/ShareRapidCom.py index 82f98d73c..a48f960cb 100644 --- a/pyload/plugins/hoster/ShareRapidCom.py +++ b/pyload/plugins/hoster/ShareRapidCom.py @@ -27,7 +27,7 @@ class ShareRapidCom(SimpleHoster): __version__ = "0.53" __description__ = """Share-rapid.com plugin - premium only""" __author_name__ = ("MikyWoW", "zoidberg", "stickell") - __author_mail__ = ("MikyWoW@seznam.cz", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") FILE_NAME_PATTERN = r'<h1[^>]*><span[^>]*>(?:<a[^>]*>)?(?P<N>[^<]+)' FILE_SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong></td>' diff --git a/pyload/plugins/hoster/SharebeesCom.py b/pyload/plugins/hoster/SharebeesCom.py index 5eaaf24f5..9530328d4 100644 --- a/pyload/plugins/hoster/SharebeesCom.py +++ b/pyload/plugins/hoster/SharebeesCom.py @@ -9,8 +9,8 @@ class SharebeesCom(DeadHoster): __pattern__ = r"http://(?:\w*\.)*?sharebees.com/\w{12}" __version__ = "0.02" __description__ = """ShareBees hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(SharebeesCom) diff --git a/pyload/plugins/hoster/ShareplaceCom.py b/pyload/plugins/hoster/ShareplaceCom.py index e51c3160f..38754fc52 100644 --- a/pyload/plugins/hoster/ShareplaceCom.py +++ b/pyload/plugins/hoster/ShareplaceCom.py @@ -12,8 +12,8 @@ class ShareplaceCom(Hoster): __pattern__ = r"(http://)?(www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+" __version__ = "0.11" __description__ = """Shareplace.com Download Hoster""" - __author_name__ = ("ACCakut, based on YourfilesTo by jeix and skydancer") - __author_mail__ = ("none") + __author_name__ = "ACCakut" + __author_mail__ = "" def process(self, pyfile): self.pyfile = pyfile diff --git a/pyload/plugins/hoster/SimplydebridCom.py b/pyload/plugins/hoster/SimplydebridCom.py index 67cc39255..106a25336 100644 --- a/pyload/plugins/hoster/SimplydebridCom.py +++ b/pyload/plugins/hoster/SimplydebridCom.py @@ -13,8 +13,8 @@ class SimplydebridCom(Hoster): __type__ = "hoster" __pattern__ = r"http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd.php/*" __description__ = """simply-debrid.com hoster plugin""" - __author_name__ = ("Kagenoshin") - __author_mail__ = ("kagenoshin@gmx.ch") + __author_name__ = "Kagenoshin" + __author_mail__ = "kagenoshin@gmx.ch" def setup(self): self.resumeDownload = self.multiDL = True diff --git a/pyload/plugins/hoster/SockshareCom.py b/pyload/plugins/hoster/SockshareCom.py index fd0e5aa91..923999ca9 100644 --- a/pyload/plugins/hoster/SockshareCom.py +++ b/pyload/plugins/hoster/SockshareCom.py @@ -30,7 +30,7 @@ class SockshareCom(SimpleHoster): __version__ = "0.02" __description__ = """Sockshare.com hoster plugin""" __author_name__ = ("jeix", "stickell", "Walter Purcaro") - __author_mail__ = ("", "l.stickell@yahoo.it", "vuolter@gmail.com") + __author_mail__ = ("jeix@hasnomail.de", "l.stickell@yahoo.it", "vuolter@gmail.com") FILE_INFO_PATTERN = r'site-content">\s*<h1>(?P<N>.+)<strong>\( (?P<S>[^)]+) \)</strong></h1>' FILE_OFFLINE_PATTERN = r'>This file doesn\'t exist, or has been removed.<' diff --git a/pyload/plugins/hoster/SpeedLoadOrg.py b/pyload/plugins/hoster/SpeedLoadOrg.py index 2360b7773..c0459db45 100644 --- a/pyload/plugins/hoster/SpeedLoadOrg.py +++ b/pyload/plugins/hoster/SpeedLoadOrg.py @@ -9,8 +9,8 @@ class SpeedLoadOrg(DeadHoster): __pattern__ = r"http://(www\.)?speedload\.org/(?P<ID>\w+)" __version__ = "1.02" __description__ = """Speedload.org hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" getInfo = create_getInfo(SpeedLoadOrg) diff --git a/pyload/plugins/hoster/SpeedfileCz.py b/pyload/plugins/hoster/SpeedfileCz.py index b8eaa775c..ebe399843 100644 --- a/pyload/plugins/hoster/SpeedfileCz.py +++ b/pyload/plugins/hoster/SpeedfileCz.py @@ -25,7 +25,8 @@ class SpeedfileCz(DeadHoster): __pattern__ = r"http://speedfile.cz/.*" __version__ = "0.32" __description__ = """speedfile.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(SpeedfileCz) diff --git a/pyload/plugins/hoster/StreamCz.py b/pyload/plugins/hoster/StreamCz.py index a575b205e..b25943218 100644 --- a/pyload/plugins/hoster/StreamCz.py +++ b/pyload/plugins/hoster/StreamCz.py @@ -41,7 +41,8 @@ class StreamCz(Hoster): __pattern__ = r"http://www.stream.cz/[^/]+/\d+.*" __version__ = "0.1" __description__ = """stream.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_OFFLINE_PATTERN = r'<h1 class="commonTitle">Str.nku nebylo mo.n. nal.zt \(404\)</h1>' FILE_NAME_PATTERN = r'<link rel="video_src" href="http://www.stream.cz/\w+/(\d+)-([^"]+)" />' diff --git a/pyload/plugins/hoster/StreamcloudEu.py b/pyload/plugins/hoster/StreamcloudEu.py index dea2781d5..670962ad5 100644 --- a/pyload/plugins/hoster/StreamcloudEu.py +++ b/pyload/plugins/hoster/StreamcloudEu.py @@ -12,8 +12,8 @@ class StreamcloudEu(XFileSharingPro): __pattern__ = r"http://(www\.)?streamcloud\.eu/\S+" __version__ = "0.03" __description__ = """Streamcloud.eu hoster plugin""" - __author_name__ = ("seoester") - __author_mail__ = ("seoester@googlemail.com") + __author_name__ = "seoester" + __author_mail__ = "seoester@googlemail.com" HOSTER_NAME = "streamcloud.eu" DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.(mp4|flv))",' diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py index 78d8b3deb..f33775f80 100644 --- a/pyload/plugins/hoster/TurbobitNet.py +++ b/pyload/plugins/hoster/TurbobitNet.py @@ -38,8 +38,8 @@ class TurbobitNet(SimpleHoster): __pattern__ = r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?!download/folder/)(?:download/free/)?(?P<ID>\w+).*" __version__ = "0.11" __description__ = """Turbobit.net plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" # long filenames are shortened FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>" diff --git a/pyload/plugins/hoster/TurbouploadCom.py b/pyload/plugins/hoster/TurbouploadCom.py index 1c60c2c87..332333ddb 100644 --- a/pyload/plugins/hoster/TurbouploadCom.py +++ b/pyload/plugins/hoster/TurbouploadCom.py @@ -25,8 +25,8 @@ class TurbouploadCom(DeadHoster): __pattern__ = r"http://(?:\w*\.)?turboupload.com/(\w+).*" __version__ = "0.03" __description__ = """turboupload.com""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(TurbouploadCom) diff --git a/pyload/plugins/hoster/TwoSharedCom.py b/pyload/plugins/hoster/TwoSharedCom.py index 5d1cd835b..a8528cf08 100644 --- a/pyload/plugins/hoster/TwoSharedCom.py +++ b/pyload/plugins/hoster/TwoSharedCom.py @@ -12,8 +12,8 @@ class TwoSharedCom(SimpleHoster): __pattern__ = r"http://[\w\.]*?2shared.com/(account/)?(download|get|file|document|photo|video|audio)/.*" __version__ = "0.11" __description__ = """2Shared Download Hoster""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<h1>(?P<N>.*)</h1>' FILE_SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[0-9,.]+) (?P<U>[kKMG])i?B' diff --git a/pyload/plugins/hoster/UlozTo.py b/pyload/plugins/hoster/UlozTo.py index a8c36fec3..3fe7e2dc6 100644 --- a/pyload/plugins/hoster/UlozTo.py +++ b/pyload/plugins/hoster/UlozTo.py @@ -31,7 +31,8 @@ class UlozTo(SimpleHoster): __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)" __version__ = "0.96" __description__ = """uloz.to""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<a href="#download" class="jsShowDownload">(?P<N>[^<]+)</a>' FILE_SIZE_PATTERN = r'<span id="fileSize">.*?(?P<S>[0-9.]+\s[kMG]?B)</span>' diff --git a/pyload/plugins/hoster/UloziskoSk.py b/pyload/plugins/hoster/UloziskoSk.py index 7060dff65..1533abace 100644 --- a/pyload/plugins/hoster/UloziskoSk.py +++ b/pyload/plugins/hoster/UloziskoSk.py @@ -26,7 +26,8 @@ class UloziskoSk(SimpleHoster): __pattern__ = r"http://(\w*\.)?ulozisko.sk/.*" __version__ = "0.23" __description__ = """Ulozisko.sk""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" URL_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">' ID_PATTERN = r'<input type = "hidden" name = "id" value = "([^"]+)" />' diff --git a/pyload/plugins/hoster/UnibytesCom.py b/pyload/plugins/hoster/UnibytesCom.py index d13f01ef3..8153b3e94 100644 --- a/pyload/plugins/hoster/UnibytesCom.py +++ b/pyload/plugins/hoster/UnibytesCom.py @@ -27,7 +27,8 @@ class UnibytesCom(SimpleHoster): __pattern__ = r"http://(www\.)?unibytes\.com/[a-zA-Z0-9-._ ]{11}B" __version__ = "0.1" __description__ = """UniBytes.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'<span[^>]*?id="fileName"[^>]*>(?P<N>[^>]+)</span>\s*\((?P<S>\d.*?)\)' DOMAIN = 'http://www.unibytes.com' diff --git a/pyload/plugins/hoster/UnrestrictLi.py b/pyload/plugins/hoster/UnrestrictLi.py index a3fe5ff5d..bac2ed791 100644 --- a/pyload/plugins/hoster/UnrestrictLi.py +++ b/pyload/plugins/hoster/UnrestrictLi.py @@ -39,8 +39,8 @@ class UnrestrictLi(Hoster): __type__ = "hoster" __pattern__ = r"https?://.*(unrestrict|unr)\.li" __description__ = """Unrestrict.li hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def setup(self): self.chunkLimit = 16 diff --git a/pyload/plugins/hoster/VeehdCom.py b/pyload/plugins/hoster/VeehdCom.py index 3648ef4ec..6e317996e 100644 --- a/pyload/plugins/hoster/VeehdCom.py +++ b/pyload/plugins/hoster/VeehdCom.py @@ -14,8 +14,8 @@ class VeehdCom(Hoster): ] __version__ = '0.23' __description__ = """Veehd.com Download Hoster""" - __author_name__ = ('cat') - __author_mail__ = ('cat@pyload') + __author_name__ = "cat" + __author_mail__ = "cat@pyload" def _debug(self, msg): self.logDebug('[%s] %s' % (self.__name__, msg)) diff --git a/pyload/plugins/hoster/WarserverCz.py b/pyload/plugins/hoster/WarserverCz.py index ee580fbdd..b0235f4ad 100644 --- a/pyload/plugins/hoster/WarserverCz.py +++ b/pyload/plugins/hoster/WarserverCz.py @@ -30,7 +30,8 @@ class WarserverCz(SimpleHoster): __pattern__ = r"http://(?:\w*\.)?warserver.cz/stahnout/(?P<ID>\d+)/.+" __version__ = "0.12" __description__ = """Warserver.cz""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'<h1.*?>(?P<N>[^<]+)</h1>' FILE_SIZE_PATTERN = r'<li>Velikost: <strong>(?P<S>[^<]+)</strong>' diff --git a/pyload/plugins/hoster/WebshareCz.py b/pyload/plugins/hoster/WebshareCz.py index 1a3aabaaa..c06bce016 100644 --- a/pyload/plugins/hoster/WebshareCz.py +++ b/pyload/plugins/hoster/WebshareCz.py @@ -42,8 +42,8 @@ class WebshareCz(SimpleHoster): __pattern__ = r"https?://(?:www\.)?webshare.cz/(?:#/)?file/(?P<ID>\w+)" __version__ = "0.13" __description__ = """WebShare.cz hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def handleFree(self): api_data = self.load('https://webshare.cz/api/file_link/', post={'ident': self.fid}) diff --git a/pyload/plugins/hoster/WrzucTo.py b/pyload/plugins/hoster/WrzucTo.py index 861e7f11e..878a47da4 100644 --- a/pyload/plugins/hoster/WrzucTo.py +++ b/pyload/plugins/hoster/WrzucTo.py @@ -28,8 +28,8 @@ class WrzucTo(SimpleHoster): __pattern__ = r"http://(?:\w+\.)*?wrzuc\.to/([a-zA-Z0-9]+(\.wt|\.html)|(\w+/?linki/[a-zA-Z0-9]+))" __version__ = "0.01" __description__ = """Wrzuc.to plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" SH_COOKIES = [("http://www.wrzuc.to", "language", "en")] FILE_SIZE_PATTERN = r'class="info">\s*<tr>\s*<td>(?P<S>.*?)</td>' diff --git a/pyload/plugins/hoster/WuploadCom.py b/pyload/plugins/hoster/WuploadCom.py index 68e83e228..e4c6737d6 100644 --- a/pyload/plugins/hoster/WuploadCom.py +++ b/pyload/plugins/hoster/WuploadCom.py @@ -10,7 +10,7 @@ class WuploadCom(DeadHoster): __pattern__ = r"http://[\w\.]*?wupload\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?" __version__ = "0.23" __description__ = """Wupload com""" - __author_name__ = ("jeix", "paulking") + __author_name__ = ("jeix", "Paul King") __author_mail__ = ("jeix@hasnomail.de", "") diff --git a/pyload/plugins/hoster/X7To.py b/pyload/plugins/hoster/X7To.py index 950cbd164..7c59ac94d 100644 --- a/pyload/plugins/hoster/X7To.py +++ b/pyload/plugins/hoster/X7To.py @@ -9,8 +9,8 @@ class X7To(DeadHoster): __pattern__ = r"http://(?:www.)?x7.to/" __version__ = "0.41" __description__ = """X7.To File Download Hoster""" - __author_name__ = ("ernieb") - __author_mail__ = ("ernieb") + __author_name__ = "ernieb" + __author_mail__ = "ernieb" getInfo = create_getInfo(X7To) diff --git a/pyload/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py index bd8c6025a..ee445069c 100644 --- a/pyload/plugins/hoster/Xdcc.py +++ b/pyload/plugins/hoster/Xdcc.py @@ -42,8 +42,8 @@ class Xdcc(Hoster): ("realname", "str", "Realname", "pyloadreal") ] __description__ = """A Plugin that allows you to download from an IRC XDCC bot""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.com") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.com" def setup(self): self.debug = 0 # 0,1,2 diff --git a/pyload/plugins/hoster/YibaishiwuCom.py b/pyload/plugins/hoster/YibaishiwuCom.py index 37eaa17e5..3b6f8e6bc 100644 --- a/pyload/plugins/hoster/YibaishiwuCom.py +++ b/pyload/plugins/hoster/YibaishiwuCom.py @@ -27,7 +27,8 @@ class YibaishiwuCom(SimpleHoster): __pattern__ = r"http://(?:www\.)?(?:u\.)?115.com/file/(?P<ID>\w+)" __version__ = "0.12" __description__ = """115.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r"file_name: '(?P<N>[^']+)'" FILE_SIZE_PATTERN = r"file_size: '(?P<S>[^']+)'" diff --git a/pyload/plugins/hoster/YoupornCom.py b/pyload/plugins/hoster/YoupornCom.py index b0d594ca5..9f45aecec 100644 --- a/pyload/plugins/hoster/YoupornCom.py +++ b/pyload/plugins/hoster/YoupornCom.py @@ -11,8 +11,8 @@ class YoupornCom(Hoster): __pattern__ = r"http://(www\.)?youporn\.com/watch/.+" __version__ = "0.2" __description__ = """Youporn.com Video Download Hoster""" - __author_name__ = ("willnix") - __author_mail__ = ("willnix@pyload.org") + __author_name__ = "willnix" + __author_mail__ = "willnix@pyload.org" def process(self, pyfile): self.pyfile = pyfile diff --git a/pyload/plugins/hoster/ZeveraCom.py b/pyload/plugins/hoster/ZeveraCom.py index e8b832a13..200f15fe7 100644 --- a/pyload/plugins/hoster/ZeveraCom.py +++ b/pyload/plugins/hoster/ZeveraCom.py @@ -10,8 +10,8 @@ class ZeveraCom(Hoster): __type__ = "hoster" __pattern__ = r"http://zevera.com/.*" __description__ = """zevera.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def setup(self): self.resumeDownload = self.multiDL = True diff --git a/pyload/plugins/internal/DeadCrypter.py b/pyload/plugins/internal/DeadCrypter.py index 51e24a00a..772c38113 100644 --- a/pyload/plugins/internal/DeadCrypter.py +++ b/pyload/plugins/internal/DeadCrypter.py @@ -7,8 +7,8 @@ class DeadCrypter(_Crypter): __pattern__ = r"" __version__ = "0.01" __description__ = """Crypter is no longer available""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def setup(self): self.fail("Crypter is no longer available") diff --git a/pyload/plugins/internal/DeadHoster.py b/pyload/plugins/internal/DeadHoster.py index ba6abc0c5..9fb2d155e 100644 --- a/pyload/plugins/internal/DeadHoster.py +++ b/pyload/plugins/internal/DeadHoster.py @@ -12,8 +12,8 @@ class DeadHoster(_Hoster): __pattern__ = r"" __version__ = "0.11" __description__ = """Hoster is no longer available""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def setup(self): self.fail("Hoster is no longer available") diff --git a/pyload/plugins/internal/XFSPAccount.py b/pyload/plugins/internal/XFSPAccount.py index e4f211216..bc6061e6a 100644 --- a/pyload/plugins/internal/XFSPAccount.py +++ b/pyload/plugins/internal/XFSPAccount.py @@ -29,8 +29,8 @@ class XFSPAccount(Account): __version__ = "0.05" __type__ = "account" __description__ = """XFileSharingPro account base""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = None |