From 6735dd3d76064e5fe5aad558ce9804aa8278c8f7 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 25 Jul 2020 16:18:41 +0200 Subject: [PATCH] Added missing systems to PlatformId. Also did some other small system name changes. --- es-app/src/PlatformId.cpp | 27 ++++++++++++++++--- es-app/src/PlatformId.h | 23 +++++++++++++++- .../scrapers/GamesDBJSONScraperResources.cpp | 4 +-- es-app/src/scrapers/ScreenScraper.cpp | 2 +- resources/templates/es_systems.cfg_unix | 14 +++++----- resources/templates/es_systems.cfg_windows | 14 +++++----- .../{pce-cd => pcenginecd}/colors.xml | 0 .../{pce-cd => pcenginecd}/images/console.svg | 0 .../images/consolegame.svg | 0 .../images/controller.svg | 0 .../{pce-cd => pcenginecd}/images/game.svg | 0 .../{pce-cd => pcenginecd}/images/logo.svg | 0 .../{pce-cd => pcenginecd}/images/logo2.svg | 0 .../{pce-cd => pcenginecd}/systeminfo.xml | 0 .../{pce-cd => pcenginecd}/theme.xml | 0 15 files changed, 63 insertions(+), 21 deletions(-) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/colors.xml (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/console.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/consolegame.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/controller.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/game.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/logo.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/images/logo2.svg (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/systeminfo.xml (100%) rename themes/rbsimple-DE/{pce-cd => pcenginecd}/theme.xml (100%) diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 28177f9ba..a9d8e1c79 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -46,7 +46,7 @@ namespace PlatformIds "gb", // Game Boy "gba", // Game Boy Advance "gbc", // Game Boy Color - "gc", // GameCube + "gamecube", // GameCube "wii", "wiiu", "virtualboy", @@ -70,7 +70,7 @@ namespace PlatformIds "psp", // PlayStation Portable "snes", // Super Nintendo Entertainment System "scummvm", - "x6800", + "x68000", "solarus", "pcengine", // (Aka turbografx-16), HuCards only "pcenginecd", // (Aka turbografx-16), CD-ROMs only @@ -78,10 +78,31 @@ namespace PlatformIds "wonderswancolor", "zxspectrum", "zx81", - "videopac", + "odyssey2", "vectrex", "trs-80", "coco", + "ags", + "astrocade", + "bbcmicro", + "cavestory", + "daphne", + "doom", + "dragon32", + "famicom", + "love", + "lutro", + "mess", + "moonlight", + "oric", + "pcfx", + "residualvm", + "samcoupe", + "supergrafx", + "stratagus", + "videopac", + "zmachine", + "ti99", "ignore", // Do not allow scraping for this system. "invalid" diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 8f846e4dd..bca70fc7f 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -70,7 +70,7 @@ namespace PlatformIds PLAYSTATION_PORTABLE, SUPER_NINTENDO, SCUMMVM, - SHARP_X6800, + SHARP_X68000, SOLARUS, TURBOGRAFX_16, // (Aka PC Engine) HuCards only. TURBOGRAFX_CD, // (Aka PC Engine) CD-ROMs only. @@ -82,6 +82,27 @@ namespace PlatformIds VECTREX, TRS80_COLOR_COMPUTER, TANDY, + ADVENTUREGAMESTUDIO, + ASTROCADE, + BBCMICRO, + CAVESTORY, + DAPHNE, + DOOM, + DRAGON32, + FAMICOM, + LOVE, + LUTRO, + MESS, + MOONLIGHT, + ORIC, + PCFX, + RESIDUALVM, + SAMCOUPE, + SUPERGRAFX, + STRATAGUS, + VIDEOPAC, + ZMACHINE, + TI99, PLATFORM_IGNORE, // Do not allow scraping for this system. PLATFORM_COUNT diff --git a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp index c20551505..4f00c02a5 100644 --- a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp @@ -125,14 +125,14 @@ bool TheGamesDBJSONRequestResources::saveResource( { if (req == nullptr) { - LOG(LogError) << "Http request pointer was null\n"; + LOG(LogError) << "Error - HTTP request pointer was null.\n"; return true; } if (req->status() == HttpReq::REQ_IN_PROGRESS) { return false; // Not ready: wait some more. } if (req->status() != HttpReq::REQ_SUCCESS) { - LOG(LogError) << "Resource request for " << file_name << + LOG(LogError) << "Error - Resource request for " << file_name << " failed:\n\t" << req->getErrorMsg(); return true; // Request failed, resetting request.. } diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index b38f2d1de..b10eef1d7 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -73,7 +73,7 @@ const std::map screenscraper_platformid_map { { SEGA_MEGA_DRIVE, 1 }, { SEGA_SATURN, 22 }, { SEGA_SG1000, 109 }, - { SHARP_X6800, 79}, + { SHARP_X68000, 79}, { SOLARUS, 223 }, { PLAYSTATION, 57 }, { PLAYSTATION_2, 58 }, diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix index e5c60eb61..8b6f1d1d6 100644 --- a/resources/templates/es_systems.cfg_unix +++ b/resources/templates/es_systems.cfg_unix @@ -277,7 +277,7 @@ %ROMPATH%/gameandwatch .mgw .MGW .7z .7Z .zip .ZIP retroarch -L ~/.config/retroarch/cores/gw_libretro.so %ROM% - nintendo_game_and_watch + gameandwatch gameandwatch @@ -560,13 +560,13 @@ pcengine - pce-cd + pcenginecd PC Engine CD - %ROMPATH%/pce-cd + %ROMPATH%/pcenginecd .pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch -L ~/.config/retroarch/cores/mednafen_pce_libretro.so %ROM% - pcenginecd, pce-cd - pce-cd + pcenginecd + pcenginecd pcfx @@ -718,7 +718,7 @@ %ROMPATH%/tg16 .pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch -L ~/.config/retroarch/cores/mednafen_pce_fast_libretro.so %ROM% - tg16, pcengine + pcengine tg16 @@ -727,7 +727,7 @@ %ROMPATH%/tg-cd .pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch -L ~/.config/retroarch/cores/mednafen_pce_libretro.so %ROM% - tg-cd, pcenginecd, pce-cd + pcenginecd tg-cd diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows index da5e04fe7..2888eea48 100644 --- a/resources/templates/es_systems.cfg_windows +++ b/resources/templates/es_systems.cfg_windows @@ -277,7 +277,7 @@ %ROMPATH%\gameandwatch .mgw .MGW .7z .7Z .zip .ZIP retroarch.exe -L "%EMUPATH%\cores\gw_libretro.dll" %ROM% - nintendo_game_and_watch + gameandwatch gameandwatch @@ -560,13 +560,13 @@ pcengine - pce-cd + pcenginecd PC Engine CD - %ROMPATH%\pce-cd + %ROMPATH%\pcenginecd .pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM% - pcenginecd, pce-cd - pce-cd + pcenginecd + pcenginecd pcfx @@ -718,7 +718,7 @@ %ROMPATH%\tg16 .pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_fast_libretro.dll" %ROM% - tg16, pcengine + pcengine tg16 @@ -727,7 +727,7 @@ %ROMPATH%\tg-cd .pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM% - tg-cd, pcenginecd, pce-cd + pcenginecd tg-cd diff --git a/themes/rbsimple-DE/pce-cd/colors.xml b/themes/rbsimple-DE/pcenginecd/colors.xml similarity index 100% rename from themes/rbsimple-DE/pce-cd/colors.xml rename to themes/rbsimple-DE/pcenginecd/colors.xml diff --git a/themes/rbsimple-DE/pce-cd/images/console.svg b/themes/rbsimple-DE/pcenginecd/images/console.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/console.svg rename to themes/rbsimple-DE/pcenginecd/images/console.svg diff --git a/themes/rbsimple-DE/pce-cd/images/consolegame.svg b/themes/rbsimple-DE/pcenginecd/images/consolegame.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/consolegame.svg rename to themes/rbsimple-DE/pcenginecd/images/consolegame.svg diff --git a/themes/rbsimple-DE/pce-cd/images/controller.svg b/themes/rbsimple-DE/pcenginecd/images/controller.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/controller.svg rename to themes/rbsimple-DE/pcenginecd/images/controller.svg diff --git a/themes/rbsimple-DE/pce-cd/images/game.svg b/themes/rbsimple-DE/pcenginecd/images/game.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/game.svg rename to themes/rbsimple-DE/pcenginecd/images/game.svg diff --git a/themes/rbsimple-DE/pce-cd/images/logo.svg b/themes/rbsimple-DE/pcenginecd/images/logo.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/logo.svg rename to themes/rbsimple-DE/pcenginecd/images/logo.svg diff --git a/themes/rbsimple-DE/pce-cd/images/logo2.svg b/themes/rbsimple-DE/pcenginecd/images/logo2.svg similarity index 100% rename from themes/rbsimple-DE/pce-cd/images/logo2.svg rename to themes/rbsimple-DE/pcenginecd/images/logo2.svg diff --git a/themes/rbsimple-DE/pce-cd/systeminfo.xml b/themes/rbsimple-DE/pcenginecd/systeminfo.xml similarity index 100% rename from themes/rbsimple-DE/pce-cd/systeminfo.xml rename to themes/rbsimple-DE/pcenginecd/systeminfo.xml diff --git a/themes/rbsimple-DE/pce-cd/theme.xml b/themes/rbsimple-DE/pcenginecd/theme.xml similarity index 100% rename from themes/rbsimple-DE/pce-cd/theme.xml rename to themes/rbsimple-DE/pcenginecd/theme.xml