Merge pull request #1908 from getnikola/fix-1873

Kwpolska · Kwpolska · commit 77a8d380b7da · 2015-07-24T09:42:51.000+02:00
remove empty directories with --clean-files
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ New in master
 Features
 --------
 
+* Remove empty directories with nikola check --clean-files (Issue #1873)
+
 Bugfixes
 --------
 
diff --git a/nikola/plugins/command/check.py b/nikola/plugins/command/check.py
@@ -313,5 +313,19 @@ def scan_files(self):
     def clean_files(self):
         only_on_output, _ = real_scan_files(self.site)
         for f in only_on_output:
+            self.logger.info('removed: {0}'.format(f))
             os.unlink(f)
+
+        # Find empty directories and remove them
+        output_folder = self.site.config['OUTPUT_FOLDER']
+        all_dirs = []
+        for root, dirs, files in os.walk(output_folder, followlinks=True):
+            all_dirs.append(root)
+        all_dirs.sort(key=len, reverse=True)
+        for d in all_dirs:
+            try:
+                os.rmdir(d)
+                self.logger.info('removed: {0}/'.format(d))
+            except OSError:
+                pass
         return True
