GamelistDB starting to be integrated into SystemManager.

es-app/src/GamelistDB.cpp

@@ -337,12 +337,10 @@ void GamelistDB::addMissingFiles(const SystemData* system)
 	const std::string& relativeTo = system->getStartPath(); 
 	const std::vector<std::string>& extensions = system->getExtensions();
 
-	// ?1 = fileid, ?2 = filetype
-	std::stringstream ss;
-	ss << "INSERT OR IGNORE INTO files (fileid, systemid, filetype) VALUES (?1, " << system->getName() << ", ?2)";
-	std::string insert = ss.str();
-
-	SQLPreparedStmt stmt(mDB, insert);
+	// ?1 = fileid, ?2 = filetype, ?3 = systemid
+	SQLPreparedStmt stmt(mDB, "INSERT OR IGNORE INTO files (fileid, systemid, filetype, fileexists) VALUES (?1, ?3, ?2, 1)");
+	sqlite3_bind_text(stmt, 3, system->getName().c_str(), system->getName().size(), SQLITE_STATIC);
+
 	SQLTransaction transaction(mDB);
 
 	// actually start adding things
@@ -355,16 +353,11 @@ void GamelistDB::updateExists(const SystemData* system)
 {
 	const std::string& relativeTo = system->getStartPath();
 
-	std::stringstream ss;
-	ss << "SELECT fileid FROM files WHERE systemid = " << system->getName();
-	std::string readstr = ss.str();
-
-	ss.str("");
-	ss << "UPDATE files SET fileexists = ?1 WHERE fileid = ?2 AND systemid = " << system->getName();
-	std::string updatestr = ss.str();
-
-	SQLPreparedStmt readStmt(mDB, readstr);
-	SQLPreparedStmt updateStmt(mDB, updatestr);
+	SQLPreparedStmt readStmt(mDB, "SELECT fileid FROM files WHERE systemid = ?1");
+	sqlite3_bind_text(readStmt, 1, system->getName().c_str(), system->getName().size(), SQLITE_STATIC);
+
+	SQLPreparedStmt updateStmt(mDB, "UPDATE files SET fileexists = ?1 WHERE fileid = ?2 AND systemid = ?3");
+	sqlite3_bind_text(readStmt, 3, system->getName().c_str(), system->getName().size(), SQLITE_STATIC);
 
 	SQLTransaction transaction(mDB);
 

es-app/src/GamelistDB.h

@@ -19,7 +19,8 @@ boost::filesystem::path fileIDToPath(const std::string& fileID, SystemData* syst
  [file ID] [system ID] [file type] [file exists] [metadata 0] [metadata 1] [metadata 2] ... etc.
  The primary key for this table is the pair (file ID, system ID).
 
- File ID is a string. File type is an int. Metadata types correspond to the MetaDataDecl vector.
+ File ID and system ID are strings. File type is an int. File exists is a boolean. 
+ Metadata types correspond to the MetaDataDecl vector.
 
  File ID is in the following format:
  ./path/to/game.rom  - for paths relative to system root
@@ -29,12 +30,10 @@ boost::filesystem::path fileIDToPath(const std::string& fileID, SystemData* syst
 
  File ID is ALWAYS stored with forward slashes ("generic directory separators," as boost::filesystem calls them).
 
- File type is an enum value, where:
- 0 - game
- 1 - folder
+ File type corresponds to the C++ enum FileType.
 
  File exists is a boolean indicating whether or not the file is present on the file system.
- This value is set at startup.
+ This value is set at startup by the "updateExists" method.
 */
 
 

es-app/src/SystemManager.cpp

@@ -122,7 +122,7 @@ void SystemManager::loadConfig()
 		themeFolder = system.child("theme").text().as_string(name.c_str());
 
 		// validate as best we can (make sure we're not missing required information)
-		if(name.empty() || path.empty() || extensions.empty() || cmd.empty())
+		if(!isValidSystemName(name) || path.empty() || extensions.empty() || cmd.empty())
 			throw ESException() << "System \"" << name << "\" is missing name, path, extension, or command!";
 
 		// convert path to generic directory seperators
@@ -142,6 +142,8 @@ void SystemManager::loadConfig()
 			mSystems.push_back(newSys);
 		}
 	}
+
+	updateDatabase();
 }
 
 void SystemManager::writeExampleConfig(const fs::path& path)
@@ -217,4 +219,29 @@ SystemData* SystemManager::getPrev(SystemData* system) const
 		return *mSystems.rbegin();
 	else
 		return *it;
-}
+}
+
+bool SystemManager::isValidSystemName(const std::string& name)
+{
+	if(name.empty())
+		return false;
+
+	const std::string invalid_chars = "/\\";
+	for(unsigned int i = 0; i < name.size(); i++)
+	{
+		for(unsigned int j = 0; j < invalid_chars.size(); j++)
+			if(name[i] == invalid_chars[j])
+				return false;
+	}
+
+	return true;
+}
+
+void SystemManager::updateDatabase()
+{
+	for(auto it = mSystems.begin(); it != mSystems.end(); it++)
+	{
+		mDatabase.addMissingFiles(*it);
+		mDatabase.updateExists(*it);
+	}
+}

es-app/src/SystemManager.h

@@ -38,6 +38,9 @@ class SystemManager
 
 	// if forWrite is true, will only return ~/.emulationstation/es_systems.cfg, never /etc/emulationstation/es_systems.cfg
 	static boost::filesystem::path getConfigPath(bool forWrite);
+	static bool isValidSystemName(const std::string& name);
 	static std::string getDatabasePath();
-	void writeExampleConfig(const boost::filesystem::path& path);
+	static void writeExampleConfig(const boost::filesystem::path& path);
+
+	void updateDatabase();
 };

es-app/src/main.cpp

@@ -161,26 +161,6 @@ void delete_singletons_on_exit()
 
 int main(int argc, char* argv[])
 {
-	const char* errorMsg;
-
-	Log::open();
-
-	loadSystemConfigFile(&errorMsg);
-	GamelistDB test("test.db");
-
-	const std::vector<SystemData*>& systems = SystemManager::getInstance()->getSystems();
-	for(auto it = systems.begin(); it != systems.end(); it++)
-	{
-		SystemData* sys = *it;
-		test.importXML(sys, sys->getGamelistPath(false));
-		std::string out_path = "test_db_to_xml_";
-		out_path += sys->getName() + ".xml";
-		test.exportXML(sys, out_path);
-	}
-
-	Log::close();
-
-	/*
 	unsigned int width = 0;
 	unsigned int height = 0;
 
@@ -349,8 +329,7 @@ int main(int argc, char* argv[])
 		delete window.peekGui();
 
 	window.deinit();
-	*/
-
+
 	LOG(LogInfo) << "EmulationStation cleanly shutting down.";
 
 	return 0;