diff options
Diffstat (limited to 'module/plugins/crypter')
88 files changed, 110 insertions, 153 deletions
diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index d7a51cb1c..c34313389 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class BitshareComFolder(SimpleCrypter): - __name__ = "BitshareComFolder" + __name = "BitshareCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 09acace63..3d40c9c0c 100644 --- a/module/plugins/crypter/C1NeonCom.py +++ b/module/plugins/crypter/C1NeonCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class C1NeonCom(DeadCrypter): - __name__ = "C1NeonCom" + __name = "C1NeonCom" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 8d823d88d..847490786 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class ChipDe(Crypter): - __name__ = "ChipDe" + __name = "ChipDe" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index dc0cdfef2..79a52fbfa 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CloudzillaToFolder(SimpleHoster): - __name__ = "CloudzillaToFolder" + __name = "CloudzillaTo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 81dfcd525..926396192 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CrockoComFolder(SimpleCrypter): - __name__ = "CrockoComFolder" + __name = "CrockoCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index be0094747..1613232d1 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class CryptItCom(DeadCrypter): - __name__ = "CryptItCom" + __name = "CryptItCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index cb41426d7..7728f236e 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): - __name__ = "CzshareComFolder" + __name = "CzshareCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index 3f81c0485..de3dddfc3 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -9,7 +9,7 @@ from module.utils import save_join as fs_join class DailymotionComFolder(Crypter): - __name__ = "DailymotionComFolder" + __name = "DailymotionCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" @@ -102,4 +102,4 @@ class DailymotionComFolder(Crypter): p_videos = self.get_videos(p_id) p_folder = fs_join(self.pyload.config.get("general", "download_folder"), p_owner, p_name) self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) - self.packages.append((p_name, p_videos, p_folder)) #: Folder is NOT recognized by pyload 0.4.9! + self.packages.append((p_name, p_videos, p_folder)) #@NOTE: Folder is NOT recognized by pyload 0.4.9! diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index e6e3c70a5..cec612deb 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DataHuFolder(SimpleCrypter): - __name__ = "DataHuFolder" + __name = "DataHu" __type__ = "crypter" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index ffc9f1d01..c462db795 100644 --- a/module/plugins/crypter/DdlstorageComFolder.py +++ b/module/plugins/crypter/DdlstorageComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DdlstorageComFolder(DeadCrypter): - __name__ = "DdlstorageComFolder" + __name = "DdlstorageCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 0c795279e..2ea6a3655 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DepositfilesComFolder(SimpleCrypter): - __name__ = "DepositfilesComFolder" + __name = "DepositfilesCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 8ecc635ec..631032018 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class Dereferer(SimpleCrypter): - __name__ = "Dereferer" + __name = "Dereferer" __type__ = "crypter" __version__ = "0.19" __status__ = "testing" @@ -31,11 +31,11 @@ class Dereferer(SimpleCrypter): def init(self): super(Dereferer, self).init() - self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] #@TODO: Recheck in 0.4.10 + self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] #@TODO: Recheck in 0.4.10 - self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.PLUGIN_DOMAIN) if part != '.') def get_links(self): - return [re.match(self.__pattern__, self.pyfile.url).group('LINK')] + return [re.match(self.__pattern, self.pyfile.url).group('LINK')] diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 30f97f4fc..92952c57d 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DevhostStFolder(SimpleCrypter): - __name__ = "DevhostStFolder" + __name = "DevhostSt" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index ac45ee4c3..fccd385f5 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DlProtectCom(SimpleCrypter): - __name__ = "DlProtectCom" + __name = "DlProtectCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index c9269b05e..5bb7208af 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): - __name__ = "DuckCryptInfo" + __name = "DuckCryptInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" @@ -28,7 +28,7 @@ class DuckCryptInfo(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern__, url) + m = re.match(self.__pattern, url) if m is None: self.fail(_("Weird error in link")) if str(m.group(1)) == "link": @@ -39,7 +39,7 @@ class DuckCryptInfo(Crypter): def handle_folder(self, m): html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2))) - m = re.match(self.__pattern__, html) + m = re.match(self.__pattern, html) self.log_debug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup.BeautifulSoup(html) diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index f0e9b8c96..0cc810ea6 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DuploadOrgFolder(DeadCrypter): - __name__ = "DuploadOrgFolder" + __name = "DuploadOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 0c070b6f1..96c546ebc 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): - __name__ = "EasybytezComFolder" + __name = "EasybytezCom" __type__ = "crypter" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 957e1efb2..8bf5aa787 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -6,7 +6,7 @@ from module.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name__ = "EmbeduploadCom" + __name = "EmbeduploadCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 5d0e26329..0c072d07f 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilebeerInfoFolder(DeadCrypter): - __name__ = "FilebeerInfoFolder" + __name = "FilebeerInfo" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 6c7b5be15..89495e8c7 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilecloudIoFolder(SimpleCrypter): - __name__ = "FilecloudIoFolder" + __name = "FilecloudIo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 51fdcd30b..720d20e01 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -15,7 +15,7 @@ from module.plugins.captcha.SolveMedia import SolveMedia class FilecryptCc(Crypter): - __name__ = "FilecryptCc" + __name = "FilecryptCc" __type__ = "crypter" __version__ = "0.20" __status__ = "testing" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index aec73f33c..e7d6b4771 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilefactoryComFolder(SimpleCrypter): - __name__ = "FilefactoryComFolder" + __name = "FilefactoryCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 4814c5933..9151e43c3 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilerNetFolder(SimpleCrypter): - __name__ = "FilerNetFolder" + __name = "FilerNet" __type__ = "crypter" __version__ = "0.43" __status__ = "testing" diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 44de55581..7a64ac451 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): - __name__ = "FileserveComFolder" + __name = "FileserveCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index 7ebba702a..c749c74b2 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilesonicComFolder(DeadCrypter): - __name__ = "FilesonicComFolder" + __name = "FilesonicCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 5fcd72c64..2dff23b11 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilestubeCom(SimpleCrypter): - __name__ = "FilestubeCom" + __name = "FilestubeCom" __type__ = "crypter" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 6603a3542..4edb85371 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FiletramCom(SimpleCrypter): - __name__ = "FiletramCom" + __name = "FiletramCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 84b6cf34a..47a9d96e4 100644 --- a/module/plugins/crypter/FiredriveComFolder.py +++ b/module/plugins/crypter/FiredriveComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FiredriveComFolder(DeadCrypter): - __name__ = "FiredriveComFolder" + __name = "FiredriveCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index 65a2ac788..a2fdb99d1 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -9,7 +9,7 @@ from module.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): - __name__ = "FourChanOrg" + __name = "4chan" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index e939fe467..7ea7ae6ad 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreakhareComFolder(SimpleCrypter): - __name__ = "FreakhareComFolder" + __name = "FreakhareCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index 350f89202..8920c6c15 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreetexthostCom(SimpleCrypter): - __name__ = "FreetexthostCom" + __name = "FreetexthostCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index f4941007a..6da2cccf9 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FshareVnFolder(SimpleCrypter): - __name__ = "FshareVnFolder" + __name = "FshareVn" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index 595fcb34d..9ff8ca218 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FurLy(SimpleCrypter): - __name__ = "FurLy" + __name = "FurLy" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index 2d423a1a9..9ea5b333e 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -8,7 +8,7 @@ import json class Go4UpCom(SimpleCrypter): - __name__ = "Go4UpCom" + __name = "Go4UpCom" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 76a542408..8298701d3 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class GooGl(SimpleCrypter): - __name__ = "GooGl" + __name = "GooGl" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index e7a5bae2c..774e768f9 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class GoogledriveComFolder(SimpleCrypter): - __name__ = "GoogledriveCom" + __name = "GoogledriveCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 27075324d..23ec42064 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): - __name__ = "HoerbuchIn" + __name = "HoerbuchIn" __type__ = "crypter" __version__ = "0.62" __status__ = "testing" diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index 1b2429f4a..a489e4309 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/module/plugins/crypter/HotfileComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class HotfileComFolder(DeadCrypter): - __name__ = "HotfileComFolder" + __name = "HotfileCom" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index 7d73b898f..bebdbef55 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class ILoadTo(DeadCrypter): - __name__ = "ILoadTo" + __name = "ILoadTo" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index 488979b48..a2bb4c9f7 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -5,7 +5,7 @@ from module.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name__ = "ImgurComAlbum" + __name = "ImgurComAlbum" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index e560306f5..b9107ef95 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): - __name__ = "LetitbitNetFolder" + __name = "LetitbitNet" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 3d09eeac2..8fff032a0 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -12,7 +12,7 @@ from module.utils import html_unescape class LinkCryptWs(Crypter): - __name__ = "LinkCryptWs" + __name = "LinkCryptWs" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" @@ -37,7 +37,7 @@ class LinkCryptWs(Crypter): def prepare(self): #: Init - self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') + self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 36b545de8..1cce479ac 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class LinkSaveIn(SimpleCrypter): - __name__ = "LinkSaveIn" + __name = "LinkSaveIn" __type__ = "crypter" __version__ = "2.06" __status__ = "testing" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index c16ec0b6e..589f21bd2 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiCrypter import MultiCrypter class LinkdecrypterCom(MultiCrypter): - __name__ = "LinkdecrypterCom" + __name = "LinkdecrypterCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index ecc92a8d3..49ca7e020 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -7,7 +7,7 @@ from module.plugins.internal.Crypter import Crypter class LixIn(Crypter): - __name__ = "LixIn" + __name = "LixIn" __type__ = "crypter" __version__ = "0.24" __status__ = "testing" @@ -29,7 +29,7 @@ class LixIn(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern__, url) + m = re.match(self.__pattern, url) if m is None: self.error(_("Unable to identify file ID")) diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index b25c9485a..93ed91450 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class LofCc(DeadCrypter): - __name__ = "LofCc" + __name = "LofCc" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index 98c63b9d4..03e6377d6 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MBLinkInfo(DeadCrypter): - __name__ = "MBLinkInfo" + __name = "MBLinkInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index f90bc04ea..c541a0505 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class MediafireComFolder(Crypter): - __name__ = "MediafireComFolder" + __name = "MediafireCom" __type__ = "crypter" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 107746819..aefdd8532 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.Crypter import Crypter class MegaCoNzFolder(Crypter): - __name__ = "MegaCoNzFolder" + __name = "MegaCoNz" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" @@ -25,6 +25,6 @@ class MegaCoNzFolder(Crypter): def decrypt(self, pyfile): - url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() + url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern, pyfile.url).groups() self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.html) diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index 8e7bcdf6b..11f9622c8 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MegaRapidCzFolder(SimpleCrypter): - __name__ = "MegaRapidCzFolder" + __name = "MegaRapidCz" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index c0ae6d16a..2d21ff55b 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MegauploadComFolder(DeadCrypter): - __name__ = "MegauploadComFolder" + __name = "MegauploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index 53636cda3..6c582ed9a 100644 --- a/module/plugins/crypter/Movie2KTo.py +++ b/module/plugins/crypter/Movie2KTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class Movie2KTo(DeadCrypter): - __name__ = "Movie2KTo" + __name = "Movie2KTo" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index fb228c3cd..183b4b472 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MultiUpOrg(SimpleCrypter): - __name__ = "MultiUpOrg" + __name = "MultiUpOrg" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" @@ -26,7 +26,7 @@ class MultiUpOrg(SimpleCrypter): def get_links(self): - m_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') + m_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') if m_type == "project": pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 72e9b3a8b..10cc5a3d7 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): - __name__ = "MultiloadCz" + __name = "MultiloadCz" __type__ = "crypter" __version__ = "0.42" __status__ = "testing" @@ -28,7 +28,7 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): self.html = self.load(pyfile.url) - if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": + if re.match(self.__pattern, pyfile.url).group(1) == "slozka": m = re.search(self.FOLDER_PATTERN, self.html) if m is not None: self.urls.extend(m.group(1).split()) diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 358758b7a..325ffc153 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MultiuploadCom(DeadCrypter): - __name__ = "MultiuploadCom" + __name = "MultiuploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index dddffbbf2..756adc379 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -10,7 +10,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class NCryptIn(Crypter): - __name__ = "NCryptIn" + __name = "NCryptIn" __type__ = "crypter" __version__ = "1.37" __status__ = "testing" @@ -80,7 +80,7 @@ class NCryptIn(Crypter): def is_single_link(self): - link_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') + link_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') return link_type in ("link", "frame") diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 5b992bf58..49cf3716a 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class NetfolderIn(DeadCrypter): - __name__ = "NetfolderIn" + __name = "NetfolderIn" __type__ = "crypter" __version__ = "0.74" __status__ = "testing" diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py index 0f0443355..431ed0104 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NitroflareComFolder(SimpleCrypter): - __name__ = "NitroflareComFolder" + __name = "NitroflareCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 4513440d6..a48672a45 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NosvideoCom(SimpleCrypter): - __name__ = "NosvideoCom" + __name = "NosvideoCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py deleted file mode 100644 index 341359c5a..000000000 --- a/module/plugins/crypter/OneKhDe.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from module.plugins.internal.Crypter import Crypter -from module.utils import html_unescape - - -class OneKhDe(Crypter): - __name__ = "OneKhDe" - __type__ = "crypter" - __version__ = "0.13" - __status__ = "testing" - - __pattern__ = r'http://(?:www\.)?1kh\.de/f/' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] - - __description__ = """1kh.de decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org")] - - - def __init__(self, parent): - Crypter.__init__(self, parent) - self.parent = parent - - - def file_exists(self): - """ - Returns True or False - """ - return True - - - def proceed(self, url, location): - url = self.parent.url - self.html = self.load(url) - link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html) - for id in link_ids: - new_link = html_unescape( - re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.load("http://1kh.de/l/" + id)).group(1)) - self.urls.append(new_link) diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 563c984fc..ca6a92508 100644 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class OronComFolder(DeadCrypter): - __name__ = "OronComFolder" + __name = "OronCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index c8a7473f1..eeb605dd7 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class PastebinCom(SimpleCrypter): - __name__ = "PastebinCom" + __name = "PastebinCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" @@ -19,7 +19,7 @@ class PastebinCom(SimpleCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - URL_REPLACEMENTS = [(__pattern__ + '.*', r'http://www.pastebin.com/\g<ID>')] + URL_REPLACEMENTS = [(__pattern + '.*', r'http://www.pastebin.com/\g<ID>')] NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)"' LINK_PATTERN = r'<div class="de\d+">(.+?)<' diff --git a/module/plugins/crypter/PastedCo.py b/module/plugins/crypter/PastedCo.py index 0804f56d4..781b60166 100644 --- a/module/plugins/crypter/PastedCo.py +++ b/module/plugins/crypter/PastedCo.py @@ -6,7 +6,7 @@ import re class PastedCo(Crypter): - __name__ = "PastedCo" + __name = "PastedCo" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 10b6073e4..575e18427 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): - __name__ = "QuickshareCzFolder" + __name = "QuickshareCz" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index c8637279b..34d8e19b6 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class RSLayerCom(DeadCrypter): - __name__ = "RSLayerCom" + __name = "RSLayerCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 4ff13a276..3e40b554d 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -12,7 +12,7 @@ from module.utils import save_join as fs_join class RelinkUs(Crypter): - __name__ = "RelinkUs" + __name = "RelinkUs" __type__ = "crypter" __version__ = "3.14" __status__ = "testing" @@ -100,7 +100,7 @@ class RelinkUs(Crypter): def init_package(self, pyfile): - self.fileid = re.match(self.__pattern__, pyfile.url).group('ID') + self.fileid = re.match(self.__pattern, pyfile.url).group('ID') self.package = pyfile.package() diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index a11ae2cd8..c90a67773 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -10,7 +10,7 @@ from module.plugins.captcha.SolveMedia import SolveMedia class SafelinkingNet(Crypter): - __name__ = "SafelinkingNet" + __name = "SafelinkingNet" __type__ = "crypter" __version__ = "0.17" __status__ = "testing" @@ -30,7 +30,7 @@ class SafelinkingNet(Crypter): def decrypt(self, pyfile): url = pyfile.url - if re.match(self.__pattern__, url).group(1) == "d": + if re.match(self.__pattern, url).group(1) == "d": header = self.load(url, just_header=True) if 'location' in header: diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 4731e41f4..7247d3169 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SecuredIn(DeadCrypter): - __name__ = "SecuredIn" + __name = "SecuredIn" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 24a5060b9..6e224e694 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -4,7 +4,7 @@ import re from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): - __name__ = "SexuriaCom" + __name = "SexuriaCom" __type__ = "crypter" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 429d3f3e2..77331e065 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -7,7 +7,7 @@ import re class ShSt(Crypter): - __name__ = "ShSt" + __name = "ShSt" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index c189229ce..448ad3b15 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): - __name__ = "ShareLinksBiz" + __name = "ShareLinksBiz" __type__ = "crypter" __version__ = "1.18" __status__ = "testing" @@ -70,12 +70,12 @@ class ShareLinksBiz(Crypter): if 's2l.biz' in url: url = self.load(url, just_header=True)['location'] - if re.match(self.__pattern__, url): - self.base_url = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1) - self.file_id = re.match(self.__pattern__, url).group('ID') + if re.match(self.__pattern, url): + self.base_url = "http://www.%s.biz" % re.match(self.__pattern, url).group(1) + self.file_id = re.match(self.__pattern, url).group('ID') else: - self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern__)) + self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern)) self.fail(_("Unsupported download link")) self.package = pyfile.package() diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index bd35cfd8e..b8519bad5 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SharingmatrixComFolder(DeadCrypter): - __name__ = "SharingmatrixComFolder" + __name = "SharingmatrixCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index 736d59720..ff1cb0c73 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SpeedLoadOrgFolder(DeadCrypter): - __name__ = "SpeedLoadOrgFolder" + __name = "SpeedLoadOrg" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 3a175cd87..79e41a66b 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class StealthTo(DeadCrypter): - __name__ = "StealthTo" + __name = "StealthTo" __type__ = "crypter" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/crypter/TNTVillageScambioeticoOrg.py b/module/plugins/crypter/TNTVillageScambioeticoOrg.py index e85a8fbb7..6df634cf8 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TNTVillageScambioeticoOrg(SimpleCrypter): - __name__ = "TNTVillageScambioeticoOrg" + __name = "TNTVillageScambioeticoOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index 2b9a8041f..d4d86ff3d 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TinyurlCom(SimpleCrypter): - __name__ = "TinyurlCom" + __name = "TinyurlCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index f3fb19cb3..8ab613fef 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TnyCz(SimpleCrypter): - __name__ = "TnyCz" + __name = "TnyCz" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 03ab004a3..9ecd958e1 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class TrailerzoneInfo(DeadCrypter): - __name__ = "TrailerzoneInfo" + __name = "TrailerzoneInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 3a36f5032..cd1a57691 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class TurbobitNetFolder(SimpleCrypter): - __name__ = "TurbobitNetFolder" + __name = "TurbobitNet" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 684fb1e46..f351707e5 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class TusfilesNetFolder(XFSCrypter): - __name__ = "TusfilesNetFolder" + __name = "TusfilesNet" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" @@ -25,7 +25,7 @@ class TusfilesNetFolder(XFSCrypter): PAGES_PATTERN = r'>\((\d+) \w+\)<' - URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] + URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] def load_page(self, page_n): diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index f2d0e7c17..c2b8e106a 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): - __name__ = "UlozToFolder" + __name = "UlozTo" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index 767e989d5..e1d29cbdf 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadableChFolder(SimpleCrypter): - __name__ = "UploadableChFolder" + __name = "UploadableCh" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 53fb5e4b9..f1e217e92 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadedToFolder(SimpleCrypter): - __name__ = "UploadedToFolder" + __name = "UploadedTo" __type__ = "crypter" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 7679836d2..90b7c5c6b 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WiiReloadedOrg(DeadCrypter): - __name__ = "WiiReloadedOrg" + __name = "WiiReloadedOrg" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index da1fa9bac..ffe08b30d 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WuploadComFolder(DeadCrypter): - __name__ = "WuploadComFolder" + __name = "WuploadCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index 615e9f224..aa65ccd12 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class XFileSharingProFolder(XFSCrypter): - __name__ = "XFileSharingProFolder" + __name = "XFileSharingPro" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" @@ -30,9 +30,9 @@ class XFileSharingProFolder(XFSCrypter): def init(self): super(XFileSharingProFolder, self).init() - self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] + self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] - self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.') diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 458372d13..230988318 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -4,7 +4,7 @@ from module.plugins.internal.Crypter import Crypter class XupPl(Crypter): - __name__ = "XupPl" + __name = "XupPl" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index 302f18ac0..a8d79d863 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -9,7 +9,7 @@ from module.utils import save_join as fs_join class YoutubeComFolder(Crypter): - __name__ = "YoutubeComFolder" + __name = "YoutubeCom" __type__ = "crypter" __version__ = "1.03" __status__ = "testing" @@ -95,7 +95,7 @@ class YoutubeComFolder(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern__, pyfile.url) + m = re.match(self.__pattern, pyfile.url) m_id = m.group('ID') m_type = m.group('TYPE') |