diff options
| author |  mkaay <mkaay@mkaay.de>
| 2010-01-01 20:54:44 +0100 |
|---|---|---|
| committer | mkaay <mkaay@mkaay.de>
| 2010-01-01 20:54:44 +0100 |
| commit | d2ea03a068c9cbc43750d672aab7f2574ccfd9b4 (patch) | |
| tree | bcdce58f631507681a934794d5d4407008658d8f | |
| parent | fixed SerienjunkiesOrg, no more segfault in gui? (diff) | |
| download | pyload-d2ea03a068c9cbc43750d672aab7f2574ccfd9b4.tar.xz | |
fixed netload.in premium
| -rw-r--r-- | module/gui/Queue.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/module/gui/Queue.py b/module/gui/Queue.py index ed1c0f0a1..be2170309 100644 --- a/module/gui/Queue.py +++ b/module/gui/Queue.py @@ -130,7 +130,7 @@ class Queue(QObject): if not data["plugin"] in plugins: plugins.append(data["plugin"]) if status >= 0: - if speed == None: + if speed == None or self.statusMapReverse[status] == "starting" or self.statusMapReverse[status] == "decrypting": statustxt = self.statusMapReverse[status] else: statustxt = "%s (%s KB/s)" % (self.statusMapReverse[status], speed) diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 6941ad033..1f7e7d011 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -46,7 +46,7 @@ class NetloadIn(Plugin): pyfile.status.filename = self.get_file_name() if self.config['premium']: - self.req.load("http://netload.in/index.php", None, { "txtuser" : self.config['username'], "txtpass" : self.config['password'], "txtcheck" : "login", "txtlogin" : ""}) + self.req.load("http://netload.in/index.php", None, { "txtuser" : self.config['username'], "txtpass" : self.config['password'], "txtcheck" : "login", "txtlogin" : ""}, cookies=True) self.logger.info("Netload: Use Premium Account") pyfile.status.url = self.parent.url #@TODO: premium?? @@ -72,14 +72,15 @@ class NetloadIn(Plugin): apiurl = "http://netload.in/share/fileinfos2.php" src = self.req.load(apiurl, cookies=False, get={"file_id": match.group(1)}) self.api_data = {} - if src != "unknown file_data": + if not src == "unknown file_data": + print "apidata:", src lines = src.split(";") self.api_data["exists"] = True self.api_data["fileid"] = lines[0] self.api_data["filename"] = lines[1] self.api_data["size"] = lines[2] #@TODO formatting? (ex: '2.07 KB') self.api_data["status"] = lines[3] - self.api_data["checksum"] = lines[4].replace("\n", "") + self.api_data["checksum"] = lines[4].strip() else: self.api_data["exists"] = False |