Fix "tootctl media remove" can't count the file size (#9288)

* Fixed an issue where "tootctl media remove" can not count the file size.

* Fixed the problem pointed out by codeclimate.
This commit is contained in:
mayaeh 2018-11-16 17:47:40 +09:00 committed by Eugen Rochko
parent a3ef076160
commit 01a8ab921e

View File

@ -50,10 +50,10 @@ module Mastodon
else 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| 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| media_attachments.each do |m|
size += m.file_file_size || 0
Maintenance::UncacheMediaWorker.new.perform(m) unless options[:dry_run] Maintenance::UncacheMediaWorker.new.perform(m) unless options[:dry_run]
options[:verbose] ? say(m.id) : say('.', :green, false) options[:verbose] ? say(m.id) : say('.', :green, false)
processed += 1 processed += 1
size += m.file_file_size || 0
end end
end end
end end