Merge branch 'RetroPie:master' into master

Author: Gemba

README.md

@@ -29,6 +29,8 @@ sudo dnf install SDL2-devel freeimage-devel freetype-devel curl-devel \
   vlc-devel rapidjson-devel
 ```
 
+ Optionaly, `pugixml` can be installed and used (Debian package: `libpugixml-dev`, Fedora/SuSE package: `pugixml-devel`), but EmulationStation can use its own included copy if not found.
+ 
 **Note**: this repository uses a git submodule - to checkout the source and all submodules, use
 
 ```bash

es-app/src/Gamelist.cpp

@@ -56,8 +56,12 @@ FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType
 
 			FileData* file = new FileData(type, path, system->getSystemEnvData(), system);
 
-			// skipping arcade assets from gamelist
-			if(!file->isArcadeAsset())
+			// skipping arcade assets from gamelist and add only to filesystem
+			// (fs) folders, i.e. entriess in gamelist with <folder/> and not to
+			// fs-folders which are marked as <game/> in gamelist. NB:
+			// treeNode's type (=parent) is determined by the element in the
+			// gamelist and not by the fs-type.
+			if(!file->isArcadeAsset() && treeNode->getType() == FOLDER)
 			{
 				treeNode->addChild(file);
 			}
@@ -74,7 +78,14 @@ FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType
 				LOG(LogWarning) << "gameList: folder " << absFolder << " absent on fs, no FileData object created. Do remove leftover in gamelist.xml to remediate this warning.";
 				return NULL;
 			}
-
+			// discard constellations like scummvm/game.svm/game.svm as
+			// scummvm/game.svm/ is a GAME and not a FOLDER
+			if (treeNode->getType() == GAME)
+			{
+				std::string absFolder = Utils::FileSystem::getAbsolutePath(pathSegment, systemPath);
+				LOG(LogWarning) << "gameList: trying to add game '" << absFolder << "' to a parent <game/> entry is invalid, no FileData object created. Do remove nested <game/> in gamelist.xml to remediate this warning.";
+				return NULL;
+			}
 			// create folder filedata object
 			std::string absPath = Utils::FileSystem::resolveRelativePath(treeNode->getPath() + "/" + pathSegment, systemPath, false, true);
 			FileData* folder = new FileData(FOLDER, absPath, system->getSystemEnvData(), system);
@@ -152,7 +163,7 @@ void parseGamelist(SystemData* system)
 			else if(!file->isArcadeAsset())
 			{
 				std::string defaultName = file->metadata.get("name");
-				file->metadata = MetaDataList::createFromXML(i == 0 ? GAME_METADATA : FOLDER_METADATA, fileNode, relativeTo);
+				file->metadata = MetaDataList::createFromXML(file->getType() == GAME ? GAME_METADATA : FOLDER_METADATA, fileNode, relativeTo);
 
 				//make sure name gets set if one didn't exist
 				if(file->metadata.get("name").empty())

es-app/src/MetaData.cpp

@@ -14,7 +14,7 @@ MetaDataDecl gameDecls[] = {
 	{"video",       MD_PATH     ,           "",                 false,      "video",                "enter path to video"},
 	{"marquee",     MD_PATH,                "",                 false,      "marquee",              "enter path to marquee"},
 	{"thumbnail",   MD_PATH,                "",                 false,      "thumbnail",            "enter path to thumbnail"},
-	{"rating",      MD_RATING,              "0.000000",         false,      "rating",               "enter rating"},
+	{"rating",      MD_RATING,              "0",                false,      "rating",               "enter rating"},
 	{"releasedate", MD_DATE,                "not-a-date-time",  false,      "release date",         "enter release date"},
 	{"developer",   MD_STRING,              "unknown",          false,      "developer",            "enter game developer"},
 	{"publisher",   MD_STRING,              "unknown",          false,      "publisher",            "enter game publisher"},
@@ -42,7 +42,7 @@ MetaDataDecl folderDecls[] = {
 	{"thumbnail",   MD_PATH,                "",                 false,      "thumbnail",            "enter path to thumbnail"},
 	{"video",       MD_PATH,                "",                 false,      "video",                "enter path to video"},
 	{"marquee",     MD_PATH,                "",                 false,      "marquee",              "enter path to marquee"},
-	{"rating",      MD_RATING,              "",                 false,      "rating",               "enter rating"},
+	{"rating",      MD_RATING,              "0",                false,      "rating",               "enter rating"},
 	{"releasedate", MD_DATE,                blankDate(),        true,       "release date",         "enter release date"},
 	{"developer",   MD_STRING,              "",                 false,      "developer",            "enter game developer"},
 	{"publisher",   MD_STRING,              "",                 false,      "publisher",            "enter game publisher"},

es-app/src/SystemScreenSaver.cpp

@@ -205,7 +205,7 @@ void SystemScreenSaver::handleScreenSaverEditingCollection()
 		{
 			// we're exiting the screensaver, restore the currently actively editing collection
 			CollectionSystemManager::get()->exitEditMode(true);
-			if (mRegularEditingCollection != "Favorites")
+			if (mRegularEditingCollection != "Favorites" && mRegularEditingCollection != "")
 				CollectionSystemManager::get()->setEditMode(mRegularEditingCollection, true);
 			mRegularEditingCollection = "";
 		}

es-app/src/guis/GuiMetaDataEd.cpp

@@ -1,5 +1,6 @@
 #include "guis/GuiMetaDataEd.h"
 
+#include <stdlib.h>
 #include "components/ButtonComponent.h"
 #include "components/ComponentList.h"
 #include "components/DateTimeComponent.h"
@@ -19,6 +20,7 @@
 #include "FileFilterIndex.h"
 #include "SystemData.h"
 #include "Window.h"
+#include "Log.h"
 
 GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector<MetaDataDecl>& mdd, ScraperSearchParams scraperParams,
 	const std::string& /*header*/, std::function<void()> saveCallback, std::function<void()> deleteFunc) : GuiComponent(window),
@@ -267,19 +269,48 @@ void GuiMetaDataEd::close(bool closeAllWindows)
 	}
 }
 
