diff options
Diffstat (limited to 'pyload/plugins/crypter')
52 files changed, 103 insertions, 101 deletions
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})  | 
