Clean up empty directories after rename.

Sometimes, when data in LML changes, files might get moved from a directory created by rename rules. This might leave some empty directories. This change cleans up those directories after renaming.

diff --git a/localmylist/renamehandler.cpp b/localmylist/renamehandler.cpp
index f06b03a543376c756347d16596d059a7286c6142..8b11234ae886711bea56e64c28b6de89fbe861c1 100644 (file)
--- a/localmylist/renamehandler.cpp
+++ b/localmylist/renamehandler.cpp
@@ -174,7 +174,18 @@ void RenameHandler::handleRename()
 
                db->log(tr("Rename: File <%1> was renamed to <%2>").arg(oldFile.canonicalFilePath()).arg(newFileString));
 
-               // TODO cleanup empty dirs
+               QDir dir = oldFile.dir();
+               dir.setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
+               while (!dir.count())
+               {
+                       if (!dir.rmdir(dir.canonicalPath()))
+                       {
+                               qDebug() << "Failed to remove empty directory " << dir.path();
+                               break;
+                       }
+                       if (!dir.cdUp())
+                               break;
+               }
        }
 
        emit renameBatchFinished();