Display non-scraped definitions on stats page

Showing missing config keys isn't that useful when the row is missing entirely
Earlopain · Oct 2, 2023 · 2b6af78 · 2b6af78
1 parent 3dedd75
commit 2b6af78
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
@@ -12,8 +12,9 @@ def index
       "count(distinct artist_url_id) as url_count",
       "count(distinct artist_submission_id) as submission_count",
       "count(*) as file_count",
-    ).joins(artist_submission: { artist_url: :artist }).group(:site_type).reorder("").index_by(&:site_type)
+    ).joins(artist_submission: { artist_url: :artist }).group(:site_type).index_by(&:site_type)
     @counts.transform_keys! { |id| ArtistUrl.site_types.invert[id] }
+    @definitions = (Sites.scraper_definitions + [Sites.from_enum("manual")]).sort_by(&:display_name)
   end
 
   private

diff --git a/app/logical/sites.rb b/app/logical/sites.rb
@@ -58,6 +58,10 @@ def definitions
     end
   end
 
+  def scraper_definitions
+    definitions.select { |s| s.is_a?(ScraperDefinition) }
+  end
+
   def reset_cache
     @definitions = nil
   end

diff --git a/app/views/stats/index.html.erb b/app/views/stats/index.html.erb
@@ -12,18 +12,19 @@
     </tr>
   </thead>
   <tbody>
-    <% @counts.keys.sort.map { |key| Sites.from_enum(key) }.each do |definition| %>
+    <% @definitions.each do |definition| %>
       <tr>
         <td><%= definition.display_name %></td>
-        <td><%= @counts[definition.enum_value]["artist_count"] %></td>
-        <td><%= @counts[definition.enum_value]["url_count"] %></td>
-        <td><%= @counts[definition.enum_value]["submission_count"] %></td>
-        <td><%= @counts[definition.enum_value]["file_count"] %></td>
+        <td><%= @counts[definition.enum_value]&.[]("artist_count") || 0 %></td>
+        <td><%= @counts[definition.enum_value]&.[]("url_count") || 0  %></td>
+        <td><%= @counts[definition.enum_value]&.[]("submission_count") || 0  %></td>
+        <td><%= @counts[definition.enum_value]&.[]("file_count") || 0  %></td>
         <td>
           <% if definition.manually_disabled? %>
             Manually disabled
           <% elsif definition.missing_config_keys.any? %>
-            Missing config <%= "key".pluralize(definition.missing_config_keys.count) %>: <%= definition.missing_config_keys.join(", ") %>
+            Missing config <%= "key".pluralize(definition.missing_config_keys.count) %>:<br>
+            <%= definition.missing_config_keys.join(", ") %>
           <% else %>
             Enabled
           <% end %>

diff --git a/test/logical/scraper/base_test.rb b/test/logical/scraper/base_test.rb
@@ -4,7 +4,7 @@
 
 module Scraper
   class BaseTest < ActiveSupport::TestCase
-    Sites.definitions.select { |s| s.is_a?(Sites::ScraperDefinition) }.each do |definition|
+    Sites.scraper_definitions.each do |definition|
       test "#{definition.enum_value} has correct state" do
         scraper = stub_scraper_enabled(definition.enum_value) { definition.new_scraper(build(:artist_url)) }
         assert_respond_to(scraper.class, :state)