From fdae105d968bcd29b2b31407a99882f66ab07de0 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Mon, 18 Feb 2019 20:39:28 +0100
Subject: mirrors: replace self-written floatvalue with floatformat

In 2013 floatformat was very slow in the mirror status page, these days
floatformat is not that much slower.
---
 mirrors/templatetags/mirror_status.py      | 5 -----
 mirrors/tests/test_templatetags.py         | 9 +--------
 templates/mirrors/mirror_details_urls.html | 6 +++---
 templates/mirrors/status_table.html        | 6 +++---
 templates/mirrors/url_details_logs.html    | 2 +-
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/mirrors/templatetags/mirror_status.py b/mirrors/templatetags/mirror_status.py
index b3810d9a..83c1571a 100644
--- a/mirrors/templatetags/mirror_status.py
+++ b/mirrors/templatetags/mirror_status.py
@@ -25,11 +25,6 @@ def hours(value):
         return '%d hour' % hrs
     return '%d hours' % hrs
 
-@register.filter
-def floatvalue(value, arg=2):
-    if value is None:
-        return u''
-    return '%.*f' % (arg, value)
 
 @register.filter
 def percentage(value, arg=1):
diff --git a/mirrors/tests/test_templatetags.py b/mirrors/tests/test_templatetags.py
index 1d9e6389..ec9b61bd 100644
--- a/mirrors/tests/test_templatetags.py
+++ b/mirrors/tests/test_templatetags.py
@@ -2,7 +2,7 @@ from datetime import timedelta
 
 from django.test import SimpleTestCase
 
-from mirrors.templatetags.mirror_status import duration, hours, floatvalue, percentage
+from mirrors.templatetags.mirror_status import duration, hours, percentage
 
 
 class MirrorTemplateTagTest(SimpleTestCase):
@@ -21,13 +21,6 @@ class MirrorTemplateTagTest(SimpleTestCase):
         self.assertEqual(hours(timedelta(hours=1)), '1 hour')
         self.assertEqual(hours(timedelta(seconds=60*60)), '1 hour')
 
-    def test_floatvalue(self):
-        self.assertEqual(floatvalue(None), u'')
-
-        self.assertEqual(floatvalue(123), '123.00')
-        self.assertEqual(floatvalue(123.1), '123.10')
-        self.assertEqual(floatvalue(123.1, 1), '123.1')
-
     def test_percentage(self):
         self.assertEqual(percentage(None), u'')
         self.assertEqual(percentage(10), '1000.0%')
diff --git a/templates/mirrors/mirror_details_urls.html b/templates/mirrors/mirror_details_urls.html
index a2df00de..0f88b06c 100644
--- a/templates/mirrors/mirror_details_urls.html
+++ b/templates/mirrors/mirror_details_urls.html
@@ -29,9 +29,9 @@
             <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
             <td>{{ m_url.completion_pct|percentage:1 }}</td>
             <td>{{ m_url.delay|duration|default:'unknown' }}</td>
-            <td>{{ m_url.duration_avg|floatvalue:2 }}</td>
-            <td>{{ m_url.duration_stddev|floatvalue:2 }}</td>
-            <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td>
+            <td>{{ m_url.duration_avg|floatformat:2 }}</td>
+            <td>{{ m_url.duration_stddev|floatformat:2 }}</td>
+            <td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
             <td><a href="{{ m_url.id }}/">Details</a></td>
         </tr>
         {% endfor %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 77f6e454..30b60452 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -21,9 +21,9 @@
             <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td>
             <td>{{ m_url.completion_pct|percentage:1 }}</td>
             <td>{{ m_url.delay|duration }}</td>
-            <td>{{ m_url.duration_avg|floatvalue:2 }}</td>
-            <td>{{ m_url.duration_stddev|floatvalue:2 }}</td>
-            <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td>
+            <td>{{ m_url.duration_avg|floatformat:2 }}</td>
+            <td>{{ m_url.duration_stddev|floatformat:2 }}</td>
+            <td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
             <td><a href="{{ m_url.get_absolute_url }}">details</a></td>
         </tr>{% endfor %}
     </tbody>
diff --git a/templates/mirrors/url_details_logs.html b/templates/mirrors/url_details_logs.html
index 2396fde7..19e530ab 100644
--- a/templates/mirrors/url_details_logs.html
+++ b/templates/mirrors/url_details_logs.html
@@ -21,7 +21,7 @@
             <td>{% if log.location %}{{ log.location.source_ip }}{% else %}Unknown{% endif %}</td>
             <td>{{ log.last_sync|date:'Y-m-d H:i' }}</td>
             <td>{{ log.delay|duration }}</td>
-            <td>{{ log.duration|floatvalue }}</td>
+            <td>{{ log.duration|floatformat:2 }}</td>
             <td>{{ log.is_success|yesno|capfirst }}</td>
             <td class="wrap">{{ log.error|linebreaksbr }}</td>
         </tr>{% endfor %}
-- 
cgit v1.2.2