From 713ab837ba59c4a7c0b60cb8e8be4b27f4520e52 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 8 Nov 2014 14:00:06 -0600
Subject: Convert mirror status tables to Jinja2

Yay for way improved performance. Local testing showed render times
going from 265 ms to 135 ms.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/error_table.html        | 24 ------------------------
 templates/mirrors/error_table.html.jinja  | 22 ++++++++++++++++++++++
 templates/mirrors/mirror_details.html     |  2 +-
 templates/mirrors/status.html             |  6 +++---
 templates/mirrors/status_table.html       | 30 ------------------------------
 templates/mirrors/status_table.html.jinja | 28 ++++++++++++++++++++++++++++
 6 files changed, 54 insertions(+), 58 deletions(-)
 delete mode 100644 templates/mirrors/error_table.html
 create mode 100644 templates/mirrors/error_table.html.jinja
 delete mode 100644 templates/mirrors/status_table.html
 create mode 100644 templates/mirrors/status_table.html.jinja

(limited to 'templates')

diff --git a/templates/mirrors/error_table.html b/templates/mirrors/error_table.html
deleted file mode 100644
index cd7265af..00000000
--- a/templates/mirrors/error_table.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load cycle from future %}
-{% load flags mirror_status %}
-<table id="errorlog_mirrors" class="results">
-    <thead>
-        <tr>
-            <th>Mirror URL</th>
-            <th>Protocol</th>
-            <th>Country</th>
-            <th>Error Message</th>
-            <th>Last Occurred</th>
-            <th>Occurrences (last {{ cutoff|hours }})</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}">
-            <td>{{ log.url__url }}</td>
-            <td>{{ log.url__protocol__protocol }}</td>
-            <td class="country">{% country_flag log.country %}{{ log.country.name }}</td>
-            <td class="wrap">{{ log.error|linebreaksbr }}</td>
-            <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td>
-            <td>{{ log.error_count }}</td>
-        </tr>{% endfor %}
-    </tbody>
-</table>
diff --git a/templates/mirrors/error_table.html.jinja b/templates/mirrors/error_table.html.jinja
new file mode 100644
index 00000000..52f68135
--- /dev/null
+++ b/templates/mirrors/error_table.html.jinja
@@ -0,0 +1,22 @@
+<table id="errorlog_mirrors" class="results">
+    <thead>
+        <tr>
+            <th>Mirror URL</th>
+            <th>Protocol</th>
+            <th>Country</th>
+            <th>Error Message</th>
+            <th>Last Occurred</th>
+            <th>Occurrences (last {{ cutoff|hours }})</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for log in error_logs %}<tr class="{{ loop.cycle('odd', 'even') }}">
+            <td>{{ log.url__url }}</td>
+            <td>{{ log.url__protocol__protocol }}</td>
+            <td class="country">{{ country_flag(log.country) }}{{ log.country.name }}</td>
+            <td class="wrap">{{ log.error|linebreaksbr }}</td>
+            <td>{{ log.last_occurred|date('Y-m-d H:i') }}</td>
+            <td>{{ log.error_count }}</td>
+        </tr>{% endfor %}
+    </tbody>
+</table>
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 2ff41828..e4ae55b4 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -132,7 +132,7 @@ <h3>Available URLs</h3>
     </table>
 
     <h3>Error Log</h3>
-    {% include "mirrors/error_table.html" %}
+    {% include "mirrors/error_table.html.jinja" %}
 </div>
 
 <div class="box">
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 24408be7..530e3ff5 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -60,18 +60,18 @@ <h2>Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}</h2>
     <a name="outofsync" id="outofsync"></a>
     <h3>Out of Sync Mirrors</h3>
     {% with urls=bad_urls table_id='outofsync_mirrors' %}
-    {% include "mirrors/status_table.html" %}
+    {% include "mirrors/status_table.html.jinja" %}
     {% endwith %}
 
     <a name="successful" id="successful"></a>
     <h3>Successfully Syncing Mirrors</h3>
     {% with urls=good_urls table_id='successful_mirrors' %}
-    {% include "mirrors/status_table.html" %}
+    {% include "mirrors/status_table.html.jinja" %}
     {% endwith %}
 
     <a name="errorlog" id="errorlog"></a>
     <h3>Mirror Syncing Error Log</h3>
-    {% include "mirrors/error_table.html" %}
+    {% include "mirrors/error_table.html.jinja" %}
 </div>
 {% endblock %}
 
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
deleted file mode 100644
index 83538303..00000000
--- a/templates/mirrors/status_table.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load cycle from future %}
-{% load flags mirror_status %}
-<table id="{{ table_id }}" class="results">
-    <thead>
-        <tr>
-            <th>Mirror URL</th>
-            <th>Protocol</th>
-            <th>Country</th>
-            <th>Completion %</th>
-            <th>μ Delay (hh:mm)</th>
-            <th>μ Duration (s)</th>
-            <th>σ Duration (s)</th>
-            <th>Mirror Score</th>
-            <th></th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for m_url in urls %}<tr class="{% cycle 'odd' 'even' %}">
-            <td>{{ m_url.url }}</td>
-            <td>{{ m_url.protocol }}</td>
-            <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|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><a href="{{ m_url.get_absolute_url }}">details</a></td>
-        </tr>{% endfor %}
-    </tbody>
-</table>
diff --git a/templates/mirrors/status_table.html.jinja b/templates/mirrors/status_table.html.jinja
new file mode 100644
index 00000000..598a1af0
--- /dev/null
+++ b/templates/mirrors/status_table.html.jinja
@@ -0,0 +1,28 @@
+<table id="{{ table_id }}" class="results">
+    <thead>
+        <tr>
+            <th>Mirror URL</th>
+            <th>Protocol</th>
+            <th>Country</th>
+            <th>Completion %</th>
+            <th>μ Delay (hh:mm)</th>
+            <th>μ Duration (s)</th>
+            <th>σ Duration (s)</th>
+            <th>Mirror Score</th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for m_url in urls %}<tr class="{{ loop.cycle('odd', 'even') }}">
+            <td>{{ m_url.url }}</td>
+            <td>{{ m_url.protocol }}</td>
+            <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|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><a href="{{ m_url.get_absolute_url() }}">details</a></td>
+        </tr>{% endfor %}
+    </tbody>
+</table>
-- 
cgit v1.2.3-54-g00ecf