diff options
Diffstat (limited to 'module/plugins/crypter/NetfolderIn.py')
| -rw-r--r-- | module/plugins/crypter/NetfolderIn.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 99b39b335..9d27c33d6 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -36,7 +36,7 @@ class NetfolderIn(Crypter): def isPasswordProtected(self): if '<input type="password" name="password"' in self.html: - self.log.debug("NetfolderIn: Links are password protected") + self.log.debug("%s: Links are password protected" % self.__name__) return True return False @@ -47,19 +47,19 @@ class NetfolderIn(Crypter): m = re.match(self.__pattern__, self.pyfile.url) id = max(m.group('id1'), m.group('id2')) except AttributeError: - self.log.debug("NetfolderIn: Unable to get package id from url [%s]" % (url)) + self.log.debug("%s: Unable to get package id from url [%s]" % (self.__name__, url)) return url = "http://netfolder.in/folder.php?folder_id=" + id password = self.pyfile.package().password # Submit package password post = { 'password' : password, 'save' : 'Absenden' } - self.log.debug("NetfolderIn: Submitting password [%s] for protected links with id [%s]" % (password, id)) + self.log.debug("%s: Submitting password [%s] for protected links with id [%s]" % (self.__name__, password, id)) html = self.load(url, {}, post) # Check for invalid password if '<div class="InPage_Error">' in html: - self.log.debug("NetfolderIn: Incorrect password, please set right password on Edit package form and retry") + self.log.debug("%s: Incorrect password, please set right password on Edit package form and retry" % self.__name__) return None return html @@ -70,18 +70,16 @@ class NetfolderIn(Crypter): m = re.search(title_re, self.html) if m is not None: name = folder = m.group('title') - self.log.debug("NetfolderIn: Found name [%s] and folder [%s] in package info" % (name, folder)) + self.log.debug("%s: Found name [%s] and folder [%s] in package info" % (self.__name__, name, folder)) return (name, folder) else: name = self.pyfile.package().name folder = self.pyfile.package().folder - self.log.debug("NetfolderIn: Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) + self.log.debug("%s: Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (self.__name__, name, folder)) return (name, folder) def getLinks(self): links = re.search(r'name="list" value="(.*?)"', self.html).group(1).split(",") - #links = re.findall(r'href="(http://(?:www\.)?netload\.in/(?:datei\w+/.*?|index.php\?.*?file_id=\w+))"', self.html) - #links = [x[0] for x in links] - self.log.debug("NetfolderIn: Package has %d links" % len(links)) + self.log.debug("%s: Package has %d links" % (self.__name__, len(links))) return links |