-bool GuiMetaDataEd::hasChanges() 
+bool GuiMetaDataEd::hasChanges()
 {
 	assert(mMetaDataDecl.size() >= mEditors.size());
 	// find out if the user made any changes
 	int edIdx = 0;
 	for(auto &mdd : mMetaDataDecl)
 	{
-		if(!mdd.isStatistic && mMetaData->get(mdd.key) != mEditors.at(edIdx++)->getValue())
-			return true;
+		if(!mdd.isStatistic)
+		{
+			std::string gamelistVal = mMetaData->get(mdd.key);
+			std::string editorVal = mEditors.at(edIdx++)->getValue();
+			if (mdd.key == "rating")
+			{
+				// needed to catch "0", "0.0" or ".<d>" (and "1.0") from gamelist string rating
+				// getValue() of RatingComponent returns "0" for floats 0, 0.0; "0.<d>" for .<d>
+				// and "1" for float 1.0
+				// convert to float and compare to avoid false "Save Changes" prompt
+				bool ok;
+				if (to_float(gamelistVal, ok) != to_float(editorVal, ok))
+					return true;
+			}
+			else
+			{
+				// string compare
+				if (gamelistVal != editorVal)
+					return true;
+			}
+		}
 	}
 	return false;
 }
 
+float GuiMetaDataEd::to_float(const std::string& str, bool& ok)
+{
+	errno = 0;
+	char* end = nullptr;
+	float f = std::strtof(str.c_str(), &end);
+	ok = !str.empty() && !*end && errno == 0;
+	if (!ok)
+		LOG(LogWarning) << "Conversion of input string '" << str << "' to float failed or is incomplete. Return value: " << f;
+	return f;
+}
 
 bool GuiMetaDataEd::input(InputConfig* config, Input input)
 {

es-app/src/guis/GuiMetaDataEd.h

@@ -8,6 +8,7 @@
 #include "GuiComponent.h"
 #include "MetaData.h"
 
+
 class ComponentList;
 class TextComponent;
 
@@ -26,7 +27,8 @@ class GuiMetaDataEd : public GuiComponent
 	void fetch();
 	void fetchDone(const ScraperSearchResult& result);
 	void close(bool closeAllWindows);
-	bool hasChanges(); 
+	bool hasChanges();
+	float to_float(const std::string& str, bool& ok);
 
 	NinePatchComponent mBackground;
 	ComponentGrid mGrid;

es-core/src/HttpReq.cpp

@@ -77,7 +77,13 @@ HttpReq::HttpReq(const std::string& url)
 	}
 
 	//set curl restrict redirect protocols
+	//starting with 7.85.0, CURLOPT_REDIR_PROTOCOLS is deprecated
+	// and CURLOPT_REDIR_PROTOCOLS_STR should be used instead
+#if CURL_AT_LEAST_VERSION(7,85,0)
+	err = curl_easy_setopt(mHandle, CURLOPT_REDIR_PROTOCOLS_STR, "http,https");
+#else
 	err = curl_easy_setopt(mHandle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+#endif
 	if(err != CURLE_OK)
 	{
 		mStatus = REQ_IO_ERROR;

resources/mamebioses.xml

@@ -1,4 +1,4 @@
-<!-- Generated on 2022-02-11, from MAME 0.240 (Arcade).dat, fbneo.dat, mame2003-plus.xml -->
+<!-- Generated on 2024-02-22, from MAME 0.262 (arcade).dat, fbneo.dat, mame2003-plus.xml -->
 <bios>3dobios</bios>
 <bios>acpsx</bios>
 <bios>airlbios</bios>
@@ -9,6 +9,7 @@
 <bios>ar_bios</bios>
 <bios>aristmk5</bios>
 <bios>aristmk6</bios>
+<bios>aristmk7</bios>
 <bios>atarisy1</bios>
 <bios>awbios</bios>
 <bios>bubsys</bios>
@@ -47,6 +48,7 @@
 <bios>konamigx</bios>
 <bios>konendev</bios>
 <bios>kpython</bios>
+<bios>kpython2</bios>
 <bios>kviper</bios>
 <bios>lindbios</bios>
 <bios>mac2bios</bios>
@@ -67,6 +69,7 @@
 <bios>nss</bios>
 <bios>pgm</bios>
 <bios>playch10</bios>
+<bios>pumpitup</bios>
 <bios>recel</bios>
 <bios>sammymdl</bios>
 <bios>segasp</bios>