summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-04 14:05:50 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-04 14:05:50 +0100
commita1d702007e16fb80294252e249d9e4e65ca906cd (patch)
tree14f1e746f8a33f5ba7936337bb6c8858cefbf09a
parentBetter download connection handling: Detect server error earlier, fallback to... (diff)
downloadpyload-a1d702007e16fb80294252e249d9e4e65ca906cd.tar.xz
little fix
-rw-r--r--module/network/HTTPDownload.py3
-rw-r--r--module/plugins/hoster/FilesonicCom.py5
-rw-r--r--module/remote/RemoteManager.py4
3 files changed, 4 insertions, 8 deletions
diff --git a/module/network/HTTPDownload.py b/module/network/HTTPDownload.py
index 13c674833..ec742596c 100644
--- a/module/network/HTTPDownload.py
+++ b/module/network/HTTPDownload.py
@@ -289,12 +289,9 @@ class HTTPDownload():
#sleep(0.003) #supress busy waiting - limits dl speed to (1 / x) * buffersize
self.m.select(1)
- failed = False
for chunk in self.chunks:
chunk.flushFile() #make sure downloads are written to disk
- if failed: raise BadHeader(failed)
-
self._copyChunks()
def updateProgress(self):
diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index a74bcc1c8..bb5152d29 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -119,10 +119,9 @@ class FilesonicCom(Hoster):
def downloadPremium(self):
self.logDebug("Premium download")
- api = self.API_ADDRESS + "/link?method=getDownloadLink&u=%s&p=%s&ids=%s" % (
- self.user, self.account.getAccountData(self.user)["password"], getId(self.pyfile.url))
+ api = self.API_ADDRESS + "/link?method=getDownloadLink&u=%%s&p=%%s&ids=%s" % getId(self.pyfile.url)
- result = json_loads(self.load(api))
+ result = json_loads(self.load(api % (self.user, self.account.getAccountData(self.user))))
links = result["FSApi_Link"]["getDownloadLink"]["response"]["links"]
#wupload seems to return list and no dicts
diff --git a/module/remote/RemoteManager.py b/module/remote/RemoteManager.py
index 6caedad90..36eb52a4a 100644
--- a/module/remote/RemoteManager.py
+++ b/module/remote/RemoteManager.py
@@ -64,8 +64,8 @@ class RemoteManager():
if self.core.remote:
self.available.append("ThriftBackend")
- else:
- self.available.append("SocketBackend")
+# else:
+# self.available.append("SocketBackend")
def startBackends(self):