summaryrefslogtreecommitdiff
path: root/commcrawler/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-08-09 16:09:58 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-08-09 16:09:58 +0200
commite8068395d642fa36d7f6c53fe8088beabe7c2a31 (patch)
tree337c1e1f89653741a3b9266503a3aae8dc9f127b /commcrawler/models.py
parent0f26c668bcc86d1a4cfc91f1b8154055409e8aab (diff)
downloadComm-on-net-e8068395d642fa36d7f6c53fe8088beabe7c2a31.tar.bz2
Comm-on-net-e8068395d642fa36d7f6c53fe8088beabe7c2a31.zip
Display pre-crawl progression
Diffstat (limited to 'commcrawler/models.py')
-rw-r--r--commcrawler/models.py5
1 files changed, 4 insertions, 1 deletions
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)