Fixed|FS|libcore: Find all packages under /home

DirectoryFeed constructor was changed so that subfolder population must be specifically requested. However, some calls were being made with flags that overrode the defaults, meaning subfolders of /home were not being populated correctly.
skyjake · Feb 5, 2016 · 6bd891a · 6bd891a
1 parent 04a2412
commit 6bd891a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/doomsday/sdk/libcore/include/de/filesys/directoryfeed.h b/doomsday/sdk/libcore/include/de/filesys/directoryfeed.h
@@ -60,6 +60,8 @@ class DENG2_PUBLIC DirectoryFeed : public Feed
         PopulateNativeSubfolders = 0x4,
 
         OnlyThisFolder = 0,
+
+        DefaultFlags = PopulateNativeSubfolders
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
@@ -71,7 +73,7 @@ class DENG2_PUBLIC DirectoryFeed : public Feed
      * @param mode        Feed mode.
      */
     DirectoryFeed(NativePath const &nativePath,
-                  Flags const &mode = PopulateNativeSubfolders);
+                  Flags const &mode = DefaultFlags);
 
     virtual ~DirectoryFeed();
 

diff --git a/doomsday/sdk/libcore/src/core/app.cpp b/doomsday/sdk/libcore/src/core/app.cpp
@@ -217,7 +217,7 @@ DENG2_PIMPL(App)
 
         // User's home folder.
         fs.makeFolder("/home", FS::DontInheritFeeds).attach(new DirectoryFeed(self.nativeHomePath(),
-                DirectoryFeed::AllowWrite | DirectoryFeed::CreateIfMissing));
+                DirectoryFeed::AllowWrite | DirectoryFeed::CreateIfMissing | DirectoryFeed::DefaultFlags));
 
         fs.makeFolder("/packs").attach(new PackageFeed(packageLoader));
 

diff --git a/doomsday/sdk/libcore/src/filesys/filesystem.cpp b/doomsday/sdk/libcore/src/filesys/filesystem.cpp
@@ -19,7 +19,6 @@
 
 #include "de/FS"
 #include "de/LibraryFile"
-#include "de/DirectoryFeed"
 #include "de/ArchiveFeed"
 #include "de/NativePath"
 #include "de/ArchiveFolder"

diff --git a/doomsday/sdk/libcore/src/filesys/packageloader.cpp b/doomsday/sdk/libcore/src/filesys/packageloader.cpp
@@ -447,9 +447,12 @@ void PackageLoader::loadFromCommandLine()
 StringList PackageLoader::findAllPackages() const
 {
     StringList all;
-    d->listPackagesInIndex(App::fileSystem().indexFor(DENG2_TYPE_NAME(Folder)), all);
-    d->listPackagesInIndex(App::fileSystem().indexFor(DENG2_TYPE_NAME(ArchiveFolder)), all);
-    d->listPackagesInIndex(App::fileSystem().indexFor(DENG2_TYPE_NAME(LinkFile)), all);
+    for(QString typeName : QStringList({ DENG2_TYPE_NAME(Folder),
+                                         DENG2_TYPE_NAME(ArchiveFolder),
+                                         DENG2_TYPE_NAME(LinkFile) }))
+    {
+        d->listPackagesInIndex(App::fileSystem().indexFor(typeName), all);
+    }
     return all;
 }