Fix url to name conversion in api and simple plugins

1 files changed, 6 insertions, 3 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)