getConfig instead getConf for all

5 files changed, 15 insertions, 15 deletions

diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index a5a973b7f..f55589fec 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -58,7 +58,7 @@ class ExtractArchive(Hook):
     Provides: unrarFinished (folder, filename)
     """
     __name__ = "ExtractArchive"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __description__ = "Extract different kind of archives"
     __config__ = [("activated", "bool", "Activated", True),
         ("fullpath", "bool", "Extract full path", True),
@@ -153,7 +153,7 @@ class ExtractArchive(Hook):
                 out = save_join(dl, p.folder, self.getConfig("destination"), "")
                 #relative to package folder if destination is relative, otherwise absolute path overwrites them
 
-                if self.getConf("subfolder"):
+                if self.getConfig("subfolder"):
                     out = join(out, fs_encode(p.folder))
 
                 if not exists(out):
diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py
index 23048b831..d4422afc3 100644
--- a/module/plugins/hoster/VeehdCom.py
+++ b/module/plugins/hoster/VeehdCom.py
@@ -11,7 +11,7 @@ class VeehdCom(Hoster):
         ('filename_spaces', 'bool', "Allow spaces in filename", 'False'),
         ('replacement_char', 'str', "Filename replacement character", '_'),
     ]
-    __version__ = '0.2'
+    __version__ = '0.21'
     __description__ = """Veehd.com Download Hoster"""
     __author_name__ = ('cat')
     __author_mail__ = ('cat@pyload')
@@ -55,12 +55,12 @@ class VeehdCom(Hoster):
         name = match.group(1)
         
         # replace unwanted characters in filename
-        if self.getConf('filename_spaces'):
+        if self.getConfig('filename_spaces'):
             pattern = '[^0-9A-Za-z\.\ ]+'
         else:
             pattern = '[^0-9A-Za-z\.]+'
             
-        name = re.sub(pattern, self.getConf('replacement_char'),
+        name = re.sub(pattern, self.getConfig('replacement_char'),
             name)
         return name + '.avi'
 
diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py
index 0779a78e6..866c5da45 100644
--- a/module/plugins/hoster/XHamsterCom.py
+++ b/module/plugins/hoster/XHamsterCom.py
@@ -17,7 +17,7 @@ class XHamsterCom(Hoster):
     __name__ = "XHamsterCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?xhamster\.com/movies/.+"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
     __description__ = """XHamster.com Video Download Hoster"""
 
@@ -31,7 +31,7 @@ class XHamsterCom(Hoster):
             self.offline()
 
         if self.getConfig("type"):
-            self.desired_fmt = self.getConf("type")    
+            self.desired_fmt = self.getConfig("type")    
            
         self.pyfile.name = self.get_file_name() + self.desired_fmt
         self.download(self.get_file_url())
diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py
index 6f0a1b176..3e66b966a 100644
--- a/module/plugins/hoster/Xdcc.py
+++ b/module/plugins/hoster/Xdcc.py
@@ -32,7 +32,7 @@ from module.plugins.Hoster import Hoster
 

 class Xdcc(Hoster):

     __name__ = "Xdcc"

-    __version__ = "0.3"

+    __version__ = "0.31"

     __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/

     __type__ = "hoster"

     __config__ = [

@@ -91,9 +91,9 @@ class Xdcc(Hoster):
         chan   = m.group(2)

         bot    = m.group(3)

         pack   = m.group(4)

-        nick   = self.getConf('nick')

-        ident  = self.getConf('ident')

-        real   = self.getConf('realname')

+        nick   = self.getConfig('nick')

+        ident  = self.getConfig('ident')

+        real   = self.getConfig('realname')

         

         temp = server.split(':')

         ln = len(temp)

diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 70db597cf..e3eddf638 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -34,7 +34,7 @@ class YoutubeCom(Hoster):
     __name__ = "YoutubeCom"
     __type__ = "hoster"
     __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*"
-    __version__ = "0.32"
+    __version__ = "0.33"
     __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"),
         ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0),
         (".mp4", "bool", "Allow .mp4", True),
@@ -83,17 +83,17 @@ class YoutubeCom(Hoster):
             self.tempOffline()
 
         #get config
-        use3d = self.getConf("3d")
+        use3d = self.getConfig("3d")
         if use3d:
             quality = {"sd":82,"hd":84,"fullhd":85,"240p":83,"360p":82,"480p":82,"720p":84,"1080p":85,"3072p":85}
         else:
             quality = {"sd":18,"hd":22,"fullhd":37,"240p":5,"360p":18,"480p":35,"720p":22,"1080p":37,"3072p":38}
-        desired_fmt = self.getConf("fmt")
+        desired_fmt = self.getConfig("fmt")
         if desired_fmt and desired_fmt not in self.formats:
             self.logWarning("FMT %d unknown - using default." % desired_fmt)
             desired_fmt = 0
         if not desired_fmt:
-            desired_fmt = quality.get(self.getConf("quality"), 18)
+            desired_fmt = quality.get(self.getConfig("quality"), 18)
 
         #parse available streams
         streams = re.search(r'"url_encoded_fmt_stream_map": "(.*?)",', html).group(1)