From 52afa94f1c277f7387c5bb3d1eb85fb555126a2a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 3 Oct 2024 08:13:54 -0400
Subject: [PATCH] Use `print_table` to wrap storage output CLI (#32230)
---
lib/mastodon/cli/media.rb | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 70c11ee1a..37f110d89 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -278,14 +278,10 @@ module Mastodon::CLI
desc 'usage', 'Calculate disk space consumed by Mastodon'
def usage
- say("Attachments:\t#{number_to_human_size(media_attachment_storage_size)} (#{number_to_human_size(local_media_attachment_storage_size)} local)")
- say("Custom emoji:\t#{number_to_human_size(CustomEmoji.sum(:image_file_size))} (#{number_to_human_size(CustomEmoji.local.sum(:image_file_size))} local)")
- say("Preview cards:\t#{number_to_human_size(PreviewCard.sum(:image_file_size))}")
- say("Avatars:\t#{number_to_human_size(Account.sum(:avatar_file_size))} (#{number_to_human_size(Account.local.sum(:avatar_file_size))} local)")
- say("Headers:\t#{number_to_human_size(Account.sum(:header_file_size))} (#{number_to_human_size(Account.local.sum(:header_file_size))} local)")
- say("Backups:\t#{number_to_human_size(Backup.sum(:dump_file_size))}")
- say("Imports:\t#{number_to_human_size(Import.sum(:data_file_size))}")
- say("Settings:\t#{number_to_human_size(SiteUpload.sum(:file_file_size))}")
+ print_table [
+ %w(Object Total Local),
+ *object_storage_summary,
+ ]
end
desc 'lookup URL', 'Lookup where media is displayed by passing a media URL'
@@ -318,20 +314,23 @@ module Mastodon::CLI
private
- def media_attachment_storage_size
- MediaAttachment.sum(file_and_thumbnail_size_sql)
+ def object_storage_summary
+ [
+ [:attachments, MediaAttachment.sum(combined_media_sum), MediaAttachment.where(account: Account.local).sum(combined_media_sum)],
+ [:custom_emoji, CustomEmoji.sum(:image_file_size), CustomEmoji.local.sum(:image_file_size)],
+ [:avatars, Account.sum(:avatar_file_size), Account.local.sum(:avatar_file_size)],
+ [:headers, Account.sum(:header_file_size), Account.local.sum(:header_file_size)],
+ [:preview_cards, PreviewCard.sum(:image_file_size), nil],
+ [:backups, Backup.sum(:dump_file_size), nil],
+ [:imports, Import.sum(:data_file_size), nil],
+ [:settings, SiteUpload.sum(:file_file_size), nil],
+ ].map { |label, total, local| [label.to_s.titleize, number_to_human_size(total), local.present? ? number_to_human_size(local) : nil] }
end
- def local_media_attachment_storage_size
- MediaAttachment.where(account: Account.local).sum(file_and_thumbnail_size_sql)
- end
-
- def file_and_thumbnail_size_sql
- Arel.sql(
- <<~SQL.squish
- COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
- SQL
- )
+ def combined_media_sum
+ Arel.sql(<<~SQL.squish)
+ COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
+ SQL
end
PRELOAD_MODEL_WHITELIST = %w(