diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2015-02-28 22:34:54 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2015-02-28 22:34:54 +0100 |
| commit | e9f69e9df0fd1cd484670af180d64caea53eaa5c (patch) | |
| tree | b9e39821e948cb8dbe0adf79f9109f010314aef3 /pyload/plugin/crypter | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-e9f69e9df0fd1cd484670af180d64caea53eaa5c.tar.xz | |
safe_join -> fs_join
Diffstat (limited to 'pyload/plugin/crypter')
| -rw-r--r-- | pyload/plugin/crypter/DailymotionBatch.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/crypter/RelinkUs.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/crypter/YoutubeBatch.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py index 7afcccceb..cbf402f40 100644 --- a/pyload/plugin/crypter/DailymotionBatch.py +++ b/pyload/plugin/crypter/DailymotionBatch.py @@ -6,7 +6,7 @@ from urlparse import urljoin from pyload.utils import json_loads from pyload.plugin.Crypter import Crypter -from pyload.utils import safe_join +from pyload.utils import fs_join class DailymotionBatch(Crypter): @@ -101,6 +101,6 @@ class DailymotionBatch(Crypter): for p_id, p_name, p_owner in playlists: p_videos = self.getVideos(p_id) - p_folder = safe_join(self.config['general']['download_folder'], p_owner, p_name) + p_folder = fs_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/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py index 023024a82..d02d7a84d 100644 --- a/pyload/plugin/crypter/RelinkUs.py +++ b/pyload/plugin/crypter/RelinkUs.py @@ -8,7 +8,7 @@ import os from Crypto.Cipher import AES from pyload.plugin.Crypter import Crypter -from pyload.utils import safe_join +from pyload.utils import 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 = safe_join(self.config['general']['download_folder'], dlc_filename) + dlc_filepath = fs_join(self.config['general']['download_folder'], dlc_filename) with open(dlc_filepath, "wb") as f: f.write(dlc) package_links.append(dlc_filepath) diff --git a/pyload/plugin/crypter/YoutubeBatch.py b/pyload/plugin/crypter/YoutubeBatch.py index 3fea12ff0..1573cd36d 100644 --- a/pyload/plugin/crypter/YoutubeBatch.py +++ b/pyload/plugin/crypter/YoutubeBatch.py @@ -6,7 +6,7 @@ from urlparse import urljoin from pyload.utils import json_loads from pyload.plugin.Crypter import Crypter -from pyload.utils import safe_join +from pyload.utils import fs_join class YoutubeBatch(Crypter): @@ -132,7 +132,7 @@ class YoutubeBatch(Crypter): for p in playlists: p_name = p['title'] p_videos = self.getVideosId(p['id']) - p_folder = safe_join(self.config['general']['download_folder'], p['channelTitle'], p_name) + p_folder = fs_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: |