diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-06-15 21:06:10 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-06-24 22:38:26 +0200 |
| commit | 5a139055ae658d3a05cbb658cbd66aeae0d01db5 (patch) | |
| tree | b283d2f470fe2a4115474959e4982a59bc686067 /module/plugins/crypter | |
| parent | Merge pull request #1537 from GammaC0de/patch-1 (diff) | |
| download | pyload-5a139055ae658d3a05cbb658cbd66aeae0d01db5.tar.xz | |
Spare code cosmetics
Diffstat (limited to 'module/plugins/crypter')
| -rw-r--r-- | module/plugins/crypter/DailymotionComFolder.py | 4 | ||||
| -rw-r--r-- | module/plugins/crypter/RelinkUs.py | 4 | ||||
| -rw-r--r-- | module/plugins/crypter/YoutubeComFolder.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index 2458b15b1..26e870d31 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -5,7 +5,7 @@ import urlparse from module.common.json_layer import json_loads from module.plugins.internal.Crypter import Crypter -from module.utils import save_join +from module.utils import save_join as fs_join class DailymotionComFolder(Crypter): @@ -100,6 +100,6 @@ class DailymotionComFolder(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 = fs_join(self.core.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/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 7dfb3876f..316d44b4c 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -8,7 +8,7 @@ import os from Crypto.Cipher import AES from module.plugins.internal.Crypter import Crypter -from module.utils import save_join +from module.utils import save_join as fs_join class RelinkUs(Crypter): @@ -219,7 +219,7 @@ class RelinkUs(Crypter): try: dlc = self.load(container_url) dlc_filename = self.fileid + ".dlc" - dlc_filepath = save_join(self.config['general']['download_folder'], dlc_filename) + dlc_filepath = fs_join(self.core.config['general']['download_folder'], dlc_filename) with open(dlc_filepath, "wb") as f: f.write(dlc) package_links.append(dlc_filepath) diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index bcaa7effe..29a889615 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -5,7 +5,7 @@ import urlparse from module.common.json_layer import json_loads from module.plugins.internal.Crypter import Crypter -from module.utils import save_join +from module.utils import save_join as fs_join class YoutubeComFolder(Crypter): @@ -131,7 +131,7 @@ class YoutubeComFolder(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 = fs_join(self.core.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: |