From e8068395d642fa36d7f6c53fe8088beabe7c2a31 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 9 Aug 2019 16:09:58 +0200 Subject: Display pre-crawl progression --- commcrawler/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'commcrawler/models.py') diff --git a/commcrawler/models.py b/commcrawler/models.py index da578bb..ce3deb0 100644 --- a/commcrawler/models.py +++ b/commcrawler/models.py @@ -28,6 +28,7 @@ class Crawl(models.Model): STATUS = ( ('C', _("Created")), ('A', _("Planned")), + ('W', _("Pre-crawl in progress")), ('P', _("Crawl in progress")), ('M', _("Match link in progress")), ('F', _("Finished")) @@ -37,6 +38,8 @@ class Crawl(models.Model): verbose_name=_("Creation"), default=datetime.datetime.now) started = models.DateTimeField( verbose_name=_("Started"), blank=True, null=True) + pre_crawl_ended = models.DateTimeField( + verbose_name=_("Pre-crawl end"), blank=True, null=True) crawl_ended = models.DateTimeField( verbose_name=_("Crawl end"), blank=True, null=True) ended = models.DateTimeField( @@ -69,7 +72,7 @@ class Crawl(models.Model): done = self.results.filter(status__in=("T", "F")).count() percent = int(done / todo * 100) return "{} % ({}/{})".format(percent, done, todo) - if self.status == "M": + if self.status in ("W", "M"): done = self.progression or 0 percent = int(done / todo * 100) return "{} % ({}/{})".format(percent, done, todo) -- cgit v1.2.3