summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2011-02-14 17:35:14 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2011-02-14 17:35:14 +0100
commitb06712803b73db3d04657e699ce17a3668151ae0 (patch)
treea233514be627c6d8a3b2a2abe4c03b3163ad1c1e /module
parentfixes, docstring update for gui (diff)
downloadpyload-b06712803b73db3d04657e699ce17a3668151ae0.tar.xz
really fixed #201
Diffstat (limited to 'module')
-rw-r--r--module/gui/MainWindow.py2
-rw-r--r--module/plugins/hoster/NetloadIn.py6
-rw-r--r--module/remote/thriftbackend/Handler.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/module/gui/MainWindow.py b/module/gui/MainWindow.py
index ff54e8d76..51476f114 100644
--- a/module/gui/MainWindow.py
+++ b/module/gui/MainWindow.py
@@ -693,7 +693,7 @@ class MainWindow(QMainWindow):
data = data[0].internalPointer()
- self.connector.removeAccount(data["type"], data["login"])
+ self.connector.removeAccount(data.type, data.login)
def slotAccountContextMenu(self, pos):
globalPos = self.tabs["accounts"]["view"].mapToGlobal(pos)
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index c952f2c19..b99694774 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -138,8 +138,8 @@ class NetloadIn(Hoster):
t = time() + 30
if "/share/templates/download_hddcrash.tpl" in page:
+ self.log.error("Netload HDD Crash")
self.fail(_("File temporarily not available"))
- self.log.debug("Netload HDD Crash")
if not self.api_data:
self.log.debug("API Data may be useless, get details from html page")
@@ -157,6 +157,10 @@ class NetloadIn(Hoster):
page = self.load(self.url)
t = time() + 30
+ if "/share/templates/download_hddcrash.tpl" in page:
+ self.log.error("Netload HDD Crash")
+ self.fail(_("File temporarily not available"))
+
self.log.debug("Netload: try number %d " % i)
if self.getConf('dumpgen'):
print page
diff --git a/module/remote/thriftbackend/Handler.py b/module/remote/thriftbackend/Handler.py
index b1a7349bc..51764a0f5 100644
--- a/module/remote/thriftbackend/Handler.py
+++ b/module/remote/thriftbackend/Handler.py
@@ -162,7 +162,7 @@ class Handler(Iface):
- links
- dest
"""
- return self.serverMethods.add_package(name, links, dest)
+ return self.serverMethods.add_package(name, links, 0 if dest == Destination.Collector else 1)
def getPackageData(self, pid):
"""