diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-10-24 15:14:09 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-10-24 15:14:09 +0200 |
| commit | 41bb3cfda6b0ed2953d8333929f3a7e6943b94a8 (patch) | |
| tree | 8e12182bfeba93d68d0f4abd0f8723ab8d729346 | |
| parent | closed #154, closed #162 (diff) | |
| download | pyload-41bb3cfda6b0ed2953d8333929f3a7e6943b94a8.tar.xz | |
closed #162
| -rw-r--r-- | module/plugins/Plugin.py | 2 | ||||
| -rw-r--r-- | module/plugins/crypter/SerienjunkiesOrg.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 38076bf9c..5058ebdc8 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -355,7 +355,7 @@ class Plugin(object): if rule in content: if delete: remove(self.lastDownload) - return name, name + return name elif hasattr(rule, "match"): m = rule.match(content) if m: diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index cfd505db8..b12ca49c8 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __type__ = "container" __pattern__ = r"http://.*?serienjunkies.org/.*?" __version__ = "0.2" - __config__ = [ ("preferredHoster", "str", "preferred hoster" , "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,RapidshareDe") ] + __config__ = [ ("preferredHoster", "str", "preferred hoster" , "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom") ] __description__ = """serienjunkies.org Container Plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") @@ -23,7 +23,6 @@ class SerienjunkiesOrg(Crypter): "ut": "UploadedTo", "ul": "UploadedTo", "nl": "NetloadIn", - "rs": "RapidshareDe" } self.hosterMapReverse = dict((v,k) for k, v in self.hosterMap.iteritems()) |