diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-10-28 00:58:56 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-10-28 00:58:56 +0100 |
commit | 712ec761237eb989484b8c8f84fdf2d566500482 (patch) | |
tree | 9054ca99b3bf0c0938f6bec17c129e7ccfa43c96 /module/plugins/container | |
parent | Merge pull request #2125 from GammaC0de/patch-6 (diff) | |
download | pyload-712ec761237eb989484b8c8f84fdf2d566500482.tar.xz |
Fix https://github.com/pyload/pyload/issues/2112
Diffstat (limited to 'module/plugins/container')
-rw-r--r-- | module/plugins/container/CCF.py | 6 | ||||
-rw-r--r-- | module/plugins/container/DLC.py | 4 | ||||
-rw-r--r-- | module/plugins/container/RSDF.py | 6 | ||||
-rw-r--r-- | module/plugins/container/TXT.py | 8 |
4 files changed, 16 insertions, 8 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 3141009c3..563eaef6d 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -18,7 +18,9 @@ class CCF(Container): __status__ = "testing" __pattern__ = r'.+\.ccf$' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """CCF container decrypter plugin""" __license__ = "GPLv3" @@ -47,4 +49,4 @@ class CCF(Container): with open(dlc_file, "w") as tempdlc: tempdlc.write(dlc) - self.urls = [dlc_file] + self.links = [dlc_file] diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index 4694478a7..7b4364a0a 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -18,7 +18,9 @@ class DLC(Container): __status__ = "testing" __pattern__ = r'(.+\.dlc|[\w\+^_]+==[\w\+^_/]+==)$' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """DLC container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index f3d56f6f4..2401a79ce 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -18,7 +18,9 @@ class RSDF(Container): __status__ = "testing" __pattern__ = r'.+\.rsdf$' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """RSDF container decrypter plugin""" __license__ = "GPLv3" @@ -60,4 +62,4 @@ class RSDF(Container): if not link: continue link = cipher.decrypt(link.decode('base64')).replace('CCF: ', '') - self.urls.append(link) + self.links.append(link) diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 8d4b1b785..741538947 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -13,9 +13,11 @@ class TXT(Container): __status__ = "testing" __pattern__ = r'.+\.(txt|text)$' - __config__ = [("activated", "bool", "Activated", True), - ("flush" , "bool" , "Flush list after adding", False ), - ("encoding", "string", "File encoding" , "utf-8")] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True ), + ("flush" , "bool", "Flush list after adding" , False ), + ("encoding" , "str" , "File encoding" , "utf-8")] __description__ = """Read link lists in plain text formats""" __license__ = "GPLv3" |