Save/language listing fixes:

- Fixed listing bugs.
- Lists are now sorted on any platform.
- Invalid files are ignored instead of crashing the game.

Author: SupSuper

src/Engine/CrossPlatform.cpp

@@ -20,6 +20,7 @@
 #include <iostream>
 #include <algorithm>
 #include <sys/stat.h>
+#include "../dirent.h"
 #include "Exception.h"
 #include "Options.h"
 #ifdef _WIN32
@@ -277,5 +278,55 @@ int createFolder(const char *path)
 #endif
 }
 
+/**
+ * Gets the name of all the files
+ * contained in a certain folder.
+ * @param path Full path to folder.
+ * @param ext Extension of files ("" if it doesn't matter).
+ */
+std::vector<std::string> getFolderContents(const std::string &path, const std::string &ext)
+{
+	std::vector<std::string> files;
+
+	DIR *dp = opendir(path.c_str());
+    if (dp == 0)
+	{
+        throw Exception("Failed to open saves directory");
+    }
+
+    struct dirent *dirp;
+    while ((dirp = readdir(dp)) != 0)
+	{
+		std::string file = dirp->d_name;
+
+		if (file == "." || file == "..")
+		{
+			continue;
+		}
+		if (!ext.empty())
+		{
+			if (file.length() >= ext.length() + 1)
+			{
+				std::string end = file.substr(file.length() - ext.length() - 1);
+				if (end != "." + ext)
+				{
+					continue;
+				}
+			}
+			else
+			{
+				continue;
+			}
+		}
+
+		files.push_back(file);
+	}
+    closedir(dp);
+#ifndef _WIN32
+	std::sort(files.begin(), files.end());
+#endif
+	return files;
+}
+
 }
 }

src/Engine/CrossPlatform.h

@@ -20,6 +20,7 @@
 #define OPENXCOM_CROSSPLATFORM_H
 
 #include <string>
+#include <vector>
 
 namespace OpenXcom
 {
@@ -42,6 +43,8 @@ namespace CrossPlatform
 	std::string findUserFolder(bool exists);
 	/// Creates a folder.
 	int createFolder(const char *path);
+	/// Returns the list of files in a folder.
+	std::vector<std::string> getFolderContents(const std::string &path, const std::string &ext = "");
 }
 
 }

src/Engine/Language.cpp

@@ -19,7 +19,7 @@
 #include "Language.h"
 #include <iostream>
 #include <fstream>
-#include "../dirent.h"
+#include "CrossPlatform.h"
 #include "Exception.h"
 #include "Options.h"
 #include "../Interface/TextList.h"
