diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-11 00:36:45 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-11 00:36:45 +0100 |
| commit | 395ac7930ef4e1598186a7a0636d3f245b7e5134 (patch) | |
| tree | c0951235ffbcf0138a7d7c61a214cb2d42f7e8bb | |
| parent | [Captcha9kw] Some fixes (thx Nippey) (diff) | |
| download | pyload-395ac7930ef4e1598186a7a0636d3f245b7e5134.tar.xz | |
Fix url to name conversion in api and simple plugins
| -rw-r--r-- | module/Api.py | 9 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/module/Api.py b/module/Api.py index c038ccaad..551085b51 100644 --- a/module/Api.py +++ b/module/Api.py @@ -22,12 +22,13 @@ from os.path import join from time import time import re +from urlparse import urlparse + from PyFile import PyFile -from utils import freeSpace, compare_time from common.packagetools import parseNames from network.RequestFactory import getURL from remote import activated -from utils import save_path +from utils import compare_time, freeSpace, html_unescape, save_path if activated: try: @@ -318,10 +319,12 @@ class Api(Iface): :return: package id of the new package """ if self.core.config['general']['folder_per_package']: - folder = save_path(name.replace("http://", "").replace(":", "").replace("/", "_").replace("\\", "_")) + folder = urlparse(html_unescape(name)).path.split("/")[-1] else: folder = "" + folder = save_path(folder) + pid = self.core.files.addPackage(name, folder, dest) self.core.files.addLinks(links, pid) diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 69cbb7051..0e43496c4 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -129,7 +129,7 @@ class SimpleCrypter(Crypter): if name and name != url: self.pyfile.name = name else: - self.pyfile.name = self.info['name'] = html_unescape(urlparse(url).path.split("/")[-1]) + self.pyfile.name = self.info['name'] = urlparse(html_unescape(name)).path.split("/")[-1] if status is 1: self.offline() diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 6a8a6ff6f..6726d4fa5 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -329,7 +329,7 @@ class SimpleHoster(Hoster): if name and name != url: self.pyfile.name = name else: - self.pyfile.name = self.info['name'] = html_unescape(urlparse(url).path.split("/")[-1]) + self.pyfile.name = self.info['name'] = urlparse(html_unescape(name)).path.split("/")[-1] if status is 1: self.offline() |