python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-02-15 13:33:39 +02:00
Code

Use Thread instead of Timer for progress reporting.

Browse Source
This commit is contained in:
Jakub Roztocil 2013-05-14 12:49:03 +02:00
parent 6e848b3203
commit 7f624e61b5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
httpie/downloads.py
View File

@ -9,7 +9,7 @@ import re
import sys import sys
import mimetypes import mimetypes
import threading import threading
from time import time from time import sleep, time
from .output import RawStream from .output import RawStream
from .models import HTTPResponse from .models import HTTPResponse
@ -163,7 +163,7 @@ class Download(object):
self.finished = False self.finished = False
self._status = Status() self._status = Status()
self._progress_reporter = ProgressReporter( self._progress_reporter = ProgressReporterThread(
status=self._status, status=self._status,
output=progress_file output=progress_file
) )
@ -253,7 +253,7 @@ class Download(object):
self._output_file.name self._output_file.name
) )
) )
self._progress_reporter.report() self._progress_reporter.start()
return stream, self._output_file return stream, self._output_file
@ -263,7 +263,6 @@ class Download(object):
self._status.finished() self._status.finished()
def failed(self): def failed(self):
self.finish()
self._progress_reporter.stop() self._progress_reporter.stop()
@property @property
@ -317,7 +316,7 @@ class Status(object):
self.time_finished = time() self.time_finished = time()
class ProgressReporter(object): class ProgressReporterThread(threading.Thread):
""" """
Reports download progress based on its status. Reports download progress based on its status.
@ -330,6 +329,7 @@ class ProgressReporter(object):
:type status: Status :type status: Status
:type output: file :type output: file
""" """
super(ProgressReporterThread, self).__init__()
self.status = status self.status = status
self.output = output self.output = output
self._tick = tick self._tick = tick
@ -338,20 +338,20 @@ class ProgressReporter(object):
self._status_line = '' self._status_line = ''
self._prev_bytes = 0 self._prev_bytes = 0
self._prev_time = time() self._prev_time = time()
self._stop = False self._should_stop = threading.Event()
def stop(self): def stop(self):
"""Stop reporting on next tick.""" """Stop reporting on next tick."""
self._stop = True self._should_stop.set()
def run(self):
while not self._should_stop.is_set():
if self.status.has_finished:
self.sum_up()
break
def report(self):
if self._stop:
return
if self.status.has_finished:
self.sum_up()
else:
self.report_speed() self.report_speed()
threading.Timer(self._tick, self.report).start() sleep(self._tick)
def report_speed(self): def report_speed(self):