THE GREAT FILEDATA REWRITE OF CHRISTMAS 2014

FileData now basically works as a key in the GamelistDB "files" table.

Still not quite done (lots of places marked TODO), but semi-functional.

Removed Boost.Regex dependency, didn't need it after all.

CMakeLists.txt

@@ -35,7 +35,7 @@ endif()
 find_package(Freetype REQUIRED)
 find_package(FreeImage REQUIRED)
 find_package(SDL2 REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem date_time locale regex)
+find_package(Boost REQUIRED COMPONENTS system filesystem date_time locale)
 find_package(Eigen3 REQUIRED)
 find_package(CURL REQUIRED)
 

es-app/CMakeLists.txt

@@ -4,7 +4,6 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/ESException.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
@@ -19,7 +18,6 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
 
     # Guis
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiFastSelect.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h
@@ -49,7 +47,6 @@ set(ES_HEADERS
 
 set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNameMap.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
@@ -65,7 +62,6 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScraperSearchComponent.cpp
 
     # Guis
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiFastSelect.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp

es-app/src/FileData.cpp

@@ -1,5 +1,6 @@
 #include "FileData.h"
 #include "SystemData.h"
+#include "SystemManager.h"
 
 namespace fs = boost::filesystem;
 
@@ -42,103 +43,77 @@ std::string removeParenthesis(const std::string& str)
 	return ret;
 }
 
-
-FileData::FileData(FileType type, const fs::path& path, SystemData* system)
-	: mType(type), mPath(path), mSystem(system), mParent(NULL), metadata(type == GAME ? GAME_METADATA : FOLDER_METADATA) // metadata is REALLY set in the constructor!
+std::string getCleanGameName(const std::string& str, const SystemData* system)
 {
-	// metadata needs at least a name field (since that's what getName() will return)
-	if(metadata.get<std::string>("name").empty())
-		metadata.set("name", getCleanName());
+	fs::path path(str);
+	std::string stem = path.stem().generic_string();
+	if(system && system->hasPlatformId(PlatformIds::ARCADE) || system->hasPlatformId(PlatformIds::NEOGEO))
+		stem = PlatformIds::getCleanMameName(stem.c_str());
+
+	return removeParenthesis(stem);
 }
 
-FileData::~FileData()
+FileData::FileData(const std::string& fileID, SystemData* system, const std::string& nameCache)
+	: mFileID(fileID), mSystem(system), mNameCache(nameCache), mTypeCache((FileType)0)
 {
-	if(mParent)
-		mParent->removeChild(this);
-
-	while(mChildren.size())
-		delete mChildren.back();
 }
 
-std::string FileData::getCleanName() const
+FileData::FileData() : FileData("", NULL)
 {
-	std::string stem = mPath.stem().generic_string();
-	if(mSystem && mSystem->hasPlatformId(PlatformIds::ARCADE) || mSystem->hasPlatformId(PlatformIds::NEOGEO))
-		stem = PlatformIds::getCleanMameName(stem.c_str());
-
-	return removeParenthesis(stem);
 }
 
-const std::string FileData::getThumbnailPath() const
+FileData::FileData(const std::string& fileID, const std::string& systemID) : 
+	FileData(fileID, SystemManager::getInstance()->getSystemByName(systemID))
 {
-	if(!metadata.get<std::string>("thumbnail").empty())
-		return metadata.get<std::string>("thumbnail");
-	else
-		return metadata.get<std::string>("image");
 }
 
+const std::string& FileData::getSystemID() const
+{
+	return mSystem->getName();
+}
 
-std::vector<FileData*> FileData::getFilesRecursive(unsigned int typeMask) const
+const std::string& FileData::getName() const
 {
-	std::vector<FileData*> out;
+	// try and cache what's in the DB
+	if(mNameCache.empty())
+		mNameCache = get_metadata().get<std::string>("name");
 
-	for(auto it = mChildren.begin(); it != mChildren.end(); it++)
-	{
-		if((*it)->getType() & typeMask)
-			out.push_back(*it);
-
-		if((*it)->getChildren().size() > 0)
-		{
-			std::vector<FileData*> subchildren = (*it)->getFilesRecursive(typeMask);
-			out.insert(out.end(), subchildren.cbegin(), subchildren.cend());
-		}
-	}
+	// nothing was in the DB...use the clean version of our path
+	if(mNameCache.empty())
+		mNameCache = getCleanName();
 
-	return out;
+	return mNameCache;
 }
 
-void FileData::addChild(FileData* file)
+fs::path FileData::getPath() const
 {
-	assert(mType == FOLDER);
-	assert(file->getParent() == NULL);
-
-	mChildren.push_back(file);
-	file->mParent = this;
+	return fileIDToPath(mFileID, mSystem);
 }
 
