lato_storage 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a13ab3e65acf06d7619745a47cedc82fe3f6bda167cb2bb51262d91537711068
-  data.tar.gz: f945005d21633029cfeba26cc13a84faa4d68346cc2f50ff1f41c7f2e018f4dc
+  metadata.gz: f3b57af5bf7310b2dff16073667b6b3b9e141fd361bccbcbac863bdcbc80ace7
+  data.tar.gz: 4d6cc980af82bf90d66fc8d15cd71d3bb89d03d2da22accd238a2f7835ff9c0e
 SHA512:
-  metadata.gz: 63d4288183f841424f5a3cf4ca0362ad0cdff35a3bb503abb0d81896a2b0003b722abd4b2cdfc4484c32d08c4f5b36cab411b392e3edb94dcab6c5335dcb5455
-  data.tar.gz: e45c65e4e75df74143495f043125ae36fb9b455764494f604b11281debaf20e1a6aa14e6568e7f6f3a325576c918a608e3120dc8521f84035f23cbef81109934
+  metadata.gz: d3bab025ec2df8e6604d07cc3215fc58dfa0d458aac1c577d176deb5f831aafb12677da21c4d3c767547072bbd1a84085edc8c1ef2d21c175cf3e48f3ac6df3d
+  data.tar.gz: 18970c7c707875c7dd32ccc70878268643c650785bf0ecb38f0cd7d47645eeb13312781a75ccee1fd0eb28bcd03088242249e8d5cdb57b4d268ea5ba32decd8a

data/app/jobs/lato_storage/preload_dashboard_data_job.rb

@@ -100,6 +100,10 @@ module LatoStorage
       else
         ActiveStorage::Blob.count
       end
+    rescue StandardError => e
+      Rails.logger.error "Error estimating blobs count: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      0
     end
 
     def attachments_count_loader
@@ -112,6 +116,10 @@ module LatoStorage
       else
         ActiveStorage::Attachment.count
       end
+    rescue StandardError => e
+      Rails.logger.error "Error estimating attachments count: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      0
     end
 
     def variant_records_count_loader
@@ -126,6 +134,10 @@ module LatoStorage
       else
         ActiveStorage::VariantRecord.count
       end
+    rescue StandardError => e
+      Rails.logger.error "Error estimating variant records count: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      0
     end
 
     def deletable_blobs_count_loader
@@ -134,15 +146,19 @@ module LatoStorage
         count += 1
       end
       count
+    rescue StandardError => e
+      Rails.logger.error "Error estimating deletable blobs count: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      0
     end
 
     # Estimate the total storage by multiplying average size of a group sample by total blobs count
     def total_storage_loader(blobs_count)
-      sample_size = 1000
+      sample_size = 5000
       total_size = 0
       sampled_count = 0
 
-      ActiveStorage::Blob.order('RANDOM()').limit(sample_size).each do |blob|
+      ActiveStorage::Blob.order(id: :desc).limit(sample_size).each do |blob|
         total_size += blob.byte_size
         sampled_count += 1
       end
@@ -151,6 +167,10 @@ module LatoStorage
 
       average_size = total_size / sampled_count
       average_size * blobs_count
+    rescue StandardError => e
+      Rails.logger.error "Error estimating total storage: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      0
     end
 
     # Estimate content types by sampling blobs
@@ -159,7 +179,7 @@ module LatoStorage
       sample_size = 5000
       sampled_count = 0
 
-      ActiveStorage::Blob.order('RANDOM()').limit(sample_size).each do |blob|
+      ActiveStorage::Blob.order(id: :desc).limit(sample_size).each do |blob|
         content_type_counts[blob.content_type] += 1
         sampled_count += 1
       end
@@ -169,6 +189,10 @@ module LatoStorage
       # Scale counts to estimated total blobs count
       content_type_counts.transform_values! { |count| (count.to_f / sampled_count) * blobs_count_loader }
       content_type_counts.sort_by { |_, count| -count }.first(5)
+    rescue StandardError => e
+      Rails.logger.error "Error estimating content types: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+      []
     end
   end
 end

data/app/views/lato_storage/application/index.html.erb

@@ -59,7 +59,7 @@
         </h5>
       </div>
       <div class="card-body">
-        <% if @data[:content_types].any? %>
+        <% if @data[:content_types]&.any? %>
           <% total = @data[:content_types].sum { |_, count| count } %>
           <ul class="list-group list-group-flush">
             <% @data[:content_types].each do |content_type, count| %>
@@ -122,7 +122,7 @@
           </h5>
         </div>
         <div class="card-body">
-          <% if @data[:largest_blobs].any? %>
+          <% if @data[:largest_blobs]&.any? %>
             <div class="list-group list-group-flush">
               <% @data[:largest_blobs].each do |blob| %>
                 <a class="list-group-item list-group-item-action" href="<%= blob[:url] %>" target="_blank" rel="noopener noreferrer" download>

data/lib/lato_storage/version.rb

@@ -1,3 +1,3 @@
 module LatoStorage
-  VERSION = "3.1.0"
+  VERSION = "3.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato_storage
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Gregorio Galante