From 66bcf8ea13a5ebb1600a23d336e83f431fa64d91 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Wed, 3 Nov 2021 18:11:41 +0100
Subject: [PATCH] Added proper scraping support for the vic20 system.

---
 es-app/src/PlatformId.cpp                  | 1 +
 es-app/src/PlatformId.h                    | 1 +
 es-app/src/scrapers/GamesDBJSONScraper.cpp | 1 +
 es-app/src/scrapers/ScreenScraper.cpp      | 1 +
 resources/systems/macos/es_systems.xml     | 2 +-
 resources/systems/unix/es_systems.xml      | 2 +-
 resources/systems/windows/es_systems.xml   | 2 +-
 7 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 73d6a9249..4fa3a7983 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -116,6 +116,7 @@ namespace PlatformIds
         "trs-80",               // Tandy TRS-80
         "uzebox",               // Uzebox
         "vectrex",              // Vectrex
+        "vic20",                // Commodore VIC-20
         "videopac",             // Philips Videopac G7000 (Magnavox Odyssey2)
         "virtualboy",           // Nintendo Virtual Boy
         "wii",                  // Nintendo Wii
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index dd596682d..06754f787 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -115,6 +115,7 @@ namespace PlatformIds
         TANDY_TRS80,
         UZEBOX,
         VECTREX,
+        COMMODORE_VIC20,
         PHILIPS_VIDEOPAC,
         NINTENDO_VIRTUAL_BOY,
         NINTENDO_WII,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 046009f70..7bc954630 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -57,6 +57,7 @@ const std::map<PlatformId, std::string> gamesdb_new_platformid_map{
     {CAVESTORY, "1"},
     {COLECOVISION, "31"},
     {COMMODORE_64, "40"},
+    {COMMODORE_VIC20, "4945"},
     {DAPHNE, "23"},
     {INTELLIVISION, "32"},
     {APPLE_MACINTOSH, "37"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 8fa80b582..a79d9cfe7 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -49,6 +49,7 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map{
     {COLECOVISION, 48},
     {COMMODORE_64, 66},
     {COMMODORE_CDTV, 129},
+    {COMMODORE_VIC20, 73},
     {DAPHNE, 49},
     {INTELLIVISION, 115},
     {GAMEENGINE_LUTRO, 206},
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index ad70d9714..6b09fbe9f 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1240,7 +1240,7 @@
         <path>%ROMPATH%/vic20</path>
         <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.dylib %ROM%</command>
-        <platform>c64</platform>
+        <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
     <system>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 59e614979..6a5eeb7bb 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1249,7 +1249,7 @@
         <path>%ROMPATH%/vic20</path>
         <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM%</command>
-        <platform>c64</platform>
+        <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
     <system>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 5bcad606c..0b3efd4db 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1249,7 +1249,7 @@
         <path>%ROMPATH%\vic20</path>
         <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xvic_libretro.dll %ROM%</command>
-        <platform>c64</platform>
+        <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
     <system>