Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45 from joolswills/display_name

Browse source 
add a getDisplayName function, which is used for rom display, and mak…
This commit is contained in:
Jools Wills 2016-03-29 20:01:23 +01:00
parent abcc9696a2 53f69bf61b
commit 866ea49b7d
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
es-app/src/FileData.cpp
View file

@ -48,7 +48,7 @@ FileData::FileData(FileType type, const fs::path& path, SystemData* system)
{ {
// metadata needs at least a name field (since that's what getName() will return) // metadata needs at least a name field (since that's what getName() will return)
if(metadata.get("name").empty()) if(metadata.get("name").empty())
metadata.set("name", getCleanName()); metadata.set("name", getDisplayName());
} }
FileData::~FileData() FileData::~FileData()
@ -60,7 +60,7 @@ FileData::~FileData()
delete mChildren.back(); delete mChildren.back();
} }
std::string FileData::getCleanName() const std::string FileData::getDisplayName() const
{ {
std::string stem = mPath.stem().generic_string(); std::string stem = mPath.stem().generic_string();
if(mSystem && mSystem->hasPlatformId(PlatformIds::ARCADE) || mSystem->hasPlatformId(PlatformIds::NEOGEO)) if(mSystem && mSystem->hasPlatformId(PlatformIds::ARCADE) || mSystem->hasPlatformId(PlatformIds::NEOGEO))
@ -69,6 +69,11 @@ std::string FileData::getCleanName() const
return stem; return stem;
} }
std::string FileData::getCleanName() const
{
return removeParenthesis(this->getDisplayName());
}
const std::string& FileData::getThumbnailPath() const const std::string& FileData::getThumbnailPath() const
{ {
if(!metadata.get("thumbnail").empty()) if(!metadata.get("thumbnail").empty())

5
es-app/src/FileData.h
View file

@ -49,7 +49,10 @@ public:
void addChild(FileData* file); // Error if mType != FOLDER void addChild(FileData* file); // Error if mType != FOLDER
void removeChild(FileData* file); //Error if mType != FOLDER void removeChild(FileData* file); //Error if mType != FOLDER
// Returns our best guess at the "real" name for this file (will strip parenthesis and attempt to perform MAME name translation) // Returns our best guess at the "real" name for this file (will attempt to perform MAME name translation)
std::string getDisplayName() const;
// As above, but also remove parenthesis
std::string getCleanName() const; std::string getCleanName() const;
typedef bool ComparisonFunction(const FileData* a, const FileData* b); typedef bool ComparisonFunction(const FileData* a, const FileData* b);

2
es-app/src/Gamelist.cpp
View file

@ -148,7 +148,7 @@ void addFileDataNode(pugi::xml_node& parent, const FileData* file, const char* t
if(newNode.children().begin() == newNode.child("name") //first element is name if(newNode.children().begin() == newNode.child("name") //first element is name
&& ++newNode.children().begin() == newNode.children().end() //theres only one element && ++newNode.children().begin() == newNode.children().end() //theres only one element
&& newNode.child("name").text().get() == file->getCleanName()) //the name is the default && newNode.child("name").text().get() == file->getDisplayName()) //the name is the default
{ {
//if the only info is the default name, don't bother with this node //if the only info is the default name, don't bother with this node
//delete it and ultimately do nothing //delete it and ultimately do nothing