Spare plugin updates

17 files changed, 23 insertions, 22 deletions

diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index acd7a547b..2fc266722 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -9,7 +9,7 @@ from module.common.json_layer import json_loads
 class RapidgatorNet(Account):
     __name__    = "RapidgatorNet"
     __type__    = "account"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __status__  = "testing"
 
     __description__ = """Rapidgator.net account plugin"""
@@ -17,7 +17,7 @@ class RapidgatorNet(Account):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    API_URL = "http://rapidgator.net/api/user"
+    API_URL = "http://rapidgator.net/api/user/"
 
 
     def parse_info(self, user, password, data, req):
@@ -30,7 +30,7 @@ class RapidgatorNet(Account):
             sid = self.get_data(user).get('sid', None)
             assert sid
 
-            html = self.load(urlparse.urljoin(self.API_URL, "user/info"),
+            html = self.load(urlparse.urljoin(self.API_URL, "info"),
                              get={'sid': sid})
 
             self.log_debug("API:USERINFO", html)
@@ -58,7 +58,7 @@ class RapidgatorNet(Account):
 
     def login(self, user, password, data, req):
         try:
-            html = self.load(urlparse.urljoin(self.API_URL, "user/login"),
+            html = self.load(urlparse.urljoin(self.API_URL, "login"),
                              post={'username': user,
                                    'password': password})
 
diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py
index 8340adeb8..6c50c8480 100644
--- a/module/plugins/crypter/DevhostStFolder.py
+++ b/module/plugins/crypter/DevhostStFolder.py
@@ -42,7 +42,7 @@ class DevhostStFolder(SimpleCrypter):
 
             p = r'href="(.+?)">Back to \w+<'
             m = re.search(p, self.html)
-            html = self.load(urlparse.urljoin("http://d-h.st", m.group(1)),
+            html = self.load(urlparse.urljoin("http://d-h.st/", m.group(1)),
                              cookies=False)
 
             p = '\?fld_id=%s.*?">(.+?)<' % self.info['pattern']['ID']
diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index b4326b679..23e6dfa4a 100644
--- a/module/plugins/crypter/MultiUpOrg.py
+++ b/module/plugins/crypter/MultiUpOrg.py
@@ -34,7 +34,7 @@ class MultiUpOrg(SimpleCrypter):
             pattern = r'style="width:97%;text-align:left".*\n.*href="(.*)"'
             if m_type == "download":
                 dl_pattern = r'href="(.*)">.*\n.*<h5>DOWNLOAD</h5>'
-                miror_page = urlparse.urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1))
+                miror_page = urlparse.urljoin("http://www.multiup.org/", re.search(dl_pattern, self.html).group(1))
                 self.html = self.load(miror_page)
 
         return re.findall(pattern, self.html)
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 9ad2ac1fa..4ec526d35 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -79,7 +79,7 @@ class ExternalScripts(Addon):
                 self.log_warning(_("Script not executable: [%s] %s") % (name, file))
 
             self.scripts[name].append(file)
-            self.log_info(_("Registered script: [%s] %s") % (name, file))            
+            self.log_info(_("Registered script: [%s] %s") % (name, file))
 
 
     @Expose
diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index d1820b224..5a65146b9 100644
--- a/module/plugins/hooks/HotFolder.py
+++ b/module/plugins/hooks/HotFolder.py
@@ -14,7 +14,7 @@ from module.utils import fs_encode, save_join as fs_join
 class HotFolder(Addon):
     __name__    = "HotFolder"
     __type__    = "hook"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __config__ = [("folder"    , "str" , "Folder to observe"    , "container"),
diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py
index bf437fb6d..6930afdb5 100644
--- a/module/plugins/hooks/LinkdecrypterComHook.py
+++ b/module/plugins/hooks/LinkdecrypterComHook.py
@@ -21,7 +21,6 @@ class LinkdecrypterComHook(MultiHook):
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
-    COOKIES = False
 
     def get_hosters(self):
         list = re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)',
diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index 8f092ad0c..17e3ee93c 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -40,7 +40,7 @@ class CrockoCom(SimpleHoster):
         for _i in xrange(5):
             m = re.search(self.CAPTCHA_PATTERN, self.html)
             if m:
-                url = urlparse.urljoin("http://crocko.com", m.group(1))
+                url = urlparse.urljoin("http://crocko.com/", m.group(1))
                 self.wait(m.group(2))
                 self.html = self.load(url)
             else:
diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py
index 62a7a553f..978861dd6 100644
--- a/module/plugins/hoster/FileSharkPl.py
+++ b/module/plugins/hoster/FileSharkPl.py
@@ -78,7 +78,7 @@ class FileSharkPl(SimpleHoster):
         if m is None:
             self.error(_("Download url not found"))
 
-        link = urlparse.urljoin("http://fileshark.pl", m.group(1))
+        link = urlparse.urljoin("http://fileshark.pl/", m.group(1))
 
         self.html = self.load(link)
 
diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py
index 2798d9eda..3c11f1d16 100644
--- a/module/plugins/hoster/FileboomMe.py
+++ b/module/plugins/hoster/FileboomMe.py
@@ -37,7 +37,7 @@ class FileboomMe(SimpleHoster):
 
 
     def handle_free(self, pyfile):
-        post_url = urljoin(pyfile.url, "/file/" + self.info['pattern']['ID'])
+        post_url = urljoin(pyfile.url, "file/" + self.info['pattern']['ID'])
 
         m = re.search(r'data-slow-id="(\w+)"', self.html)
         if m:
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 5352e0261..21e643171 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -8,10 +8,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MediafireCom(SimpleHoster):
     __name__    = "MediafireCom"
     __type__    = "hoster"
-    __version__ = "0.90"
+    __version__ = "0.91"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)(?P<ID>\w*)'
+    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)(?P<ID>\w+)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Mediafire.com hoster plugin"""
diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py
index b0d4a4960..a20c23954 100644
--- a/module/plugins/hoster/NarodRu.py
+++ b/module/plugins/hoster/NarodRu.py
@@ -49,7 +49,7 @@ class NarodRu(SimpleHoster):
 
             m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
-                self.link = urlparse.urljoin("http://narod.ru", m.group(1))
+                self.link = urlparse.urljoin("http://narod.ru/", m.group(1))
                 self.captcha.correct()
                 break
 
diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index 7cbcb4d40..12e88cf1c 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -58,7 +58,7 @@ class UloziskoSk(SimpleHoster):
         if m is None:
             self.error(_("CAPTCHA_PATTERN not found"))
 
-        captcha_url = urlparse.urljoin("http://www.ulozisko.sk", m.group(1))
+        captcha_url = urlparse.urljoin("http://www.ulozisko.sk/", m.group(1))
         captcha = self.captcha.decrypt(captcha_url, cookies=True)
 
         self.log_debug("CAPTCHA_URL:" + captcha_url + ' CAPTCHA:' + captcha)
diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py
index ac2589f47..d4b7d6dd4 100644
--- a/module/plugins/hoster/UnibytesCom.py
+++ b/module/plugins/hoster/UnibytesCom.py
@@ -65,7 +65,7 @@ class UnibytesCom(SimpleHoster):
                 self.wait(m.group(1) if m else 60, False)
 
             elif last_step in ("captcha", "last"):
-                post_data['captcha'] = self.captcha.decrypt(urlparse.urljoin(domain, "/captcha.jpg"))
+                post_data['captcha'] = self.captcha.decrypt(urlparse.urljoin(domain, "captcha.jpg"))
 
         else:
             self.fail(_("No valid captcha code entered"))
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 890a1698a..697f1febd 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -31,7 +31,7 @@ class UploadedTo(SimpleHoster):
 
     OFFLINE_PATTERN      = r'>Page not found'
     TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance'
-    PREMIUM_ONLY_PATTERN = r'This file exceeds the max\. filesize which can be downloaded by free users\.'
+    PREMIUM_ONLY_PATTERN = r'This file exceeds the max\. filesize which can be downloaded by free users'
 
     LINK_FREE_PATTERN    = r"url:\s*'(.+?)'"
     LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"'
diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 2af0f32fc..ded0d60dd 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -44,7 +44,7 @@ class UploadheroCom(SimpleHoster):
         if m is None:
             self.error(_("Captcha not found"))
 
-        captcha = self.captcha.decrypt(urlparse.urljoin("http://uploadhero.co", m.group(1)))
+        captcha = self.captcha.decrypt(urlparse.urljoin("http://uploadhero.co/", m.group(1)))
 
         self.html = self.load(pyfile.url,
                               get={'code': captcha})
@@ -58,7 +58,7 @@ class UploadheroCom(SimpleHoster):
     def check_errors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
-            self.html = self.load(urlparse.urljoin("http://uploadhero.co", m.group(1)))
+            self.html = self.load(urlparse.urljoin("http://uploadhero.co/", m.group(1)))
 
             m = re.search(self.IP_WAIT_PATTERN, self.html)
             wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 5 * 60
diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py
index e0e90a311..0c1a028f8 100644
--- a/module/plugins/hoster/YibaishiwuCom.py
+++ b/module/plugins/hoster/YibaishiwuCom.py
@@ -37,7 +37,7 @@ class YibaishiwuCom(SimpleHoster):
 
         self.log_debug(('FREEUSER' if m.group(2) == "download" else 'GUEST') + ' URL', url)
 
-        res = json_loads(self.load(urlparse.urljoin("http://115.com", url), decode=False))
+        res = json_loads(self.load(urlparse.urljoin("http://115.com/", url), decode=False))
         if "urls" in res:
             mirrors = res['urls']
 
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index e0f6b1ee8..5a4cc35fb 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -11,7 +11,7 @@ from module.plugins.internal.Plugin import parse_html_form, set_cookie
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.42"
+    __version__ = "0.43"
     __status__  = "testing"
 
     __description__ = """XFileSharing account plugin"""
@@ -151,6 +151,8 @@ class XFSAccount(Account):
 
         if not self.HOSTER_URL:
             self.login_fail(_("Missing HOSTER_URL"))
+        else:
+            self.HOSTER_URL = self.HOSTER_URL.rstrip('/') + "/"
 
         if not self.LOGIN_URL:
             self.LOGIN_URL  = urlparse.urljoin(self.HOSTER_URL, "login.html")