Refactor: Use improved FS2 flushing, file system utils

It is no longer necessary or advisable to change a file to ReadOnly mode after writing it. Instead, the file should just be flushed.
skyjake · Apr 5, 2014 · 9cc96cf · 9cc96cf
1 parent 9c1d00d
commit 9cc96cf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/doomsday/client/src/resource/resourcesystem.cpp b/doomsday/client/src/resource/resourcesystem.cpp
@@ -1971,10 +1971,10 @@ DENG2_PIMPL(ResourceSystem)
 
             if(namePattern.isValid() && !namePattern.isEmpty())
             {
-                Folder &sourceFolder = App::fileSystem().makeFolder(de::String("/legacySavegames") / gameId, FS::DontInheritFeeds);
-                sourceFolder.attach(new DirectoryFeed(oldSavePath));
-                sourceFolder.populate(Folder::PopulateOnlyThisFolder);
-                sourceFolder.setMode(Folder::ReadOnly);
+                Folder &sourceFolder = App::fileSystem().makeFolderWithFeed(
+                            de::String("/legacySavegames") / gameId,
+                            new DirectoryFeed(oldSavePath),
+                            Folder::PopulateOnlyThisFolder /* no need to go deep */);
 
                 //ArrayValue *pathList = 0;
                 DENG2_FOR_EACH_CONST(Folder::Contents, i, sourceFolder.contents())

diff --git a/doomsday/client/src/settingsregister.cpp b/doomsday/client/src/settingsregister.cpp
@@ -521,7 +521,7 @@ DENG2_OBSERVES(App, GameChange)
         // Create the pack and update the file system.
         File &outFile = App::rootFolder().replaceFile(fileName());
         outFile << info.toUtf8();
-        outFile.setMode(File::ReadOnly); // we're done
+        outFile.flush(); // we're done
 
         LOG_VERBOSE("Wrote \"%s\" with %i profile%s") << fileName() << count << (count != 1? "s" : "");
     }

diff --git a/doomsday/libdeng2/include/de/game/savedsession.h b/doomsday/libdeng2/include/de/game/savedsession.h
@@ -31,8 +31,8 @@ namespace game {
 /**
  * Specialized PackageFolder that hosts a serialized game session.
  *
- * Expands upon the services provided by the base class, adding various convenience methods
- * for inspecting the data within.
+ * Expands upon the services provided by the base class, adding various
+ * convenience methods for inspecting the data within.
  *
  * @ingroup game
  */

diff --git a/doomsday/tools/savegametool/src/id1translator.cpp b/doomsday/tools/savegametool/src/id1translator.cpp
@@ -271,6 +271,6 @@ void Id1Translator::convert(Path path)
 
     File &outFile = outputFolder().replaceFile(saveName.fileNameWithoutExtension() + ".save");
     Writer(outFile) << arch;
-    outFile.setMode(File::ReadOnly);
+    outFile.flush();
     LOG_MSG("Wrote ") << outFile.as<NativeFile>().nativePath().pretty();
 }
diff --git a/doomsday/tools/savegametool/src/nativetranslator.cpp b/doomsday/tools/savegametool/src/nativetranslator.cpp
@@ -703,6 +703,6 @@ void NativeTranslator::convert(Path path)
 
     File &outFile = outputFolder().replaceFile(saveName.fileNameWithoutExtension() + ".save");
     Writer(outFile) << arch;
-    outFile.setMode(File::ReadOnly);
-    LOG_MSG("Wrote ") << outFile.as<NativeFile>().nativePath().pretty();
+    outFile.flush();
+    LOG_MSG("Wrote %s") << outFile.description();
 }