rs fix

4 files changed, 10 insertions, 9 deletions

diff --git a/module/network/HTTPChunk.py b/module/network/HTTPChunk.py
index f911e5c68..ee143330e 100644
--- a/module/network/HTTPChunk.py
+++ b/module/network/HTTPChunk.py
@@ -139,7 +139,7 @@ class HTTPChunk(HTTPRequest):
         self.BOMChecked = False
         # check and remove byte order mark
 
-        self.rep = False
+        self.rep = None
 
         self.log = getLogger("log")
 
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index 060424ccc..e69f17e62 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -21,7 +21,7 @@ from module.plugins.Account import Account
 
 class RapidshareCom(Account):
     __name__ = "RapidshareCom"
-    __version__ = "0.2"
+    __version__ = "0.21"
     __type__ = "account"
     __description__ = """Rapidshare.com account plugin"""
     __author_name__ = ("mkaay")
@@ -30,7 +30,7 @@ class RapidshareCom(Account):
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param_prem = {"sub": "getaccountdetails_v1", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
+        api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
         src = req.load(api_url_base, cookies=False, get=api_param_prem)
         if src.startswith("ERROR"):
             raise Exception(src)
@@ -48,7 +48,7 @@ class RapidshareCom(Account):
     
     def login(self, user, data, req):
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param_prem = {"sub": "getaccountdetails_v1", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
+        api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
         src = req.load(api_url_base, cookies=False, get=api_param_prem)
         if src.startswith("ERROR"):
             raise Exception(src+"### Note you have to use your account number for login, instead of name.")
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 96fa6fd36..c9aba7898 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -2,6 +2,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+# v1.36
+# * fixed call checkfiles subroutine
 # v1.35
 # * fixed rs-urls in handleFree(..) and freeWait(..)
 # * removed getInfo(..) function as it was not used anywhere (in this file)
@@ -27,7 +29,7 @@ def getInfo(urls):
             ids+= ","+r.group("id_new")
             names+= ","+r.group("name_new")
     
-    url = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles_v1&files=%s&filenames=%s" % (ids[1:], names[1:])
+    url = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles&files=%s&filenames=%s" % (ids[1:], names[1:])
     
     api = getURL(url)
     result = []
@@ -48,7 +50,7 @@ class RapidshareCom(Hoster):
     __name__ = "RapidshareCom"
     __type__ = "hoster"
     __pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
-    __version__ = "1.35"
+    __version__ = "1.36"
     __description__ = """Rapidshare.com Download Hoster"""
     __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]] 
     __author_name__ = ("spoob", "RaNaN", "mkaay")
@@ -141,7 +143,7 @@ class RapidshareCom(Hoster):
         if self.api_data and not force:
             return
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param_file = {"sub": "checkfiles_v1", "incmd5": "1", "files": self.id, "filenames": self.name}
+        api_param_file = {"sub": "checkfiles", "incmd5": "1", "files": self.id, "filenames": self.name}
         src = self.load(api_url_base, cookies=False, get=api_param_file).strip()
         self.log.debug("RS INFO API: %s" % src)
         if src.startswith("ERROR"):
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 3998fdd6a..c733c943c 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -52,8 +52,7 @@ from module.web.ServerThread import WebServer
 from module.Scheduler import Scheduler
 from module.common.JsEngine import JsEngine
 from module.remote.RemoteManager import RemoteManager
-from module.database import DatabaseBackend
-from module.database import FileHandler
+from module.database import DatabaseBackend, FileHandler
 
 
 from module.utils import freeSpace, formatSize