linkdecrypter api (thx flowlee), fix uloz.to, 1fichier - closed #493, #494, #496

1 files changed, 12 insertions, 5 deletions

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d4d74057e..12b629a81 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -20,13 +20,14 @@ from urlparse import urlparse
 import re
 
 from module.plugins.Hoster import Hoster
-from module.utils import html_unescape, parseFileSize
+from module.utils import html_unescape, fixup, parseFileSize
 from module.network.RequestFactory import getURL
 
 def reSub(string, ruleslist):
     for r in ruleslist:
         rf, rt = r
         string = re.sub(rf, rt, string)
+        #self.logDebug(rf, rt, string)
     return string
     
 def parseHtmlTagAttrValue(attr_name, tag):
@@ -81,7 +82,7 @@ class PluginParseError(Exception):
 
 class SimpleHoster(Hoster):
     __name__ = "SimpleHoster"
-    __version__ = "0.15"
+    __version__ = "0.16"
     __pattern__ = None
     __type__ = "hoster"
     __description__ = """Base hoster plugin"""
@@ -97,7 +98,7 @@ class SimpleHoster(Hoster):
     """
 
     FILE_SIZE_REPLACEMENTS = []
-    FILE_NAME_REPLACEMENTS = []
+    FILE_NAME_REPLACEMENTS = [("&#?\w+;", fixup)]
     FILE_URL_REPLACEMENTS = []
 
     def setup(self):
@@ -107,7 +108,7 @@ class SimpleHoster(Hoster):
         pyfile.url = reSub(pyfile.url, self.FILE_URL_REPLACEMENTS)
         self.html = self.load(pyfile.url, decode = True)
         self.file_info = self.getFileInfo()
-        if self.account:
+        if self.premium:
             self.handlePremium()
         else:
             self.handleFree()
@@ -156,4 +157,10 @@ class SimpleHoster(Hoster):
                 name = parseHtmlTagAttrValue("name", input.group(1))
                 if name:
                     inputs[name] = parseHtmlTagAttrValue("value", input.group(1)) 
-        return action, inputs
\ No newline at end of file
+        return action, inputs
+    
+    def checkTrafficLeft(self):                   
+        traffic = self.account.getAccountInfo(self.user, True)["trafficleft"]
+        size = self.pyfile.size / 1024
+        self.logInfo("Filesize: %i KiB, Traffic left for user %s: %i KiB" % (size, self.user, traffic))               
+        return  size <= traffic
\ No newline at end of file