diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 13:35:34 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 13:35:34 +0200 |
| commit | 1066d65b9ed19d8e1b061c13fc0156d823fea800 (patch) | |
| tree | 4c1fcd3b0660d2ccb3ce4d2abc0077f1a7876725 /pyload/plugins/hoster/Ftp.py | |
| parent | Docs cleanup + remove script directory (diff) | |
| parent | [FTP] Restore pattern. (diff) | |
| download | pyload-1066d65b9ed19d8e1b061c13fc0156d823fea800.tar.xz | |
Merge remote-tracking branch 'pyload/stable' into 0.4.10
Conflicts:
module/plugins/accounts/MultiDebridCom.py
module/plugins/accounts/MyfastfileCom.py
module/plugins/hooks/MultiDebridCom.py
module/plugins/hooks/MyfastfileCom.py
module/plugins/hooks/Premium4Me.py
module/plugins/hooks/PremiumTo.py
module/plugins/hoster/MultiDebridCom.py
module/plugins/hoster/MyfastfileCom.py
module/plugins/hoster/Premium4Me.py
module/plugins/hoster/PremiumTo.py
pyload/plugins/accounts/MultiDebridCom.py
pyload/plugins/accounts/Premium4Me.py
pyload/plugins/hooks/MultiDebridCom.py
pyload/plugins/hooks/Premium4Me.py
pyload/plugins/hoster/MultiDebridCom.py
pyload/plugins/hoster/Premium4Me.py
Diffstat (limited to 'pyload/plugins/hoster/Ftp.py')
| -rw-r--r-- | pyload/plugins/hoster/Ftp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pyload/plugins/hoster/Ftp.py b/pyload/plugins/hoster/Ftp.py index f9b3865a7..641d93276 100644 --- a/pyload/plugins/hoster/Ftp.py +++ b/pyload/plugins/hoster/Ftp.py @@ -12,7 +12,9 @@ from pyload.plugins.Hoster import Hoster class Ftp(Hoster): __name__ = "Ftp" __type__ = "hoster" - __version__ = "0.41" + __version__ = "0.42" + + __pattern__ = r'(ftps?|sftp)://(.*?:.*?@)?.*?/.*' #: ftp://user:password@ftp.server.org/path/to/file __description__ = """Download from ftp directory""" __author_name__ = ("jeix", "mkaay", "zoidberg") |