Tiny fixes

5 files changed, 12 insertions, 10 deletions

diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index b6fd0ca2d..b58d0b61d 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -63,7 +63,7 @@ class AntiVirus(Addon):
                     return
 
             if p.returncode:
-                pyfile.error = _("infected file")
+                pyfile.error = _("Infected file")
                 action = self.get_config('action')
                 try:
                     if action == "Delete":
diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py
index 9049f0cd9..4afba0a3a 100644
--- a/module/plugins/hoster/MegaDebridEu.py
+++ b/module/plugins/hoster/MegaDebridEu.py
@@ -10,7 +10,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class MegaDebridEu(MultiHoster):
     __name__    = "MegaDebridEu"
     __type__    = "hoster"
-    __version__ = "0.49"
+    __version__ = "0.50"
     __status__  = "testing"
 
     __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+'
@@ -30,9 +30,9 @@ class MegaDebridEu(MultiHoster):
         Connexion to the mega-debrid API
         Return True if succeed
         """
-        user, data = self.account.select()
+        user, info = self.account.select()
         jsonResponse = self.load(self.API_URL,
-                                 get={'action': 'connectUser', 'login': user, 'password': data['password']})
+                                 get={'action': 'connectUser', 'login': user, 'password': info['login']['password']})
         res = json_loads(jsonResponse)
 
         if res['response_code'] == "ok":
diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py
index 785d2b6c4..62e6bee4e 100644
--- a/module/plugins/hoster/RPNetBiz.py
+++ b/module/plugins/hoster/RPNetBiz.py
@@ -9,7 +9,7 @@ from module.common.json_layer import json_loads
 class RPNetBiz(MultiHoster):
     __name__    = "RPNetBiz"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __pattern__ = r'https?://.+rpnet\.biz'
@@ -26,12 +26,12 @@ class RPNetBiz(MultiHoster):
 
 
     def handle_premium(self, pyfile):
-        user, data = self.account.select()
+        user, info = self.account.select()
 
         #: Get the download link
         res = self.load("https://premium.rpnet.biz/client_api.php",
                         get={'username': user,
-                             'password': data['password'],
+                             'password': info['login']['password'],
                              'action'  : "generate",
                              'links'   : pyfile.url})
 
@@ -50,7 +50,7 @@ class RPNetBiz(MultiHoster):
                 self.log_debug("Try: %d ; Max Tries: %d" % (my_try, max_tries))
                 res = self.load("https://premium.rpnet.biz/client_api.php",
                                 get={'username': user,
-                                     'password': data['password'],
+                                     'password': info['login']['password'],
                                      'action'  : "downloadInformation",
                                      'id'      : link_status['id']})
                 self.log_debug("JSON data hdd query: %s" % res)
diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py
index ad69c1669..36f0c766e 100644
--- a/module/plugins/hoster/UploadingCom.py
+++ b/module/plugins/hoster/UploadingCom.py
@@ -4,13 +4,14 @@ import pycurl
 import re
 
 from module.common.json_layer import json_loads
+from module.plugins.internal.Plugin import encode
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp
 
 
 class UploadingCom(SimpleHoster):
     __name__    = "UploadingCom"
     __type__    = "hoster"
-    __version__ = "0.42"
+    __version__ = "0.43"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)'
@@ -61,7 +62,7 @@ class UploadingCom(SimpleHoster):
     def handle_free(self, pyfile):
         m = re.search('<h2>((Daily )?Download Limit)</h2>', self.html)
         if m:
-            pyfile.error = m.group(1)
+            pyfile.error = encode(m.group(1))
             self.log_warning(pyfile.error)
             self.retry(6, (6 * 60 if m.group(2) else 15) * 60, pyfile.error)
 
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index ac6b4a57e..62eb17aa6 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -347,6 +347,7 @@ class Plugin(object):
                 with open(framefile, "wb") as f:
                     del frame  #: Delete the frame or it wont be cleaned
                     f.write(encode(res))
+
             except IOError, e:
                 self.log_error(e)