html_unescape function, little plugin improvements

4 files changed, 17 insertions, 10 deletions

diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py
index c20206bf5..869b8a99e 100644
--- a/module/plugins/hoster/FreakshareCom.py
+++ b/module/plugins/hoster/FreakshareCom.py
@@ -34,6 +34,11 @@ class FreakshareCom(Hoster):
             self.get_file_url()

 

             self.download(self.pyfile.url, post=self.req_opts)

+

+

+            check = self.checkDownload({"bad": "bad try"})

+            if check == "bad":

+                self.fail("Bad Try.")

         

     

     def prepare(self):

diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index fa16fdf31..342a8024d 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -7,7 +7,7 @@ from module.plugins.Hoster import Hoster
 

 from module.network.RequestFactory import getURL

 

-from module.unescape import unescape

+from module.utils import html_unescape

 from module.PyFile import statusMap

 

 from pycurl import error

@@ -36,7 +36,7 @@ def getInfo(urls):
         # File info

         fileInfo = _translateAPIFileInfo(apiFileId, apiFileDataMap, apiHosterMap)

         url = urls[i]

-        name = fileInfo.get('name', url)

+        name = html_unescape(fileInfo.get('name', url))

         size = fileInfo.get('size', 0)

         status = fileInfo.get('status', statusMap['queued'])

         

@@ -51,7 +51,7 @@ def _translateAPIFileInfo(apiFileId, apiFileDataMap, apiHosterMap):
     fileInfo = {}

     try:

         fileInfo['status'] = MegauploadCom.API_STATUS_MAPPING[apiFileDataMap[apiFileId]]

-        fileInfo['name'] = apiFileDataMap['n'] 

+        fileInfo['name'] = apiFileDataMap['n']

         fileInfo['size'] = int(apiFileDataMap['s'])

         fileInfo['hoster'] = apiHosterMap[apiFileDataMap['d']]        

     except:

@@ -215,10 +215,12 @@ class MegauploadCom(Hoster):
 

     def get_file_name(self):

         try:

-            return self.api["name"]

+            name =  self.api["name"]

         except KeyError:

             file_name_pattern = 'id="downloadlink"><a href="(.*)" onclick="'

-            return re.search(file_name_pattern, self.html[1]).group(1).split("/")[-1]

+            name = re.search(file_name_pattern, self.html[1]).group(1).split("/")[-1]

+

+        return html_unescape(name)

 

     def get_wait_time(self):

         time = re.search(r"count=(\d+);", self.html[1])

diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 95f6f91f9..96fa6fd36 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -8,8 +8,6 @@
 # * removed some (old?) comment blocks
 
 import re
-from os import stat, remove
-from time import sleep
 
 from module.network.RequestFactory import getURL
 from module.plugins.Hoster import Hoster
@@ -99,7 +97,7 @@ class RapidshareCom(Hoster):
             self.log.info(_("Rapidshare: Traffic Share (direct download)"))
             self.pyfile.name = self.get_file_name()
 
-            self.download(self.pyfile.url, get={"directstart":1}, cookies=True)
+            self.download(self.pyfile.url, get={"directstart":1})
         
         elif self.api_data["status"] in ("0","4","5"):
             self.offline()
@@ -133,7 +131,7 @@ class RapidshareCom(Hoster):
         info = self.account.getAccountInfo(self.user, True)
         self.log.debug("%s: Use Premium Account" % self.__name__)
         url = self.api_data["mirror"]
-        self.download(url, get={"directstart":1}, cookies=True)
+        self.download(url, get={"directstart":1})
 
 
     def download_api_data(self, force=False):
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 1b8cf6b4b..908869236 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -3,6 +3,8 @@
 
 import re
 import urllib
+
+from module.utils import html_unescape
 from module.plugins.Hoster import Hoster
 
 class YoutubeCom(Hoster):
@@ -89,6 +91,6 @@ class YoutubeCom(Hoster):
         if fmt in self.formats:
             file_suffix = self.formats[fmt][0]
         name = re.search(file_name_pattern, html).group(1).replace("/", "") + file_suffix
-        pyfile.name = name #.replace("&amp;", "&").replace("ö", "oe").replace("ä", "ae").replace("ü", "ue")       
+        pyfile.name = html_unescape(name)
 
         self.download(fmt_dict[fmt])