@@ -171,48 +171,43 @@ void Language::replace(std::string &str, const std::string &find, const std::str
  */
 std::vector<std::string> Language::getList(TextList *list)
 {
-	std::vector<std::string> langs;
-	std::string dir = Options::getDataFolder() + "Language/";
-	DIR *dp = opendir(dir.c_str());
-    if (dp == 0)
-	{
-        throw Exception("Failed to open language directory");
-    }
+	std::vector<std::string> langs = CrossPlatform::getFolderContents(Options::getDataFolder() + "Language/", "lng");
 
-    struct dirent *dirp;
-    while ((dirp = readdir(dp)) != 0)
+	for (std::vector<std::string>::iterator i = langs.begin(); i != langs.end(); ++i)
 	{
-		std::string file = dirp->d_name;
-		// Check if it's a valid language
-		if (file.find(".lng") == std::string::npos)
-		{
-			continue;
-		}
-		std::string fullname = dir + file;
+		std::string file = (*i);
+		std::string fullname = Options::getDataFolder() + "Language/" + file;
 		std::ifstream fin(fullname.c_str(), std::ios::in | std::ios::binary);
-		if (!fin)
-		{
-		    closedir(dp);
-			throw Exception("Failed to load language");
-		}
-		char value;
-		std::string langname;
-		while (fin.read(&value, 1))
+		try
 		{
-			if (value != '\n')
+			if (!fin)
 			{
-				langname += value;
+				throw Exception("Failed to load language");
 			}
-			else
+			char value;
+			std::string langname;
+			while (fin.read(&value, 1))
 			{
-				break;
+				if (value != '\n')
+				{
+					langname += value;
+				}
+				else
+				{
+					break;
+				}
 			}
+			fin.close();
+			list->addRow(1, Language::utf8ToWstr(langname).c_str());
+			(*i) = file.substr(0, file.length()-4);
+		}
+		catch (Exception &e)
+		{
+			std::cerr << e.what() << std::endl;
+			i = langs.erase(i);
+			continue;
 		}
-		fin.close();
-		list->addRow(1, Language::utf8ToWstr(langname).c_str());
-		langs.push_back(file.substr(0, file.length()-4));
     }
-    closedir(dp);
 	return langs;
 }
 

src/Savegame/SavedGame.cpp

@@ -20,14 +20,14 @@
 #include <fstream>
 #include <sstream>
 #include <iomanip>
-#include "../dirent.h"
 #include "yaml.h"
 #include "../Ruleset/Ruleset.h"
 #include "../Engine/RNG.h"
 #include "../Engine/Language.h"
 #include "../Interface/TextList.h"
 #include "../Engine/Exception.h"
 #include "../Engine/Options.h"
+#include "../Engine/CrossPlatform.h"
 #include "SavedBattleGame.h"
 #include "GameTime.h"
 #include "Country.h"
@@ -129,44 +129,45 @@ SavedGame::~SavedGame()
  */
 void SavedGame::getList(TextList *list, Language *lang)
 {
-	DIR *dp = opendir(Options::getUserFolder().c_str());
-    if (dp == 0)
-	{
-        throw Exception("Failed to open saves directory");
-    }
+	std::vector<std::string> saves = CrossPlatform::getFolderContents(Options::getUserFolder(), "sav");
 
-    struct dirent *dirp;
-    while ((dirp = readdir(dp)) != 0)
+	for (std::vector<std::string>::iterator i = saves.begin(); i != saves.end(); ++i)
 	{
-		std::string file = dirp->d_name;
-		// Check if it's a valid save
-		if (file.size() < 4 || file.rfind(".sav") != file.size() - 4)
+		std::string file = (*i);
+		std::string fullname = Options::getUserFolder() + file;
+		std::ifstream fin(fullname.c_str());
+		try
 		{
+			if (!fin)
+			{
+				throw Exception("Failed to load savegame");
+			}
+			YAML::Parser parser(fin);
+			YAML::Node doc;
+
+			parser.GetNextDocument(doc);
+			GameTime time = GameTime(6, 1, 1, 1999, 12, 0, 0);
+			time.load(doc["time"]);
+			std::stringstream saveTime;
+			std::wstringstream saveDay, saveMonth, saveYear;
+			saveTime << time.getHour() << ":" << std::setfill('0') << std::setw(2) << time.getMinute();
+			saveDay << time.getDay() << lang->getString(time.getDayString());
+			saveMonth << lang->getString(time.getMonthString());
+			saveYear << time.getYear();
+			list->addRow(5, Language::utf8ToWstr(file.substr(0, file.length()-4)).c_str(), Language::utf8ToWstr(saveTime.str()).c_str(), saveDay.str().c_str(), saveMonth.str().c_str(), saveYear.str().c_str());
+			fin.close();
+		}
+		catch (Exception &e)
+		{
+			std::cerr << e.what() << std::endl;
 			continue;
 		}
-		std::string fullname = Options::getUserFolder() + file;
-		std::ifstream fin(fullname.c_str());
-		if (!fin)
+		catch (YAML::Exception &e)
 		{
-		    closedir(dp);
-			throw Exception("Failed to load savegame");
+			std::cerr << e.what() << std::endl;
+			continue;
 		}
-		YAML::Parser parser(fin);
-		YAML::Node doc;
-
-		parser.GetNextDocument(doc);
-		GameTime time = GameTime(6, 1, 1, 1999, 12, 0, 0);
-		time.load(doc["time"]);
-		std::stringstream saveTime;
-		std::wstringstream saveDay, saveMonth, saveYear;
-		saveTime << time.getHour() << ":" << std::setfill('0') << std::setw(2) << time.getMinute();
-		saveDay << time.getDay() << lang->getString(time.getDayString());
-		saveMonth << lang->getString(time.getMonthString());
-		saveYear << time.getYear();
-		list->addRow(5, Language::utf8ToWstr(file.substr(0, file.length()-4)).c_str(), Language::utf8ToWstr(saveTime.str()).c_str(), saveDay.str().c_str(), saveMonth.str().c_str(), saveYear.str().c_str());
-		fin.close();
     }
-    closedir(dp);
 }
 
 /**