CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

Fix "tootctl media remove-orphans" crashing on “Import” files (#13685)

Browse Source 
* Fix "tootctl media remove-orphans" crashing on “Import” files

* Also remove empty directories when removing orphaned media
This commit is contained in:
ThibG 2020-05-09 21:06:55 +02:00 committed by GitHub
parent 38b69512ff
commit 34756cc4e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/inflections.rb
View File

@ -19,4 +19,6 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
inflect.acronym 'ActivityStreams' inflect.acronym 'ActivityStreams'
inflect.acronym 'JsonLd' inflect.acronym 'JsonLd'
inflect.acronym 'NodeInfo' inflect.acronym 'NodeInfo'
inflect.singular 'data', 'data'
end end

9
lib/mastodon/media_cli.rb
View File

@ -144,7 +144,14 @@ module Mastodon
begin begin
size = File.size(path) size = File.size(path)
File.delete(path) unless options[:dry_run] unless options[:dry_run]
File.delete(path)
begin
FileUtils.rmdir(File.dirname(path), parents: true)
rescue Errno::ENOTEMPTY
# OK
end
end
reclaimed_bytes += size reclaimed_bytes += size
removed += 1 removed += 1