summaryrefslogtreecommitdiffstats
path: root/pyload/cli/Cli.py
diff options
context:
space:
mode:
authorGravatar ardi69 <armin@diedering.de> 2015-04-21 06:51:24 +0200
committerGravatar ardi69 <armin@diedering.de> 2015-04-21 06:51:24 +0200
commit2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6 (patch)
treeb82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/cli/Cli.py
parentadded check of classname == filename (diff)
parentMerge branch 'pr/n10_ardi69' into 0.4.10 (diff)
downloadpyload-2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6.tar.xz
Merge pull request #4 from vuolter/0.4.10
vuolter HEAD
Diffstat (limited to 'pyload/cli/Cli.py')
-rw-r--r--pyload/cli/Cli.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/pyload/cli/Cli.py b/pyload/cli/Cli.py
index 84725b625..fc5236ff9 100644
--- a/pyload/cli/Cli.py
+++ b/pyload/cli/Cli.py
@@ -55,8 +55,8 @@ class Cli(object):
self.lock = Lock()
# processor funcions, these will be changed dynamically depending on control flow
- self.headerHandler = self # the download status
- self.bodyHandler = self # the menu section
+ self.headerHandler = self #: the download status
+ self.bodyHandler = self #: the menu section
self.inputHandler = self
os.system("clear")
@@ -158,7 +158,7 @@ class Cli(object):
line += 1
for download in data:
- if download.status == 12: # downloading
+ if download.status == 12: #: downloading
percent = download.percent
z = percent / 4
speed += download.speed
@@ -214,7 +214,7 @@ class Cli(object):
# clear old output
if line < self.lastLowestLine:
- for i in range(line + 1, self.lastLowestLine + 1):
+ for i in xrange(line + 1, self.lastLowestLine + 1):
println(i, "")
self.lastLowestLine = line
@@ -265,7 +265,7 @@ class Cli(object):
print "No downloads running."
for download in files:
- if download.status == 12: # downloading
+ if download.status == 12: #: downloading
print print_status(download)
print "\tDownloading: %s @ %s/s\t %s (%s%%)" % (
download.format_eta, formatSize(download.speed), formatSize(download.size - download.bleft),
@@ -321,9 +321,8 @@ class Cli(object):
print _("File does not exists.")
return
- f = open(join(owd, path), "rb")
- content = f.read()
- f.close()
+ with open(join(owd, path), "rb") as f:
+ content = f.read()
rid = self.client.checkOnlineStatusContainer([], basename(f.name), content).rid
self.printOnlineCheck(self.client, rid)