diff options
| -rw-r--r-- | module/plugins/Plugin.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/FileserveCom.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 54900422c..e59977451 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -393,8 +393,8 @@ class Plugin(object): if delete: remove(self.lastDownload) return name - elif hasattr(rule, "match"): - m = rule.match(content) + elif hasattr(rule, "search"): + m = rule.search(content) if m: if delete: remove(self.lastDownload) diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index da1de9420..2e1bb1a59 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -103,16 +103,16 @@ class FileserveCom(Hoster): # this may either download our file or forward us to an error page
dl = self.download(self.pyfile.url, post={"download":"normal"})
- check = self.checkDownload({"expired": "Your download link has expired"},
- {"wait": re.compile(r'You need to wait (\d+) seconds to start another download')})
+ check = self.checkDownload({"expired": "Your download link has expired",
+ "wait": re.compile(r'You need to wait (\d+) seconds to start another download')})
if check == "expired":
self.retry()
elif check == "wait":
wait_time = 720
if self.lastCheck is not None:
- wait_time = self.lastCheck.group(1)
- self.setWait(wait_time)
+ wait_time = int(self.lastCheck.group(1))
+ self.setWait(wait_time+3)
self.log.debug("%s: You need to wait %d seconds for another download." % (self.__name__, wait_time))
self.wantReconnect = True
self.wait()
|