Resources|Server: Wait for all data files to be identified before sta…

…rting game
skyjake · Nov 13, 2016 · 615c948 · 615c948
1 parent 46178e5
commit 615c948
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 3 deletions.
diff --git a/doomsday/apps/client/src/dd_main.cpp b/doomsday/apps/client/src/dd_main.cpp
@@ -70,6 +70,7 @@
 #include <doomsday/resource/databundle.h>
 #include <doomsday/resource/manifest.h>
 #include <doomsday/resource/resources.h>
+#include <doomsday/res/Bundles>
 #include <doomsday/res/DoomsdayPackage>
 #include <doomsday/res/MapManifests>
 #include <doomsday/res/Sprites>
@@ -905,6 +906,7 @@ static GameProfile const *autoselectGameProfile()
     {
         // Make sure all files have been found so we can determine which games are playable.
         Folder::waitForPopulation();
+        DoomsdayApp::bundles().waitForEverythingIdentified();
 
         char const *identityKey = CommandLine_Next();
 
@@ -1059,7 +1061,22 @@ static void initialize()
             // connections can only be made after a game is loaded and the
             // server mode started.
             /// @todo Allow shell connections in Home, too.
-            App_Error("No playable games available.");
+            String msg = "Could not determine which game to start. "
+                         "Please specify one with the " _E(b) "-game" _E(.) " option. ";
+            auto const playable = DoomsdayApp::gameProfiles().allPlayableProfiles();
+            if (playable.isEmpty())
+            {
+                msg += "However, it seems all games are missing required data files. "
+                       "Check that the " _E(b) "-iwad" _E(.) " option specifies a "
+                       "folder with game WAD files.";
+            }
+            else
+            {
+                StringList ids;
+                foreach (GameProfile const *prof, playable) ids << prof->game();
+                msg += "The following games are playable: " + String::join(ids, ", ");
+            }
+            App_Error(msg.toLatin1());
         }
 #endif
     }

diff --git a/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h b/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h
@@ -91,6 +91,9 @@ class LIBDOOMSDAY_PUBLIC GameProfiles : public de::Profiles
     Profile const &builtInProfile(de::String const &gameId) const;
 
     de::LoopResult forAll(std::function<de::LoopResult (Profile &)> func);
+    de::LoopResult forAll(std::function<de::LoopResult (Profile const &)> func) const;
+
+    QList<Profile const *> allPlayableProfiles() const;
 
     static Profile const &null();
 

diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h b/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h
@@ -81,6 +81,8 @@ class LIBDOOMSDAY_PUBLIC Bundles
 
     bool isEverythingIdentified() const;
 
+    void waitForEverythingIdentified();
+
     /**
      * Finds a matching entry in the registry for a given data bundle.
      * @param bundle  Data bundle whose information to look for.

diff --git a/doomsday/apps/libdoomsday/src/gameprofiles.cpp b/doomsday/apps/libdoomsday/src/gameprofiles.cpp
@@ -89,6 +89,29 @@ LoopResult GameProfiles::forAll(std::function<LoopResult (Profile &)> func)
     });
 }
 
+LoopResult GameProfiles::forAll(std::function<LoopResult (Profile const &)> func) const
+{
+    return Profiles::forAll([&func] (AbstractProfile const &prof) -> LoopResult
+    {
+        if (auto result = func(prof.as<Profile>()))
+        {
+            return result;
+        }
+        return LoopContinue;
+    });
+}
+
+QList<GameProfile const *> GameProfiles::allPlayableProfiles() const
+{
+    QList<GameProfile const *> playable;
+    forAll([&playable] (Profile const &prof)
+    {
+        if (prof.isPlayable()) playable << &prof;
+        return LoopContinue;
+    });
+    return playable;
+}
+
 Profiles::AbstractProfile *GameProfiles::profileFromInfoBlock(Info::BlockElement const &block)
 {
     std::unique_ptr<Profile> prof(new Profile);

diff --git a/doomsday/apps/libdoomsday/src/resource/bundles.cpp b/doomsday/apps/libdoomsday/src/resource/bundles.cpp
@@ -211,6 +211,11 @@ bool Bundles::isEverythingIdentified() const
     return d->bundlesToIdentify.isEmpty();
 }
 
+void Bundles::waitForEverythingIdentified()
+{
+    d->tasks.waitForDone();
+}
+
 Bundles::MatchResult Bundles::match(DataBundle const &bundle) const
 {
     using Info = de::Info;

diff --git a/doomsday/sdk/libcore/include/de/data/profiles.h b/doomsday/sdk/libcore/include/de/data/profiles.h
@@ -130,7 +130,7 @@ class DENG2_PUBLIC Profiles
      */
     StringList profiles() const;
 
-    LoopResult forAll(std::function<LoopResult (AbstractProfile &)> func);
+    LoopResult forAll(std::function<LoopResult (AbstractProfile &)> func) const;
 
     /**
      * Returns the total number of profiles.

diff --git a/doomsday/sdk/libcore/src/data/profiles.cpp b/doomsday/sdk/libcore/src/data/profiles.cpp
@@ -216,7 +216,7 @@ bool Profiles::isPersistent() const
     return !d->persistentName.isEmpty();
 }
 
-LoopResult Profiles::forAll(std::function<LoopResult (AbstractProfile &)> func)
+LoopResult Profiles::forAll(std::function<LoopResult (AbstractProfile &)> func) const
 {
     foreach (AbstractProfile *prof, d->profiles.values())
     {