wupload premium (untested), new log functions for plugins, decode kwarg for requests

1 files changed, 14 insertions, 6 deletions

diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
index d8bd3bcd0..e4ec532d4 100644
--- a/module/plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -299,15 +299,12 @@ class Plugin(object):
         return result
 
 
-    def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False, utf8=False):
+    def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False, utf8=False, decode=False):
         """ returns the content loaded """
         if self.pyfile.abort: raise Abort
+        #utf8 vs decode -> please use decode attribute in all future plugins
 
-        res = self.req.load(url, get, post, ref, cookies, just_header)
-
-        if utf8:
-            res = self.req.http.decodeResponse(res)
-            #res = decode(res)
+        res = self.req.load(url, get, post, ref, cookies, just_header, decode=utf8 or decode)
 
         if self.core.debug:
             from inspect import currentframe
@@ -473,6 +470,17 @@ class Plugin(object):
 
             self.log.debug("File %s not skipped, because it does not exists." % self.pyfile.name)
 
+
+    #log functions
+    def logInfo(self, msg):
+        self.log.info("%s: %s" % (self.__name__, msg))
+    def logWarning(self, msg):
+        self.log.warning("%s: %s" % (self.__name__, msg))
+    def logError(self, msg):
+        self.log.error("%s: %s" % (self.__name__, msg))
+    def logDebug(self, msg):
+        self.log.debug("%s: %s" % (self.__name__, msg))
+
     def clean(self):
         """ clean everything and remove references """
         if hasattr(self, "pyfile"):