FS|libcore: Deleting directories; cleanup

DirectoryFeed did not have the ability to delete directories even when requested.
skyjake · Nov 8, 2018 · 759ad13 · 759ad13
1 parent 3631dab
commit 759ad13
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 17 deletions.
diff --git a/doomsday/sdk/libcore/include/de/filesys/filesystem.h b/doomsday/sdk/libcore/include/de/filesys/filesystem.h
@@ -351,17 +351,22 @@ class DENG2_PUBLIC FileSystem : public System
 
     void changeBusyLevel(int increment);
     int  busyLevel() const;
-    void waitForIdle();
 
 public:
+    static void waitForIdle();
+
     template <typename T>
     static T &locate(String const &path) {
-        return FileSystem::get().root().locate<T>(path);
+        return get().root().locate<T>(path);
     }
 
     template <typename T>
     static T *tryLocate(String const &path) {
-        return FileSystem::get().root().tryLocate<T>(path);
+        return get().root().tryLocate<T>(path);
+    }
+
+    static inline bool exists(const String &path) {
+        return get().root().tryLocate<const File>(path) != nullptr;
     }
 
     enum CopyBehavior

diff --git a/doomsday/sdk/libcore/include/de/filesys/folder.h b/doomsday/sdk/libcore/include/de/filesys/folder.h
@@ -179,7 +179,7 @@ class DENG2_PUBLIC Folder : public File
     bool tryDestroyFile(String const &name);
 
     /**
-     * Removes all files in the folder. The files will be delted. If the files
+     * Removes all files in the folder. The files will be deleted. If the files
      * have origin feeds, the feed will be asked to remove the files as well.
      * The folder remains locked during the entire operation.
      */

diff --git a/doomsday/sdk/libcore/include/de/filesys/nativepath.h b/doomsday/sdk/libcore/include/de/filesys/nativepath.h
@@ -157,6 +157,9 @@ class DENG2_PUBLIC NativePath : public Path
 
     bool isReadable() const;
 
+    inline void create() { createPath(*this); }
+    inline bool destroy() { return destroyPath(*this); }
+
     /**
      * Returns the current native working path.
      */
@@ -185,7 +188,9 @@ class DENG2_PUBLIC NativePath : public Path
      *
      * @param nativePath  Native directory to create.
      */
-    static void createPath(NativePath const &nativePath);
+    static void createPath(const NativePath &nativePath);
+
+    static bool destroyPath(const NativePath &nativePath);
 
     /**
      * Returns the native path separator character.

diff --git a/doomsday/sdk/libcore/src/data/bank.cpp b/doomsday/sdk/libcore/src/data/bank.cpp
@@ -570,7 +570,7 @@ DENG2_PIMPL(Bank)
     {
         DENG2_ASSERT(serialCache);
 
-        FS::get().waitForIdle();
+        FS::waitForIdle();
         if (Folder *folder = serialCache->folder())
         {
             folder->destroyAllFilesRecursively();

diff --git a/doomsday/sdk/libcore/src/filesys/directoryfeed.cpp b/doomsday/sdk/libcore/src/filesys/directoryfeed.cpp
@@ -217,9 +217,9 @@ bool DirectoryFeed::prune(File &file) const
         if (subFolder->feeds().size() == 1)
         {
             DirectoryFeed *dirFeed = maybeAs<DirectoryFeed>(subFolder->feeds().front());
-            if (dirFeed && !NativePath::exists(dirFeed->d->nativePath))
+            if (dirFeed && !dirFeed->d->nativePath.exists())
             {
-                LOG_RES_NOTE("Pruning \"%s\": no longer exists") << d->nativePath;
+                LOG_RES_NOTE("Pruning %s: no longer exists") << dirFeed->description(); //d->nativePath;
                 return true;
             }
         }
@@ -247,13 +247,12 @@ void DirectoryFeed::destroyFile(String const &name)
 {
     NativePath path = d->nativePath / name;
 
-    if (!NativePath::exists(path))
+    if (!path.exists())
     {
         // The file doesn't exist in the native file system, we can ignore this.
         return;
     }
-
-    if (!QDir::current().remove(path))
+    if (!path.destroy())
     {
         /// @throw RemoveError  The file @a name exists but could not be removed.
         throw RemoveError("DirectoryFeed::destroyFile", "Cannot remove \"" + name +

diff --git a/doomsday/sdk/libcore/src/filesys/filesystem.cpp b/doomsday/sdk/libcore/src/filesys/filesystem.cpp
@@ -381,15 +381,16 @@ int FileSystem::busyLevel() const
     return d->busyLevel;
 }
 
-void FileSystem::waitForIdle()
+void FileSystem::waitForIdle() // static
 {
     using namespace std;
 
-    unique_lock<mutex> lk(d->busyMutex);
-    if (d->busyLevel > 0)
+    auto &fs = get();
+    unique_lock<mutex> lk(fs.d->busyMutex);
+    if (fs.d->busyLevel > 0)
     {
         LOG_MSG("Waiting until file system is ready");
-        d->busyFinished.wait(lk);
+        fs.d->busyFinished.wait(lk);
     }
 }
 

diff --git a/doomsday/sdk/libcore/src/filesys/nativepath.cpp b/doomsday/sdk/libcore/src/filesys/nativepath.cpp
@@ -295,18 +295,34 @@ void NativePath::createPath(NativePath const &nativePath)
     NativePath parentPath = nativePath.fileNamePath();
     if (!parentPath.isEmpty() && !exists(parentPath))
     {
-        createPath(parentPath);
+        parentPath.create();
     }
 
     QDir::current().mkdir(nativePath);
 
-    if (!exists(nativePath))
+    if (!nativePath.exists())
     {
         /// @throw CreateDirError Failed to create directory @a nativePath.
         throw CreateDirError("NativePath::createPath", "Could not create: " + nativePath);
     }
 }
 
+bool NativePath::destroyPath(const NativePath &nativePath)
+{
+    if (!nativePath.isEmpty())
+    {
+        if (nativePath.isDirectory())
+        {
+            return QDir::current().rmdir(nativePath);
+        }
+        else
+        {
+            return QDir::current().remove(nativePath);
+        }
+    }
+    return true;
+}
+
 QChar NativePath::separator()
 {
     return DIR_SEPARATOR;