diff options
author | Stefano <l.stickell@yahoo.it> | 2013-04-06 22:15:34 +0200 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2013-04-06 22:15:34 +0200 |
commit | 920d06032d87f729180a35af1449ea3c43c7f4bc (patch) | |
tree | 3ac2275ee5789d878ba2825559e0ea613d7bc925 | |
parent | Using SimpleCrypter to avoid repeating getPackageNameAndFolder. (diff) | |
parent | UploadedToFolder: updated pattern (see #63) (diff) | |
download | pyload-920d06032d87f729180a35af1449ea3c43c7f4bc.tar.xz |
Merge branch 'stable' of https://github.com/pyload/pyload into stable
Conflicts:
module/plugins/crypter/UploadedToFolder.py
-rw-r--r-- | module/plugins/crypter/UploadedToFolder.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 7fe4de688..c514f23d0 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -23,8 +23,8 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class UploadedToFolder(SimpleCrypter):
__name__ = "UploadedToFolder"
__type__ = "crypter"
- __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|list)/(?P<id>\w+)"
- __version__ = "0.2"
+ __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)"
+ __version__ = "0.3"
__description__ = """UploadedTo Crypter Plugin"""
__author_name__ = ("stickell")
__author_mail__ = ("l.stickell@yahoo.it")
|