Merge pull request #644 from tcely/patch-4

Fix filesizeformat prefixes

tubesync/sync/templates/sync/dashboard.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}{% load humanize %}  
+{% extends 'base.html' %}{% load humanize %}{% load filters %}
 
 {% block headtitle %}Dashboard{% endblock %}
 
@@ -57,9 +57,9 @@ <h3 class="truncate">{{ num_tasks }}</h3>
     <div class="card dashcard">
       <a href="{% url 'sync:media' %}">
         <div class="card-content">
-          <h3 class="truncate">{{ disk_usage_bytes|filesizeformat }}</h3>
+          <h3 class="truncate">{{ disk_usage_bytes|bytesformat }}</h3>
           <div class="desc truncate">{{ disk_usage_bytes|intcomma }} bytes</div>
-          <div class="truncate">Avg. <strong>{{ average_bytes_per_media|filesizeformat }}</strong> per media</div>
+          <div class="truncate">Avg. <strong>{{ average_bytes_per_media|bytesformat }}</strong> per media</div>
         </div>
       </a>
     </div>
@@ -89,7 +89,7 @@ <h4 class="truncate">Largest downloads</h4>
           {% for media in largest_downloads %}
             <a href="{% url 'sync:media-item' pk=media.pk %}" class="collection-item">
               <div class="truncate">{{ media.name }}</div>
-              <div class="truncate"><strong>{{ media.downloaded_filesize|filesizeformat }}</strong>{% if media.downloaded_format %} in {{ media.downloaded_format }}{% endif %} from &quot;{{ media.source.name }}&quot;</div>
+              <div class="truncate"><strong>{{ media.downloaded_filesize|bytesformat }}</strong>{% if media.downloaded_format %} in {{ media.downloaded_format }}{% endif %} from &quot;{{ media.source.name }}&quot;</div>
             </a>
           {% empty %}
             <span class="collection-item">No media has been downloaded.</span>
@@ -125,7 +125,7 @@ <h2 class="truncate">Runtime information</h2>
       </tr>
       <tr title="Database connection used by TubeSync">
         <td class="hide-on-small-only">Database</td>
-        <td><span class="hide-on-med-and-up">Database<br></span><strong>{{ database_connection }}{% if database_filesize %} {{ database_filesize|filesizeformat }}{% endif %}</strong></td>
+        <td><span class="hide-on-med-and-up">Database<br></span><strong>{{ database_connection }}{% if database_filesize %} ({{ database_filesize|bytesformat }}){% endif %}</strong></td>
       </tr>
     </table>
   </div>

tubesync/sync/templates/sync/media-item.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}{% load static %}{% load humanize %}
+{% extends 'base.html' %}{% load static %}{% load humanize %}{% load filters %}
 
 {% block headtitle %}Media - {{ media.key }}{% endblock %}
 
@@ -113,7 +113,7 @@ <h1 class="truncate">Media <strong>{{ media.key }}</strong> {{ download_state_ic
         </td>                                                                   </tr>
       <tr title="Size of the file on disk">
         <td class="hide-on-small-only">File size</td>
-        <td><span class="hide-on-med-and-up">File size<br></span><strong>{{ media.downloaded_filesize|filesizeformat }}</strong></td>
+        <td><span class="hide-on-med-and-up">File size<br></span><strong>{{ media.downloaded_filesize|bytesformat }}</strong></td>
       </tr>
       <tr title="Codecs used in the downloaded file">
         <td class="hide-on-small-only">Downloaded codecs</td>

tubesync/sync/templatetags/__init__.py

@@ -0,0 +1 @@
+

tubesync/sync/templatetags/filters.py

@@ -0,0 +1,14 @@
+from django import template
+from django.template.defaultfilters import filesizeformat
+
+
+register = template.Library()
+
+
+@register.filter(is_safe=True)
+def bytesformat(input):
+    output = filesizeformat(input)
+    if not (output and output.endswith('B', -1)):
+        return output
+    return output[: -1 ] + output[ -1 :].replace('B', 'iB', 1)
+