Merge branch 'blazer' into panel.sutty.nl

app/jobs/uri_collection_job.rb

@@ -13,7 +13,7 @@
 class UriCollectionJob < PeriodicJob
   # Ignoramos imágenes porque suelen ser demasiadas y no aportan a las
   # estadísticas.
-  IMAGES = %w[.png .jpg .jpeg .gif .webp].freeze
+  IMAGES = %w[.png .jpg .jpeg .gif .webp .jfif].freeze
   STAT_NAME = 'uri_collection_job'
 
   def perform(site_id:, once: true)
@@ -37,6 +37,7 @@ class UriCollectionJob < PeriodicJob
         # intervalo más amplio.
         Stat::INTERVALS.reduce do |previous, current|
           Rollup.where(name: 'host|uri', interval: previous)
+                .where('time >= ?', beginning_of_interval)
                 .where_dimensions(host: hostname, uri: uri)
                 .group("dimensions->'host'", "dimensions->'uri'")
                 .rollup('host|uri', interval: current, update: true) do |rollup|
@@ -91,18 +92,46 @@ class UriCollectionJob < PeriodicJob
   #
   # @return [Array]
   def uris
-    @uris ||= Dir.chdir destination do
+    @uris ||=
-      (Dir.glob('**/*.html') + Dir.glob('public/**/*').reject do |p|
+      locales.map do |locale|
-        File.directory? p
+        uri = "/#{locale}/".squeeze('/')
-      end.reject do |p|
+        dir = File.join(destination, locale)
-        p = p.downcase
 
-        IMAGES.any? do |i|
+        files(dir).map do |f|
-          p.end_with? i
+          uri + f
-        end
-      end).map do |uri|
-        "/#{uri}"
         end
+      end.flatten(2)
+  end
+
+  # @return [Array]
+  def locales
+    @locales ||= ['', site.locales.map(&:to_s)].flatten(1)
+  end
+
+  # @param :dir [String]
+  # @return [Array]
+  def files(dir)
+    Dir.chdir(dir) do
+      pages = Dir.glob('**/*.html')
+      files = Dir.glob('public/**/*')
+      files = remove_directories files
+      files = remove_images files
+
+      [pages, files].flatten(1)
+    end
+  end
+
+  # @param :files [Array]
+  # @return [Array]
+  def remove_directories(files)
+    files.reject do |f|
+      File.directory? f
+    end
+  end
+
+  def remove_images(files)
+    files.reject do |f|
+      IMAGES.include? File.extname(f).downcase
     end
   end
 end

app/models/site_stat.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+SiteStat = Struct.new(:site)