diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-07 23:50:03 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 10:59:52 +0200 |
| commit | 4cd693b5c4f2ede4ac4928b5b433b3932d64519a (patch) | |
| tree | 5a22ec483885290094ac38a06a8c3bf877856820 /module/plugins/crypter | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-4cd693b5c4f2ede4ac4928b5b433b3932d64519a.tar.xz | |
save_join -> safe_join & save_path -> safe_filename
Diffstat (limited to 'module/plugins/crypter')
| -rw-r--r-- | module/plugins/crypter/DailymotionBatch.py | 4 | ||||
| -rw-r--r-- | module/plugins/crypter/YoutubeBatch.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py index e43d4e1fd..e9a1bb98c 100644 --- a/module/plugins/crypter/DailymotionBatch.py +++ b/module/plugins/crypter/DailymotionBatch.py @@ -6,7 +6,7 @@ from urlparse import urljoin from module.common.json_layer import json_loads from module.plugins.Crypter import Crypter -from module.utils import save_join +from module.utils import safe_join class DailymotionBatch(Crypter): @@ -93,6 +93,6 @@ class DailymotionBatch(Crypter): for p_id, p_name, p_owner in playlists: p_videos = self.getVideos(p_id) - p_folder = save_join(self.config['general']['download_folder'], p_owner, p_name) + p_folder = safe_join(self.config['general']['download_folder'], p_owner, p_name) self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) self.packages.append((p_name, p_videos, p_folder)) #: folder is NOT recognized by pyload 0.4.9! diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index 1caca16bd..158dfeee9 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -6,7 +6,7 @@ from urlparse import urljoin from module.common.json_layer import json_loads from module.plugins.Crypter import Crypter -from module.utils import save_join +from module.utils import safe_join API_URL = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" @@ -122,7 +122,7 @@ class YoutubeBatch(Crypter): for p in playlists: p_name = p['title'] p_videos = self.getVideosId(p['id']) - p_folder = save_join(self.config['general']['download_folder'], p['channelTitle'], p_name) + p_folder = safe_join(self.config['general']['download_folder'], p['channelTitle'], p_name) self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) if not p_videos: |