formula: Show macOS and Linux analytics in separate tables

_layouts/formula.html

@@ -196,22 +196,69 @@
 </table>
 {%- endif %}
 
-<p>Analytics:</p>
+<p>Analytics (macOS):</p>
+<table>
+{%- assign intervals = "30d, 90d, 365d" | split: ", " -%}
+{%- for interval in intervals -%}
+    {%- assign interval_days = interval | replace: "d", " days" -%}
+    <tr>
+        <th colspan="2">Installs ({{ interval_days }})</th>
+    </tr>
+    {%- for fa in site.data.analytics.install.homebrew-core[interval].formulae[full_name] -%}
+    <tr>
+        <td><code>{{ fa.formula }}</code></td>
+        <td class="number-data">{{ fa.count }}</td>
+    </tr>
+    {%- else -%}
+    <tr>
+        <td><code>{{ full_name }}</code></td>
+        <td class="number-data">0</td>
+    </tr>
+    {%- endfor -%}
+
+    <tr>
+        <th colspan="2">Installs on Request ({{ interval_days }})</th>
+    </tr>
+    {%- for fa in site.data.analytics.install-on-request.homebrew-core[interval].formulae[full_name] -%}
+    <tr>
+        <td><code>{{ fa.formula }}</code></td>
+        <td class="number-data">{{ fa.count }}</td>
+    </tr>
+    {%- else -%}
+    <tr>
+        <td><code>{{ full_name }}</code></td>
+        <td class="number-data">0</td>
+    </tr>
+    {%- endfor -%}
+
+    {%- if forloop.first -%}
+    <tr>
+        <th colspan="2">Build Errors ({{ interval_days }})</th>
+    </tr>
+        {%- for fa in site.data.analytics.build-error.homebrew-core[interval].formulae[full_name] -%}
+    <tr>
+        <td><code>{{ fa.formula }}</code></td>
+        <td class="number-data">{{ fa.count }}</td>
+    </tr>
+        {%- else -%}
+    <tr>
+        <td><code>{{ full_name }}</code></td>
+        <td class="number-data">0</td>
+    </tr>
+        {%- endfor -%}
+    {%- endif -%}
+{%- endfor %}
+</table>
+
+<p>Analytics (Linux):</p>
 <table>
-{%- if formula_path == "formula-linux" -%}
-    {%- assign analytics_path = "analytics-linux" -%}
-    {%- assign analytics_data_source = "linuxbrew-core" -%}
-{%- else -%}
-    {%- assign analytics_path = "analytics" -%}
-    {%- assign analytics_data_source = "homebrew-core" -%}
-{%- endif -%}
 {%- assign intervals = "30d, 90d, 365d" | split: ", " -%}
 {%- for interval in intervals -%}
     {%- assign interval_days = interval | replace: "d", " days" -%}
     <tr>
         <th colspan="2">Installs ({{ interval_days }})</th>
     </tr>
-    {%- for fa in site.data[analytics_path].install[analytics_data_source][interval].formulae[full_name] -%}
+    {%- for fa in site.data.analytics-linux.install.homebrew-core[interval].formulae[full_name] -%}
     <tr>
         <td><code>{{ fa.formula }}</code></td>
         <td class="number-data">{{ fa.count }}</td>
@@ -226,7 +273,7 @@
     <tr>
         <th colspan="2">Installs on Request ({{ interval_days }})</th>
     </tr>
-    {%- for fa in site.data[analytics_path].install-on-request[analytics_data_source][interval].formulae[full_name] -%}
+    {%- for fa in site.data.analytics-linux.install-on-request.homebrew-core[interval].formulae[full_name] -%}
     <tr>
         <td><code>{{ fa.formula }}</code></td>
         <td class="number-data">{{ fa.count }}</td>
@@ -242,7 +289,7 @@
     <tr>
         <th colspan="2">Build Errors ({{ interval_days }})</th>
     </tr>
-        {%- for fa in site.data[analytics_path].build-error[analytics_data_source][interval].formulae[full_name] -%}
+        {%- for fa in site.data.analytics-linux.build-error.homebrew-core[interval].formulae[full_name] -%}
     <tr>
         <td><code>{{ fa.formula }}</code></td>
         <td class="number-data">{{ fa.count }}</td>