summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/YoutubeComFolder.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/crypter/YoutubeComFolder.py')
-rw-r--r--module/plugins/crypter/YoutubeComFolder.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py
index bb3086cf4..b7b51aeef 100644
--- a/module/plugins/crypter/YoutubeComFolder.py
+++ b/module/plugins/crypter/YoutubeComFolder.py
@@ -14,12 +14,13 @@ class YoutubeComFolder(Crypter):
__status__ = "testing"
__pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)'
- __config__ = [("activated" , "bool", "Activated" , True),
- ("use_subfolder" , "bool", "Save package to subfolder" , True ),
- ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ),
- ("likes" , "bool", "Grab user (channel) liked videos" , False),
- ("favorites" , "bool", "Grab user (channel) favorite videos", False),
- ("uploads" , "bool", "Grab channel unplaylisted videos" , True )]
+ __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 ),
+ ("likes" , "bool", "Grab user (channel) liked videos" , False),
+ ("favorites" , "bool", "Grab user (channel) favorite videos", False),
+ ("uploads" , "bool", "Grab channel unplaylisted videos" , True )]
__description__ = """Youtube.com channel & playlist decrypter plugin"""
__license__ = "GPLv3"
@@ -108,9 +109,7 @@ class YoutubeComFolder(Crypter):
playlists = self.get_playlists(channel['id'])
self.log_debug("%s playlist\s found on channel \"%s\"" % (len(playlists), channel['title']))
- relatedplaylist = dict()
- for p_name, p_id in channel['relatedPlaylists'].items():
- relatedplaylist.update({p_name: self.get_playlist(p_id)})
+ relatedplaylist = dict((p_name, self.get_playlist(p_id)) for p_name, p_id in channel['relatedPlaylists'].items())
self.log_debug("Channel's related playlists found = %s" % relatedplaylist.keys())