diff options
Diffstat (limited to 'module/plugins/crypter')
23 files changed, 42 insertions, 42 deletions
diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index ccdc425b0..c3b92e9a2 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -21,4 +21,4 @@ class ChipDe(Crypter): except: self.fail('Failed to find the URL') - self.packages.append((self.pyfile.package().name, [url], self.pyfile.package().folder)) + self.packages.append((pyfile.package().name, [url], pyfile.package().folder)) diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 500af0bb3..761c9e2bc 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -18,7 +18,7 @@ class CzshareComFolder(Crypter): #NEXT_PAGE_PATTERN = r'<a class="next " href="/([^"]+)"> </a>' def decrypt(self, pyfile): - html = self.load(self.pyfile.url) + html = self.load(pyfile.url) new_links = [] found = re.search(self.FOLDER_PATTERN, html, re.DOTALL) @@ -26,6 +26,6 @@ class CzshareComFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, found.group(1))) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py index 16ab63594..1e8503a5a 100644 --- a/module/plugins/crypter/DDLMusicOrg.py +++ b/module/plugins/crypter/DDLMusicOrg.py @@ -19,7 +19,7 @@ class DDLMusicOrg(Crypter): self.multiDL = False def decrypt(self, pyfile): - html = self.req.load(self.pyfile.url, cookies=True) + html = self.req.load(pyfile.url, cookies=True) if re.search(r"Wer dies nicht rechnen kann", html) is not None: self.offline() @@ -34,11 +34,11 @@ class DDLMusicOrg(Crypter): else: solve = int(math.group(1)) - int(math.group(3)) sleep(3) - htmlwithlink = self.req.load(self.pyfile.url, cookies=True, + htmlwithlink = self.req.load(pyfile.url, cookies=True, post={"calc%s" % linknr: solve, "send%s" % linknr: "Send", "id": id, "linknr": linknr}) m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink) if m: - self.packages.append((self.pyfile.package().name, [m.group(1)], self.pyfile.package().folder)) + self.packages.append((pyfile.package().name, [m.group(1)], pyfile.package().folder)) else: self.retry() diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 46001918f..4b6309c17 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -31,5 +31,5 @@ class Dereferer(Crypter): __author_mail__ = "zoidberg@mujmail.cz" def decrypt(self, pyfile): - link = re.match(self.__pattern__, self.pyfile.url).group('url') - self.core.files.addLinks([urllib.unquote(link).rstrip('+')], self.pyfile.package().id) + link = re.match(self.__pattern__, pyfile.url).group('url') + self.core.files.addLinks([urllib.unquote(link).rstrip('+')], pyfile.package().id) diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py index 1a7cf57bb..0df14f9ba 100644 --- a/module/plugins/crypter/DontKnowMe.py +++ b/module/plugins/crypter/DontKnowMe.py @@ -18,5 +18,5 @@ class DontKnowMe(Crypter): LINK_PATTERN = r"http://dontknow.me/at/\?(.+)$" def decrypt(self, pyfile): - link = re.findall(self.LINK_PATTERN, self.pyfile.url)[0] - self.core.files.addLinks([urllib.unquote(link)], self.pyfile.package().id) + link = re.findall(self.LINK_PATTERN, pyfile.url)[0] + self.core.files.addLinks([urllib.unquote(link)], pyfile.package().id) diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index dd0fcb533..2beabcefd 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -19,7 +19,7 @@ class EmbeduploadCom(Crypter): LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>' def decrypt(self, pyfile): - self.html = self.load(self.pyfile.url, decode=True) + self.html = self.load(pyfile.url, decode=True) tmp_links = [] new_links = [] @@ -39,7 +39,7 @@ class EmbeduploadCom(Crypter): self.getLocation(tmp_links, new_links) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index dce14cf04..07842c898 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -19,7 +19,7 @@ class FilefactoryComFolder(Crypter): NEXT_PAGE_PATTERN = r'<li class="current">.*?</li>\s*<li class=""><a href="([^"]+)">' def decrypt(self, pyfile): - url_base = re.match(self.__pattern__, self.pyfile.url).group(1) + url_base = re.match(self.__pattern__, pyfile.url).group(1) html = self.load(url_base) new_links = [] @@ -40,6 +40,6 @@ class FilefactoryComFolder(Crypter): self.logInfo("Limit of 99 pages reached, aborting") if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index e6fbcdf9d..3c4048f79 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -18,7 +18,7 @@ class FileserveComFolder(Crypter): LINK_PATTERN = r'<a href="([^"]+)" class="sheet_icon wbold">' def decrypt(self, pyfile): - html = self.load(self.pyfile.url) + html = self.load(pyfile.url) new_links = [] @@ -28,6 +28,6 @@ class FileserveComFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1))) if new_links: - self.core.files.addLinks(map(lambda s: "http://fileserve.com%s" % s, new_links), self.pyfile.package().id) + self.core.files.addLinks(map(lambda s: "http://fileserve.com%s" % s, new_links), pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index 9d4c9fd76..b109d5060 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -22,4 +22,4 @@ class FourChanOrg(Crypter): for image in images: urls.append("http://" + image) - self.core.files.addLinks(urls, self.pyfile.package().id) + self.core.files.addLinks(urls, pyfile.package().id) diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index b05009c58..49b8e1efd 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -35,6 +35,6 @@ class GooGl(Crypter): rep = json_loads(rep) if 'longUrl' in rep: - self.core.files.addLinks([rep['longUrl']], self.pyfile.package().id) + self.core.files.addLinks([rep['longUrl']], pyfile.package().id) else: self.fail('Unable to expand shortened link') diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 8b4a8fffd..a77067b1c 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -21,8 +21,8 @@ class HoerbuchIn(Crypter): def decrypt(self, pyfile): self.pyfile = pyfile - if self.article.match(self.pyfile.url): - src = self.load(self.pyfile.url) + if self.article.match(pyfile.url): + src = self.load(pyfile.url) soup = BeautifulSoup(src, convertEntities=BeautifulStoneSoup.HTML_ENTITIES) abookname = soup.find("a", attrs={"rel": "bookmark"}).text @@ -30,11 +30,11 @@ class HoerbuchIn(Crypter): package = "%s (%s)" % (abookname, a.previousSibling.previousSibling.text[:-1]) links = self.decryptFolder(a["href"]) - self.packages.append((package, links, self.pyfile.package().folder)) + self.packages.append((package, links, pyfile.package().folder)) else: - links = self.decryptFolder(self.pyfile.url) + links = self.decryptFolder(pyfile.url) - self.packages.append((self.pyfile.package().name, links, self.pyfile.package().folder)) + self.packages.append((pyfile.package().name, links, pyfile.package().folder)) def decryptFolder(self, url): m = self.protection.search(url) diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index 96499a666..0135bd891 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -17,7 +17,7 @@ class LetitbitNetFolder(Crypter): LINK_PATTERN = r'<a href="([^"]+)" target="_blank">' def decrypt(self, pyfile): - html = self.load(self.pyfile.url) + html = self.load(pyfile.url) new_links = [] @@ -28,6 +28,6 @@ class LetitbitNetFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0))) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 25290af2d..aaa654ec6 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -44,7 +44,7 @@ class LinkSaveIn(Crypter): self.req.cj.setCookie(self.HOSTER_DOMAIN, "Linksave_Language", "english") # Request package - self.html = self.load(self.pyfile.url) + self.html = self.load(pyfile.url) if not self.isOnline(): self.offline() diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 7d2547010..a6e6faa40 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -41,7 +41,7 @@ class LinkdecrypterCom(Crypter): # API not working anymore new_links = self.decryptHTML() if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 6ba463459..4b6c3afcc 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -55,4 +55,4 @@ class LixIn(Crypter): new_link = matches.group("link") self.logDebug("Found link %s, adding to package" % new_link) - self.packages.append((self.pyfile.package().name, [new_link], self.pyfile.package().name)) + self.packages.append((pyfile.package().name, [new_link], pyfile.package().name)) diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 917d93964..9702d80eb 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -52,6 +52,6 @@ class MediafireComFolder(Crypter): new_links.append(url) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 6cc9a1171..d51a7821b 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -19,10 +19,10 @@ class MultiloadCz(Crypter): LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">' def decrypt(self, pyfile): - self.html = self.load(self.pyfile.url, decode=True) + self.html = self.load(pyfile.url, decode=True) new_links = [] - if re.match(self.__pattern__, self.pyfile.url).group(1) == "slozka": + if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": found = re.search(self.FOLDER_PATTERN, self.html) if found is not None: new_links.extend(found.group(1).split()) @@ -37,6 +37,6 @@ class MultiloadCz(Crypter): new_links.extend([x[1] for x in found if x[0] not in ignored_set]) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index e3013fe0d..9a74f0e38 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -55,7 +55,7 @@ class MultiuploadCom(Crypter): new_links.append(url) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index c3a7e0ec6..6a4f7d5b4 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -17,7 +17,7 @@ class QuickshareCzFolder(Crypter): LINK_PATTERN = r'(http://www.quickshare.cz/\S+)' def decrypt(self, pyfile): - html = self.load(self.pyfile.url) + html = self.load(pyfile.url) new_links = [] found = re.search(self.FOLDER_PATTERN, html, re.DOTALL) @@ -26,6 +26,6 @@ class QuickshareCzFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, found.group(1))) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + self.core.files.addLinks(new_links, pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index 8a11d13a1..4a907c28d 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -27,7 +27,7 @@ class SafelinkingNet(Crypter): self.load(url) m = re.search("^Location: (.+)$", self.req.http.header, re.MULTILINE) if m: - self.core.files.addLinks([m.group(1)], self.pyfile.package().id) + self.core.files.addLinks([m.group(1)], pyfile.package().id) else: self.fail("Couldn't find forwarded Link") @@ -77,4 +77,4 @@ class SafelinkingNet(Crypter): else: packageLinks.append(link["full"]) - self.core.files.addLinks(packageLinks, self.pyfile.package().id) + self.core.files.addLinks(packageLinks, pyfile.package().id) diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index e11046397..9fe9ad553 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -268,7 +268,7 @@ class SerienjunkiesOrg(Crypter): framePattern = re.compile("^http://download.(serienjunkies.org|dokujunkies.org)/frame/go-.*?/$") url = pyfile.url if framePattern.match(url): - self.packages.append((self.pyfile.package().name, [self.handleFrame(url)], self.pyfile.package().name)) + self.packages.append((pyfile.package().name, [self.handleFrame(url)], pyfile.package().name)) elif episodePattern.match(url): self.handleEpisode(url) elif oldStyleLink.match(url): diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index 0526ed761..062882da9 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -18,7 +18,7 @@ class UlozToFolder(Crypter): NEXT_PAGE_PATTERN = r'<a class="next " href="/([^"]+)"> </a>' def decrypt(self, pyfile): - html = self.load(self.pyfile.url) + html = self.load(pyfile.url) new_links = [] for i in xrange(1, 100): @@ -37,6 +37,6 @@ class UlozToFolder(Crypter): self.logInfo("Limit of 99 pages reached, aborting") if new_links: - self.core.files.addLinks(map(lambda s: "http://ulozto.net/%s" % s, new_links), self.pyfile.package().id) + self.core.files.addLinks(map(lambda s: "http://ulozto.net/%s" % s, new_links), pyfile.package().id) else: self.fail('Could not extract any links') diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index ea675b2d2..a95dca3c8 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -13,8 +13,8 @@ class XupPl(Crypter): __author_mail__ = "z00nx0@gmail.com" def decrypt(self, pyfile): - header = self.load(self.pyfile.url, just_header=True) + header = self.load(pyfile.url, just_header=True) if 'location' in header: - self.core.files.addLinks([header['location']], self.pyfile.package().id) + self.core.files.addLinks([header['location']], pyfile.package().id) else: self.fail('Unable to find link') |