Issue 1560 - ZeroDivisionError in sitescripts.stats.bin.pagegenerator

sitescripts/stats/template/fileStats.html

 <!--
   - This file is part of the Adblock Plus web scripts,
   - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
   - published by the Free Software Foundation.
   -
   - Adblock Plus is distributed in the hope that it will be useful,
   - but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 70 matching lines @@
             <div class="flag {{name}}"></div> {{name|countryname}} <div class="countrycode">{{name}}</div>
           {%- else -%}
             {{name}}
           {%- endif -%}
 
           {%- if filtered_url %}
             </a>
           {%- endif %}
         </td>
         <td align="right">{{value.hits}}</td>
-        <td align="right">{{(value.hits / params.totalhits * 100)|round(precision=1)}}%</td>
+        <td align="right">{{value.hits|percentage(params.totalhits)|round(precision=1)}}%</td>
         <td align="right">{{value.bandwidth|bytes}}</td>
-        <td align="right">{{(value.bandwidth / params.totalbandwidth * 100)|round(precision=1)}}%</td>
+        <td align="right">{{value.bandwidth|percentage(params.totalbandwidth)|round(precision=1)}}%</td>
         {%- if chart %}
           <td class="chart">
-            <div class="hitsChart" style="width: {{(value.hits / params.maxhits * 100)|round(method='ceil')|int}}px;"></div><br />
-            <div class="bandwidthChart" style="width: {{(value.bandwidth / params.maxbandwidth * 100)|round(method='ceil')|int}}px;"></div>
+            <div class="hitsChart" style="width: {{value.hits|percentage(params.maxhits)|round(method='ceil')|int}}px;"></div><br />
+            <div class="bandwidthChart" style="width: {{value.bandwidth|percentage(params.maxbandwidth)|round(method='ceil')|int}}px;"></div>
           </td>
         {%- else %}
           <td>&nbsp;</td>
         {%- endif %}
       </tr>
     {%- endmacro %}
 
     {# Using selectattr filter would be nice but servers don't have Jinja 2.7 yet #}
     {%- set filterFields = [] %}
     {%- for field in fields %}
       {%- if field.filter and field.name in data and "True" in data[field.name] %}
         {%- set dummy = filterFields.append(field) %}
       {%- endif %}
     {%- endfor %}
 
     <div id="quickLinks">
       {%- if filterFields|length > 0 %}
         <a href="#overview">Overview</a>
       {%- endif %}
 
       {%- for field in fields %}
         {%- if not field.filter and not field.hidden and field.name in data %}
           <a href="#{{field.name}}">{{field.title}}</a>
         {%- endif %}
       {%- endfor %}
     </div>
 
     {%- if filterFields|length > 0 %}
       {%- if filter %}
-        {%-
-          set params = {
-            "totalhits": data.hits if data.hits != 0 else 1,

[Sebastian Noack, 2014/11/12 20:13:58]

If there are no hits there aren't any. IMO, pretending that there is one just to
avoid zero-division, is misleading and a rather ugly workaround. How about
checking for zero where the actual division is done?

[Wladimir Palant, 2014/11/12 20:56:36]

Yes, you reviewed that workaround for other occasions a while ago :)
Thinking about this, the work-around is indeed better applied when the division
happens. Back when this hack was introduced things looked different (lots of
divisions and only a handful of divisors).

-            "totalbandwidth": data.bandwidth if data.bandwidth != 0 else 1,
-            "field": {"name": None}
-          }
-        %}
+        {%- set params = {"totalhits": data.hits, "totalbandwidth": data.bandwidth, "field": {"name": None}} %}
       {%- else %}
         {%- set items = data.day|sortfield("day") %}
         {%- set params = {"totalhits": items|sumhits, "totalbandwidth": items|sumbandwidth, "field": {"name": None}} %}
       {%- endif %}
       <div id="overview" class="block_title">Overview</div>
       <div class="block">
         <table align="center">
           <tr>
             <th bgcolor="#ECECEC">Condition</th>
             <th bgcolor="#66DDEE" colspan="2">Hits</th>
@@ skipping 55 matching lines @@
             {%- endif %}
             {%- if field.name == "day" and filterFields|length == 0 %}
               {{row("Total", {"hits": params.totalhits, "bandwidth": params.totalbandwidth}, params, special=True, emph=True, chart=False)}}
             {%- endif %}
           </table>
         </div>
       {%- endif %}
     {%- endfor %}
   </body>
 </html>