diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-04-11 12:15:32 +0200 |
|---|---|---|
| committer |  Stefano <l.stickell@yahoo.it>
| 2014-04-21 17:19:42 +0200 |
| commit | 088e0e38fd7419951d31bbc389c95d1c662e550f (patch) | |
| tree | 7e30ff7ff49705a5d6c200dd4bfd795a6ccb6c1c /pyload/plugins/crypter | |
| parent | Fix __type__ for crypters (diff) | |
| download | pyload-088e0e38fd7419951d31bbc389c95d1c662e550f.tar.xz | |
Fix __config__
Merges vuolter/pyload@83ff313
(cherry picked from commit d27113cef108461e2363cc4c88c4a1d01222c9e9)
Conflicts:
module/plugins/Hook.py
module/plugins/hooks/MultiDebridCom.py
module/plugins/hooks/UnrestrictLi.py
Diffstat (limited to 'pyload/plugins/crypter')
| -rw-r--r-- | pyload/plugins/crypter/SerienjunkiesOrg.py | 18 | ||||
| -rw-r--r-- | pyload/plugins/crypter/YoutubeBatch.py | 6 |
2 files changed, 11 insertions, 13 deletions
diff --git a/pyload/plugins/crypter/SerienjunkiesOrg.py b/pyload/plugins/crypter/SerienjunkiesOrg.py index 177a83eda..b8e492baa 100644 --- a/pyload/plugins/crypter/SerienjunkiesOrg.py +++ b/pyload/plugins/crypter/SerienjunkiesOrg.py @@ -15,16 +15,14 @@ class SerienjunkiesOrg(Crypter): __type__ = "crypter" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" __version__ = "0.39" - __config__ = [ - ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), - ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), - ("randomPreferred", "bool", "Randomize Preferred-List", False), - ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", - "Use for hosters (if supported)", "All"), - ("hosterList", "str", "Preferred Hoster list (comma separated)", - "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), - ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom") - ] + __config__ = [("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), + ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), + ("randomPreferred", "bool", "Randomize Preferred-List", False), + ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", + "Use for hosters (if supported)", "All"), + ("hosterList", "str", "Preferred Hoster list (comma separated)", + "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), + ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom")] __description__ = """Serienjunkies.org decrypter plugin""" __author_name__ = ("mkaay", "godofdream") __author_mail__ = ("mkaay@mkaay.de", "soilfiction@gmail.com") diff --git a/pyload/plugins/crypter/YoutubeBatch.py b/pyload/plugins/crypter/YoutubeBatch.py index ce2769fe0..3c5415b3e 100644 --- a/pyload/plugins/crypter/YoutubeBatch.py +++ b/pyload/plugins/crypter/YoutubeBatch.py @@ -33,9 +33,9 @@ class YoutubeBatch(Crypter): __pattern__ = r"https?://(?:www\.)?(m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)" __version__ = "1.00" __description__ = """Youtube.com channel & playlist decrypter plugin""" - __config__ = [("likes", "bool", "Grab user (channel) liked videos", "False"), - ("favorites", "bool", "Grab user (channel) favorite videos", "False"), - ("uploads", "bool", "Grab channel unplaylisted videos", "True")] + __config__ = [("likes", "bool", "Grab user (channel) liked videos", False), + ("favorites", "bool", "Grab user (channel) favorite videos", False), + ("uploads", "bool", "Grab channel unplaylisted videos", True)] __author_name__ = "Walter Purcaro" __author_mail__ = "vuolter@gmail.com" |