diff options
author | ThibG <thib@sitedethib.com> | 2018-08-31 20:56:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 20:56:22 +0200 |
commit | fd2c7aa8ec2ee00c62d76887ee3b597c8462049d (patch) | |
tree | 7f988360fd5b6aefa1ddd4255926bb20025fd27f /lib | |
parent | c6942a528332e99b605efa95ffa1c710324d368c (diff) | |
parent | 6f75a9001f6ba8e47c80767d8406cfeb11a79690 (diff) |
Merge pull request #694 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/media_cli.rb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index ee28270da..12ebdb774 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -10,6 +10,8 @@ module Mastodon class MediaCLI < Thor option :days, type: :numeric, default: 7 option :background, type: :boolean, default: false + option :verbose, type: :boolean, default: false + option :dry_run, type: :boolean, default: false desc 'remove', 'Remove remote media files' long_desc <<-DESC Removes locally cached copies of media attachments from other servers. @@ -22,20 +24,27 @@ module Mastodon possible. In Sidekiq they will be processed with higher concurrency, but it may impact other operations of the Mastodon server, and it may overload the underlying file storage. + + With the --verbose option, output deleting file ID to console (only when --background false). + + With the --dry-run option, output the number of files to delete without deleting. DESC def remove time_ago = options[:days].days.ago queued = 0 processed = 0 + dry_run = options[:dry_run] ? '(DRY RUN)' : '' - MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id).reorder(nil).find_in_batches do |media_attachments| - if options[:background] + if options[:background] + MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id).reorder(nil).find_in_batches do |media_attachments| queued += media_attachments.size - Maintenance::UncacheMediaWorker.push_bulk(media_attachments.map(&:id)) - else + Maintenance::UncacheMediaWorker.push_bulk(media_attachments.map(&:id)) unless options[:dry_run] + end + else + MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).reorder(nil).find_in_batches do |media_attachments| media_attachments.each do |m| - Maintenance::UncacheMediaWorker.new.perform(m) - say('.', :green, false) + Maintenance::UncacheMediaWorker.new.perform(m) unless options[:dry_run] + options[:verbose] ? say(m.id) : say('.', :green, false) processed += 1 end end @@ -44,9 +53,9 @@ module Mastodon say if options[:background] - say("Scheduled the deletion of #{queued} media attachments", :green) + say("Scheduled the deletion of #{queued} media attachments #{dry_run}.", :green) else - say("Removed #{processed} media attachments", :green) + say("Removed #{processed} media attachments #{dry_run}.", :green) end end end |