From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/crypter/SexuriaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 06dcf547e..80c06d599 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.Crypter import Crypter +from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): __name__ = "SexuriaCom" __type__ = "crypter" - __version__ = "0.01" + __version__ = "0.02" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), -- cgit v1.2.3 From 862ac360a13c5cf751a6079c56d6c2e9e5aefaeb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 10:30:57 +0200 Subject: [SexuriaCom] Update --- module/plugins/crypter/SexuriaCom.py | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 80c06d599..b2101e92a 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): __name__ = "SexuriaCom" __type__ = "crypter" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), @@ -19,13 +19,13 @@ class SexuriaCom(Crypter): __authors__ = [("NETHead", "NETHead.AT.gmx.DOT.net")] - PATTERN_SUPPORTED_MAIN = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', re.I) - PATTERN_SUPPORTED_CRYPT = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?dl_links_\d+_(?P\d+)\.html', re.I) - PATTERN_SUPPORTED_REDIRECT = re.compile(r'http://(www\.)?sexuria\.com/out\.php\?id=(?P\d+)\&part=\d+\&link=\d+', re.I) - PATTERN_TITLE = re.compile(r' - (?P<TITLE>.*) Sexuria - Kostenlose Pornos - Rapidshare XXX Porn', re.I) - PATTERN_PASSWORD = re.compile(r'Passwort: .*?bgcolor="#EFEFEF">(?P.*?)', re.I | re.S) - PATTERN_DL_LINK_PAGE = re.compile(r'"(dl_links_\d+_\d+\.html)"', re.I) - PATTERN_REDIRECT_LINKS = re.compile(r'value="(http://sexuria\.com/out\.php\?id=\d+\&part=\d+\&link=\d+)" readonly', re.I) + PATTERN_SUPPORTED_MAIN = r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html' + PATTERN_SUPPORTED_CRYPT = r'http://(www\.)?sexuria\.com/(v1/)?dl_links_\d+_(?P\d+)\.html' + PATTERN_SUPPORTED_REDIRECT = r'http://(www\.)?sexuria\.com/out\.php\?id=(?P\d+)\&part=\d+\&link=\d+' + PATTERN_TITLE = r' - (?P<TITLE>.*) Sexuria - Kostenlose Pornos - Rapidshare XXX Porn' + PATTERN_PASSWORD = r'Passwort: .*?bgcolor="#EFEFEF">(?P.*?)' + PATTERN_DL_LINK_PAGE = r'"(dl_links_\d+_\d+\.html)"' + PATTERN_REDIRECT_LINKS = r'value="(http://sexuria\.com/out\.php\?id=\d+\&part=\d+\&link=\d+)" readonly' def decrypt(self, pyfile): @@ -40,49 +40,49 @@ class SexuriaCom(Crypter): def decryptLinks(self, url): linklist = [] - name = self.package.name - folder = self.package.folder + name = self.package.name + folder = self.package.folder password = None - if re.match(self.PATTERN_SUPPORTED_MAIN, url): + if re.match(self.PATTERN_SUPPORTED_MAIN, url, re.I): # Processing main page html = self.load(url) - links = re.findall(self.PATTERN_DL_LINK_PAGE, html) + links = re.findall(self.PATTERN_DL_LINK_PAGE, html, re.I) for link in links: linklist.append("http://sexuria.com/v1/" + link) - elif re.match(self.PATTERN_SUPPORTED_REDIRECT, url): + elif re.match(self.PATTERN_SUPPORTED_REDIRECT, url, re.I): # Processing direct redirect link (out.php), redirecting to main page - id = re.search(self.PATTERN_SUPPORTED_REDIRECT, url).group('ID') + id = re.search(self.PATTERN_SUPPORTED_REDIRECT, url, re.I).group('ID') if id: linklist.append("http://sexuria.com/v1/Pornos_Kostenlos_liebe_%s.html" % id) - elif re.match(self.PATTERN_SUPPORTED_CRYPT, url): + elif re.match(self.PATTERN_SUPPORTED_CRYPT, url, re.I): # Extract info from main file - id = re.search(self.PATTERN_SUPPORTED_CRYPT, url).group('ID') + id = re.search(self.PATTERN_SUPPORTED_CRYPT, url, re.I).group('ID') html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id, decode=True) - title = re.search(self.PATTERN_TITLE, html).group('TITLE').strip() + title = re.search(self.PATTERN_TITLE, html, re.I).group('TITLE').strip() if title: name = folder = title self.logDebug("Package info found, name [%s] and folder [%s]" % (name, folder)) - pwd = re.search(self.PATTERN_PASSWORD, html).group('PWD') - if pwd: + pwd = re.search(self.PATTERN_PASSWORD, html, re.I | re.S).group('PWD') + if pwd and pwd not in ("Kein Passwort", "-"): password = pwd.strip() self.logDebug("Password info [%s] found" % password) # Process link (dl_link) html = self.load(url) - links = re.findall(self.PATTERN_REDIRECT_LINKS, html) + links = re.findall(self.PATTERN_REDIRECT_LINKS, html, re.I) if len(links) == 0: - self.LogError("Broken for link %s" % link) + self.logError("Broken for link %s" % link) else: for link in links: link = link.replace("http://sexuria.com/", "http://www.sexuria.com/") finallink = self.load(link, just_header=True)['location'] if not finallink or "sexuria.com/" in finallink: - self.LogError("Broken for link %s" % link) + self.logError("Broken for link %s" % link) else: linklist.append(finallink) -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/crypter/SexuriaCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index b2101e92a..4ee4eb0b3 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -60,7 +60,7 @@ class SexuriaCom(Crypter): elif re.match(self.PATTERN_SUPPORTED_CRYPT, url, re.I): # Extract info from main file id = re.search(self.PATTERN_SUPPORTED_CRYPT, url, re.I).group('ID') - html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id, decode=True) + html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id) title = re.search(self.PATTERN_TITLE, html, re.I).group('TITLE').strip() if title: -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/crypter/SexuriaCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 4ee4eb0b3..cce2177f4 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -29,11 +29,11 @@ class SexuriaCom(Crypter): def decrypt(self, pyfile): - # Init + #: Init self.pyfile = pyfile self.package = pyfile.package() - # Get package links + #: Get package links package_name, self.links, folder_name, package_pwd = self.decryptLinks(self.pyfile.url) self.packages = [(package_name, self.links, folder_name)] @@ -45,20 +45,20 @@ class SexuriaCom(Crypter): password = None if re.match(self.PATTERN_SUPPORTED_MAIN, url, re.I): - # Processing main page + #: Processing main page html = self.load(url) links = re.findall(self.PATTERN_DL_LINK_PAGE, html, re.I) for link in links: linklist.append("http://sexuria.com/v1/" + link) elif re.match(self.PATTERN_SUPPORTED_REDIRECT, url, re.I): - # Processing direct redirect link (out.php), redirecting to main page + #: Processing direct redirect link (out.php), redirecting to main page id = re.search(self.PATTERN_SUPPORTED_REDIRECT, url, re.I).group('ID') if id: linklist.append("http://sexuria.com/v1/Pornos_Kostenlos_liebe_%s.html" % id) elif re.match(self.PATTERN_SUPPORTED_CRYPT, url, re.I): - # Extract info from main file + #: Extract info from main file id = re.search(self.PATTERN_SUPPORTED_CRYPT, url, re.I).group('ID') html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id) @@ -72,7 +72,7 @@ class SexuriaCom(Crypter): password = pwd.strip() self.logDebug("Password info [%s] found" % password) - # Process link (dl_link) + #: Process link (dl_link) html = self.load(url) links = re.findall(self.PATTERN_REDIRECT_LINKS, html, re.I) if len(links) == 0: @@ -86,7 +86,7 @@ class SexuriaCom(Crypter): else: linklist.append(finallink) - # Debug log + #: Debug log self.logDebug("%d supported links" % len(linklist)) for i, link in enumerate(linklist): self.logDebug("Supported link %d, %s" % (i + 1, link)) -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/crypter/SexuriaCom.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index cce2177f4..db827ca27 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): __name__ = "SexuriaCom" __type__ = "crypter" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), @@ -34,11 +34,11 @@ class SexuriaCom(Crypter): self.package = pyfile.package() #: Get package links - package_name, self.links, folder_name, package_pwd = self.decryptLinks(self.pyfile.url) + package_name, self.links, folder_name, package_pwd = self.decrypt_links(self.pyfile.url) self.packages = [(package_name, self.links, folder_name)] - def decryptLinks(self, url): + def decrypt_links(self, url): linklist = [] name = self.package.name folder = self.package.folder @@ -65,30 +65,30 @@ class SexuriaCom(Crypter): title = re.search(self.PATTERN_TITLE, html, re.I).group('TITLE').strip() if title: name = folder = title - self.logDebug("Package info found, name [%s] and folder [%s]" % (name, folder)) + self.log_debug("Package info found, name [%s] and folder [%s]" % (name, folder)) pwd = re.search(self.PATTERN_PASSWORD, html, re.I | re.S).group('PWD') if pwd and pwd not in ("Kein Passwort", "-"): password = pwd.strip() - self.logDebug("Password info [%s] found" % password) + self.log_debug("Password info [%s] found" % password) #: Process link (dl_link) html = self.load(url) links = re.findall(self.PATTERN_REDIRECT_LINKS, html, re.I) if len(links) == 0: - self.logError("Broken for link %s" % link) + self.log_error("Broken for link %s" % link) else: for link in links: link = link.replace("http://sexuria.com/", "http://www.sexuria.com/") finallink = self.load(link, just_header=True)['location'] if not finallink or "sexuria.com/" in finallink: - self.logError("Broken for link %s" % link) + self.log_error("Broken for link %s" % link) else: linklist.append(finallink) #: Debug log - self.logDebug("%d supported links" % len(linklist)) + self.log_debug("%d supported links" % len(linklist)) for i, link in enumerate(linklist): - self.logDebug("Supported link %d, %s" % (i + 1, link)) + self.log_debug("Supported link %d, %s" % (i + 1, link)) return name, linklist, folder, password -- cgit v1.2.3 From 9e5d813d7721e351ac02ba72bdc473a7d77ba6b7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Jul 2015 20:04:36 +0200 Subject: Code cosmetics --- module/plugins/crypter/SexuriaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index db827ca27..0db90b73b 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -76,13 +76,13 @@ class SexuriaCom(Crypter): html = self.load(url) links = re.findall(self.PATTERN_REDIRECT_LINKS, html, re.I) if len(links) == 0: - self.log_error("Broken for link %s" % link) + self.log_error(_("Broken for link: %s") % link) else: for link in links: link = link.replace("http://sexuria.com/", "http://www.sexuria.com/") finallink = self.load(link, just_header=True)['location'] if not finallink or "sexuria.com/" in finallink: - self.log_error("Broken for link %s" % link) + self.log_error(_("Broken for link: %s") % link) else: linklist.append(finallink) -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/crypter/SexuriaCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 0db90b73b..12cea638d 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -9,6 +9,7 @@ class SexuriaCom(Crypter): __name__ = "SexuriaCom" __type__ = "crypter" __version__ = "0.04" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/crypter/SexuriaCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/SexuriaCom.py') diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 12cea638d..7942d5e42 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -9,7 +9,7 @@ class SexuriaCom(Crypter): __name__ = "SexuriaCom" __type__ = "crypter" __version__ = "0.04" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), -- cgit v1.2.3