diff options
| author |  zoidberg10 <zoidberg@mujmail.cz>
| 2011-09-27 11:09:20 +0200 |
|---|---|---|
| committer | zoidberg10 <zoidberg@mujmail.cz>
| 2011-09-27 11:09:20 +0200 |
| commit | 6bcb6ff8f35189baa0d1ec3d4a7ef8ebad3323c0 (patch) | |
| tree | 6a15519a2715151bf0c14516aa91a703b233c965 /module/plugins | |
| parent | plugins: fix czshare premium, add ifolder.ru, share-rapid.com by MikyWoW (diff) | |
| parent | SO fix (diff) | |
| download | pyload-6bcb6ff8f35189baa0d1ec3d4a7ef8ebad3323c0.tar.xz | |
Merge
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hoster/Ftp.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/ShareonlineBiz.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index ca0689c62..7c2af85ed 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -23,15 +23,14 @@ from module.plugins.Hoster import Hoster class Ftp(Hoster):
__name__ = "Ftp"
- __version__ = "0.3"
- __pattern__ = r'ftp://(.*?:.*?@)?.*?/.*' # ftp://user:password@ftp.server.org/path/to/file
+ __version__ = "0.31"
+ __pattern__ = r'(ftps?|sftp)://(.*?:.*?@)?.*?/.*' # ftp://user:password@ftp.server.org/path/to/file
__type__ = "hoster"
__description__ = """A Plugin that allows you to download from an from an ftp directory"""
__author_name__ = ("jeix", "mkaay")
__author_mail__ = ("jeix@hasnomail.com", "mkaay@mkaay.de")
def process(self, pyfile):
- self.req = pyfile.m.core.requestFactory.getRequest(self.__name__)
pyfile.name = self.pyfile.url.rpartition('/')[2]
self.chunkLimit = -1
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index afc7312f1..2a6645e86 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -101,6 +101,10 @@ class ShareonlineBiz(Hoster): if r"Der Download ist Ihnen zu langsam" not in self.html and r"The download is too slow for you" not in self.html: self.fail("Plugin defect. Save dumps and report.") + + if "Kein weiterer Download-Thread möglich!" in self.html: #TODO corresponding translation + self.retry(wait_time=30, reason=_("Parallel download issue")) + m = re.search("var wait=(\d+);", self.html[1]) wait_time = int(m.group(1)) if m else 30 self.setWait(wait_time) |