diff options
Diffstat (limited to 'module/plugins/crypter/DailymotionComFolder.py')
| -rw-r--r-- | module/plugins/crypter/DailymotionComFolder.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index 35db79a0d..04eb4d939 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -3,21 +3,20 @@ import re import urlparse -from module.plugins.internal.Crypter import Crypter, create_getInfo -from module.plugins.internal.utils import fs_join, json +from module.plugins.internal.Crypter import Crypter +from module.plugins.internal.misc import fsjoin, json class DailymotionComFolder(Crypter): __name__ = "DailymotionComFolder" __type__ = "crypter" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] + __config__ = [("activated" , "bool" , "Activated" , True ), + ("use_premium" , "bool" , "Use premium account if available", True ), + ("folder_per_package", "Default;Yes;No", "Create folder for each package" , "Default")] __description__ = """Dailymotion.com channel & playlist decrypter""" __license__ = "GPLv3" @@ -101,9 +100,6 @@ class DailymotionComFolder(Crypter): for p_id, p_name, p_owner in playlists: p_videos = self.get_videos(p_id) - p_folder = fs_join(self.pyload.config.get("general", "download_folder"), p_owner, p_name) + p_folder = fsjoin(self.pyload.config.get("general", "download_folder"), p_owner, p_name) self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) self.packages.append((p_name, p_videos, p_folder)) #@NOTE: Folder is NOT recognized by pyload 0.4.9! - - -getInfo = create_getInfo(DailymotionComFolder) |