From 4a06ce8859f106492804d6672f5a9fed47e635a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Foellmi?= Date: Wed, 6 May 2020 18:51:00 +0200 Subject: [PATCH] Better checked will_finish and is_finished MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: CeĢdric Foellmi --- oort/app/helpers/fileuploader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oort/app/helpers/fileuploader.py b/oort/app/helpers/fileuploader.py index 0e4b08fb..fa141ab4 100644 --- a/oort/app/helpers/fileuploader.py +++ b/oort/app/helpers/fileuploader.py @@ -166,10 +166,10 @@ def is_started(self): return self.started is not None and self.ended is None def will_finish(self): - return self.is_started() and self.progress / 1000 < 100 + return self.is_started() and self.progress >= 95 def is_finished(self): - return self.ended is not None and (datetime.now() - self.ended).total_seconds() > 2 + return self.started is not None and self.ended is not None def to_dict(self): return {