From eafbc14a587b3f6ea58b43620d14006640faf1b7 Mon Sep 17 00:00:00 2001 From: pictuga Date: Sat, 21 Dec 2013 20:09:14 +0100 Subject: [PATCH] Allow "progress" in JSON --- morss.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/morss.py b/morss.py index 666fe0b..58e0a0f 100644 --- a/morss.py +++ b/morss.py @@ -558,13 +558,6 @@ def Gather(url, cachePath, options): queue.task_done() def worker(i, item): - if options.progress: - if MAX_ITEM == -1: - print '%s/%s' % (i+1, size) - else: - print '%s/%s' % (i+1, min(MAX_ITEM, size)) - sys.stdout.flush() - if time.time() - startTime > LIM_TIME >= 0 or i+1 > LIM_ITEM >= 0: log('dropped') item.remove() @@ -588,6 +581,14 @@ def Gather(url, cachePath, options): if not options.keep: del item.desc + if options.progress: + end = size if MAX_ITEM == -1 else min(MAX_ITEM, size) + if options.json: + print json.dumps((i+1, end, item), default=lambda o: dict(o)) + else: + print "%s/%s" % (i+1, end) + sys.stdout.flush() + queue = Queue.Queue() for i in range(THREADS):