From cc26fd71acdcd0ef1c0992273a07d755af2b6108 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Thu, 30 Aug 2018 01:35:09 +0900 Subject: Fix CLI interface for removing remote media (#8506) * Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached. * Revert This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662. * Change to obtain and pass all columns when "--background" option is false. --- lib/mastodon/media_cli.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index ee28270da..12ddb6976 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -28,11 +28,13 @@ module Mastodon queued = 0 processed = 0 - 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 + 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) -- cgit From 18eb565755b8658e2a9768a6f59596d943746b68 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Fri, 31 Aug 2018 10:46:13 +0900 Subject: Add --verbose and --dry-run option to tootctl media remove (#8519) * Add --verbose and --dry-run options to CLI interface for removing remote media. * Fix coding style problem. --- lib/mastodon/media_cli.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 12ddb6976..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,22 +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)' : '' 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)) + 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 @@ -46,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 -- cgit