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

* Fix "tootctl media remove-orphans" crashing on “Import” files * Also remove empty directories when removing orphaned media
mastodon · May 9, 2020 · 34756cc · 34756cc
1 parent 38b6951
commit 34756cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
@@ -19,4 +19,6 @@
  inflect.acronym 'ActivityStreams'
  inflect.acronym 'JsonLd'
  inflect.acronym 'NodeInfo'
+
+ inflect.singular 'data', 'data'
 end
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
@@ -144,7 +144,14 @@ def remove_orphans
  begin
  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
  removed += 1