-void FileData::removeChild(FileData* file)
+FileType FileData::getType() const
 {
-	assert(mType == FOLDER);
-	assert(file->getParent() == this);
-
-	for(auto it = mChildren.begin(); it != mChildren.end(); it++)
-	{
-		if(*it == file)
-		{
-			mChildren.erase(it);
-			return;
-		}
-	}
+	if(mTypeCache == 0)
+		mTypeCache = (get_metadata().getType() == GAME_METADATA ? GAME : FOLDER);
 
-	// File somehow wasn't in our children.
-	assert(false);
+	return mTypeCache;
 }
 
-void FileData::sort(ComparisonFunction& comparator, bool ascending)
+MetaDataMap FileData::get_metadata() const
 {
-	std::sort(mChildren.begin(), mChildren.end(), comparator);
+	return SystemManager::getInstance()->database().getFileData(mFileID, mSystem->getName());
+}
 
-	for(auto it = mChildren.begin(); it != mChildren.end(); it++)
-	{
-		if((*it)->getChildren().size() > 0)
-			(*it)->sort(comparator, ascending);
-	}
+void FileData::set_metadata(const MetaDataMap& metadata)
+{
+	SystemManager::getInstance()->database().setFileData(mFileID, mSystem->getName(), metadata);
+}
 
-	if(!ascending)
-		std::reverse(mChildren.begin(), mChildren.end());
+std::vector<FileData> FileData::getChildren() const
+{
+	return SystemManager::getInstance()->database().getChildrenOf(mFileID, mSystem, true, true);
 }
 
-void FileData::sort(const SortType& type)
+std::vector<FileData> FileData::getChildrenRecursive(bool includeFolders) const
 {
-	sort(*type.comparisonFunction, type.ascending);
+	return SystemManager::getInstance()->database().getChildrenOf(mFileID, mSystem, false, includeFolders);
 }

es-app/src/FileData.h

@@ -28,50 +28,39 @@ FileType stringToFileType(const char* str);
 // Remove (.*) and [.*] from str
 std::string removeParenthesis(const std::string& str);
 
-// A tree node that holds information for a file.
+std::string getCleanGameName(const std::string& str, const SystemData* system);
+
 class FileData
 {
 public:
-	FileData(FileType type, const boost::filesystem::path& path, SystemData* system);
-	virtual ~FileData();
-
-	inline const std::string getName() const { return metadata.get<std::string>("name"); }
-	inline FileType getType() const { return mType; }
-	inline const boost::filesystem::path& getPath() const { return mPath; }
-	inline FileData* getParent() const { return mParent; }
-	inline const std::vector<FileData*>& getChildren() const { return mChildren; }
-	inline SystemData* getSystem() const { return mSystem; }
-
-	const std::string getThumbnailPath() const;
+	FileData();
+	FileData(const std::string& fileID, SystemData* system, const std::string& nameCache = "");
+	FileData(const std::string& fileID, const std::string& systemID);
 
-	std::vector<FileData*> getFilesRecursive(unsigned int typeMask) const;
+	inline bool operator==(const FileData& rhs) const { return (mFileID == rhs.mFileID && mSystem == rhs.mSystem); }
+	inline bool operator!=(const FileData& rhs) const { return !(*this == rhs); }
 
-	void addChild(FileData* file); // Error if mType != FOLDER
-	void removeChild(FileData* file); //Error if mType != FOLDER
+	MetaDataMap get_metadata() const;
+	void set_metadata(const MetaDataMap& metadata);
 
-	// Returns our best guess at the "real" name for this file (will strip parenthesis and attempt to perform MAME name translation)
-	std::string getCleanName() const;
+	const std::string& getName() const;
+	FileType getType() const;
 
-	typedef bool ComparisonFunction(const FileData* a, const FileData* b);
-	struct SortType
-	{
-		ComparisonFunction* comparisonFunction;
-		bool ascending;
-		std::string description;
+	boost::filesystem::path getPath() const;
 
-		SortType(ComparisonFunction* sortFunction, bool sortAscending, const std::string & sortDescription) 
-			: comparisonFunction(sortFunction), ascending(sortAscending), description(sortDescription) {}
-	};
+	inline const std::string& getFileID() const { return mFileID; }
+	const std::string& getSystemID() const;
+	SystemData* getSystem() const { return mSystem; }
 
-	void sort(ComparisonFunction& comparator, bool ascending = true);
-	void sort(const SortType& type);
+	std::vector<FileData> getChildren() const;
+	std::vector<FileData> getChildrenRecursive(bool includeFolders) const;
 
-	MetaDataMap metadata;
+	inline std::string getCleanName() const { return getCleanGameName(mFileID, mSystem); }
 
 private:
-	FileType mType;
-	boost::filesystem::path mPath;
+	std::string mFileID;
 	SystemData* mSystem;
-	FileData* mParent;
-	std::vector<FileData*> mChildren;
+
+	mutable std::string mNameCache;
+	mutable FileType mTypeCache;
 };