Cleanup

skyjake · Oct 17, 2017 · 673d5ca · 673d5ca
1 parent 14be7e0
commit 673d5ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/doomsday/apps/client/src/network/serverlink.cpp b/doomsday/apps/client/src/network/serverlink.cpp
@@ -71,8 +71,10 @@ enum LinkState
 
 static int const NUM_PINGS = 5;
 
-static String const PATH_REMOTE_SERVER  = "/remote/server";
-static String const PATH_REMOTE_PACKS   = "/remote/packs";
+static String const PATH_SERVER_REPOSITORY_ROOT = "/sys/server/files"; // serverside folder
+
+static String const PATH_REMOTE_SERVER = "/remote/server"; // local folder for RemoteFeed
+static String const PATH_REMOTE_PACKS  = "/remote/packs";
 
 DENG2_PIMPL(ServerLink)
 , DENG2_OBSERVES(Asset, StateChange)
@@ -351,7 +353,7 @@ DENG2_PIMPL(ServerLink)
         fileRepository = info.address().asText();
         FS::get().makeFolderWithFeed
                 (PATH_REMOTE_SERVER,
-                 RemoteFeedRelay::get().addServerRepository(fileRepository),
+                 RemoteFeedRelay::get().addServerRepository(fileRepository, PATH_SERVER_REPOSITORY_ROOT),
                  Folder::PopulateAsyncFullTree);
     }
 
@@ -401,8 +403,6 @@ DENG2_PIMPL(ServerLink)
     {
         auto &fs = FS::get();
 
-        qDebug() << fs.locate<Folder const>(PATH_REMOTE_SERVER).contentsAsText().toUtf8().constData();
-
         qDebug() << "registering remote packages...";
 
         Folder &remotePacks = FS::get().makeFolder(PATH_REMOTE_PACKS);

diff --git a/doomsday/apps/server/src/serverapp.cpp b/doomsday/apps/server/src/serverapp.cpp
@@ -132,9 +132,12 @@ DENG2_PIMPL(ServerApp)
 
     void initServerFiles()
     {
+        // Packages available to clients via RemoteFeed use versioned identifiers because
+        // a client may already have a different version of the package.
+
         Folder &files = self().fileSystem().makeFolder(PATH_SERVER_FILES);
         auto *feed = new PackageFeed(PackageLoader::get(),
-                                     PackageFeed::LinkSourceFiles);
+                                     PackageFeed::LinkVersionedIdentifier);
         feed->setFilter([] (Package const &pkg)
         {
             return !pkg.matchTags(pkg.file(), "\\b(vanilla|core)\\b");