diff options
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r-- | module/plugins/crypter/DailymotionComFolder.py | 6 | ||||
-rw-r--r-- | module/plugins/crypter/DuckCryptInfo.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/FilecryptCc.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/HoerbuchIn.py | 6 | ||||
-rw-r--r-- | module/plugins/crypter/LinkCryptWs.py | 4 | ||||
-rw-r--r-- | module/plugins/crypter/LinkdecrypterCom.py | 4 | ||||
-rw-r--r-- | module/plugins/crypter/LixIn.py | 4 | ||||
-rw-r--r-- | module/plugins/crypter/ShSt.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/ShareLinksBiz.py | 8 | ||||
-rw-r--r-- | module/plugins/crypter/TurbobitNetFolder.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/YoutubeComFolder.py | 30 |
11 files changed, 35 insertions, 35 deletions
diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index d3d68b7c7..688a880cb 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -30,7 +30,7 @@ class DailymotionComFolder(Crypter): def get_playlist_info(self, id): ref = "playlist/" + id - data = {"fields": "name,owner.screenname"} + data = {'fields': "name,owner.screenname"} playlist = self.api_response(ref, data) if "error" in playlist: @@ -43,7 +43,7 @@ class DailymotionComFolder(Crypter): def _get_playlists(self, user_id, page=1): ref = "user/%s/playlists" % user_id - data = {"fields": "id", "page": page, "limit": 100} + data = {'fields': "id", 'page': page, 'limit': 100} user = self.api_response(ref, data) if "error" in user: @@ -63,7 +63,7 @@ class DailymotionComFolder(Crypter): def _get_videos(self, id, page=1): ref = "playlist/%s/videos" % id - data = {"fields": "url", "page": page, "limit": 100} + data = {'fields': "url", 'page': page, 'limit': 100} playlist = self.api_response(ref, data) if "error" in playlist: diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 7dc0fc6bc..e9249e64b 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -42,7 +42,7 @@ class DuckCryptInfo(Crypter): self.log_debug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup.BeautifulSoup(html) - cryptlinks = soup.findAll("div", attrs={"class": "folderbox"}) + cryptlinks = soup.findAll("div", attrs={'class': "folderbox"}) self.log_debug("Redirectet to " + str(cryptlinks)) if not cryptlinks: self.error(_("No link found")) diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 624dadb94..94356ed31 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -81,7 +81,7 @@ class FilecryptCc(Crypter): if not password: self.fail(_("Please enter the password in package section and try again")) - self.html = self.load(self.pyfile.url, post={"password": password}) + self.html = self.load(self.pyfile.url, post={'password': password}) def handle_captcha(self): diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 1a897a3c1..34e98b28d 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -33,8 +33,8 @@ class HoerbuchIn(Crypter): html = self.load(pyfile.url) soup = BeautifulSoup.BeautifulSoup(html, convertEntities=BeautifulSoup.BeautifulStoneSoup.HTML_ENTITIES) - abookname = soup.find("a", attrs={"rel": "bookmark"}).text - for a in soup.findAll("a", attrs={"href": self.protection}): + abookname = soup.find("a", attrs={'rel': "bookmark"}).text + for a in soup.findAll("a", attrs={'href': self.protection}): package = "%s (%s)" % (abookname, a.previousSibling.previousSibling.text[:-1]) links = self.decrypt_folder(a['href']) @@ -50,7 +50,7 @@ class HoerbuchIn(Crypter): url = m.group(0) self.pyfile.url = url - html = self.load(url, post={"viewed": "adpg"}) + html = self.load(url, post={'viewed': "adpg"}) links = [] pattern = re.compile("http://www\.hoerbuch\.in/protection/(\w+)/(.*?)\"") diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 4fe2384da..f7eec388b 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -125,7 +125,7 @@ class LinkCryptWs(Crypter): if password: self.log_debug("Submitting password [%s] for protected links" % password) - self.html = self.load(self.pyfile.url, post={"password": password, 'x': "0", 'y': "0"}) + self.html = self.load(self.pyfile.url, post={'password': password, 'x': "0", 'y': "0"}) else: self.fail(_("Folder is password protected")) @@ -134,7 +134,7 @@ class LinkCryptWs(Crypter): captcha_url = re.search(r'<form.*?id\s*?=\s*?"captcha"[^>]*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) captcha_code = self.decrypt_captcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional') - self.html = self.load(self.pyfile.url, post={"x": captcha_code[0], "y": captcha_code[1]}) + self.html = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) def get_package_info(self): diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index b56a1dd57..676b1f7cc 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -34,7 +34,7 @@ class LinkdecrypterCom(Crypter): def decrypt(self, pyfile): retries = 5 - post_dict = {"link_cache": "on", "pro_links": pyfile.url, "modo_links": "text"} + post_dict = {'link_cache': "on", 'pro_links': pyfile.url, 'modo_links': "text"} self.html = self.load('http://linkdecrypter.com/', post=post_dict) while retries: @@ -54,7 +54,7 @@ class LinkdecrypterCom(Crypter): captcha = self.decrypt_captcha(captcha_url, result_type=result_type) if result_type == "positional": captcha = "%d|%d" % captcha - self.html = self.load('http://linkdecrypter.com/', post={"captcha": captcha}) + self.html = self.load('http://linkdecrypter.com/', post={'captcha': captcha}) retries -= 1 elif self.PASSWORD_PATTERN in self.html: diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index a86396a25..6744fd311 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -49,11 +49,11 @@ class LixIn(Crypter): self.log_debug("Trying captcha") captcharesult = self.decrypt_captcha(urlparse.urljoin("http://lix.in/", m.group(1))) self.html = self.load(url, - post={"capt": captcharesult, "submit": "submit", "tiny": id}) + post={'capt': captcharesult, 'submit': "submit", 'tiny': id}) else: self.log_debug("No captcha/captcha solved") else: - self.html = self.load(url, post={"submit": "submit", "tiny": id}) + self.html = self.load(url, post={'submit': "submit", 'tiny': id}) m = re.search(self.LINK_PATTERN, self.html) if m is None: diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 05a5518d3..2c6681adf 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -26,5 +26,5 @@ class ShSt(Crypter): self.req.http.c.setopt(pycurl.USERAGENT, "curl/7.42.1") #: Fetch the target URL header = self.load(self.pyfile.url, just_header = True, decode = False) - target_url = header["location"] + target_url = header['location'] self.urls.append(target_url) diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 9b435e694..1a26080bc 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -80,7 +80,7 @@ class ShareLinksBiz(Crypter): def is_password_protected(self): - if re.search(r'''<form.*?id="passwordForm".*?>''', self.html): + if re.search(r'<form.*?id="passwordForm".*?>', self.html): self.log_debug("Links are protected") return True return False @@ -102,7 +102,7 @@ class ShareLinksBiz(Crypter): def unlock_password_protection(self): password = self.get_password() self.log_debug("Submitting password [%s] for protected links" % password) - post = {"password": password, 'login': 'Submit form'} + post = {'password': password, 'login': 'Submit form'} url = self.base_url + '/' + self.file_id self.html = self.load(url, post=post) @@ -248,11 +248,11 @@ class ShareLinksBiz(Crypter): #: Get jk strlist = list(params[1].decode('base64')) - jk = ''.join(strlist[::-1]) + jk = "".join(strlist[::-1]) #: Get crypted strlist = list(params[2].decode('base64')) - crypted = ''.join(strlist[::-1]) + crypted = "".join(strlist[::-1]) #: Log and return return crypted, jk diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 4d07704fb..76489eebf 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -27,7 +27,7 @@ class TurbobitNetFolder(SimpleCrypter): def _get_links(self, id, page=1): gridFile = self.load("http://turbobit.net/downloadfolder/gridFile", - get={"rootId": id, "rows": 200, "page": page}) + get={'rootId': id, 'rows': 200, 'page': page}) grid = json_loads(gridFile) if grid['rows']: diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index b68630f44..4d941f2b9 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -29,36 +29,36 @@ class YoutubeComFolder(Crypter): def api_response(self, ref, req): - req.update({"key": self.API_KEY}) + req.update({'key': self.API_KEY}) url = urlparse.urljoin("https://www.googleapis.com/youtube/v3/", ref) html = self.load(url, get=req) return json_loads(html) def get_channel(self, user): - channels = self.api_response("channels", {"part": "id,snippet,contentDetails", "forUsername": user, "maxResults": "50"}) + channels = self.api_response("channels", {'part': "id,snippet,contentDetails", 'forUsername': user, 'maxResults': "50"}) if channels['items']: channel = channels['items'][0] - return {"id": channel['id'], - "title": channel['snippet']['title'], - "relatedPlaylists": channel['contentDetails']['relatedPlaylists'], - "user": user} #: One lone channel for user? + return {'id': channel['id'], + 'title': channel['snippet']['title'], + 'relatedPlaylists': channel['contentDetails']['relatedPlaylists'], + 'user': user} #: One lone channel for user? def get_playlist(self, p_id): - playlists = self.api_response("playlists", {"part": "snippet", "id": p_id}) + playlists = self.api_response("playlists", {'part': "snippet", 'id': p_id}) if playlists['items']: playlist = playlists['items'][0] - return {"id": p_id, - "title": playlist['snippet']['title'], - "channelId": playlist['snippet']['channelId'], - "channelTitle": playlist['snippet']['channelTitle']} + return {'id': p_id, + 'title': playlist['snippet']['title'], + 'channelId': playlist['snippet']['channelId'], + 'channelTitle': playlist['snippet']['channelTitle']} def _get_playlists(self, id, token=None): - req = {"part": "id", "maxResults": "50", "channelId": id} + req = {'part': "id", 'maxResults': "50", 'channelId': id} if token: - req.update({"pageToken": token}) + req.update({'pageToken': token}) playlists = self.api_response("playlists", req) @@ -75,9 +75,9 @@ class YoutubeComFolder(Crypter): def _get_videos_id(self, id, token=None): - req = {"part": "contentDetails", "maxResults": "50", "playlistId": id} + req = {'part': "contentDetails", 'maxResults': "50", 'playlistId': id} if token: - req.update({"pageToken": token}) + req.update({'pageToken': token}) playlist = self.api_response("playlistItems", req) |