mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-17 10:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do CRC checks on PSP/PSP(PSN) content scan (#15623)

Browse Source
This commit is contained in:
Eric Warmenhoven 2024-01-02 00:57:44 -05:00 committed by GitHub
parent 8886b92455
commit 4220e5683d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 113 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -1435,6 +1435,8 @@
#define DEFAULT_SCAN_WITHOUT_CORE_MATCH false
#define DEFAULT_SCAN_SERIAL_AND_CRC false
#ifdef __WINRT__
/* Be paranoid about WinRT file I/O performance, and leave this disabled by
* default */

1
configuration.c
View File

@ -1722,6 +1722,7 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("global_core_options", &settings->bools.global_core_options, true, DEFAULT_GLOBAL_CORE_OPTIONS, false);
SETTING_BOOL("auto_shaders_enable", &settings->bools.auto_shaders_enable, true, DEFAULT_AUTO_SHADERS_ENABLE, false);
SETTING_BOOL("scan_without_core_match", &settings->bools.scan_without_core_match, true, DEFAULT_SCAN_WITHOUT_CORE_MATCH, false);
SETTING_BOOL("scan_serial_and_crc", &settings->bools.scan_serial_and_crc, true, DEFAULT_SCAN_SERIAL_AND_CRC, false);
SETTING_BOOL("sort_savefiles_enable", &settings->bools.sort_savefiles_enable, true, DEFAULT_SORT_SAVEFILES_ENABLE, false);
SETTING_BOOL("sort_savestates_enable", &settings->bools.sort_savestates_enable, true, DEFAULT_SORT_SAVESTATES_ENABLE, false);
SETTING_BOOL("sort_savefiles_by_content_enable", &settings->bools.sort_savefiles_by_content_enable, true, DEFAULT_SORT_SAVEFILES_BY_CONTENT_ENABLE, false);

1
configuration.h
View File

@ -1027,6 +1027,7 @@ typedef struct settings
bool log_to_file_timestamp;
bool scan_without_core_match;
bool scan_serial_and_crc;
bool ai_service_enable;
bool ai_service_pause;

4
intl/msg_hash_lbl.h
View File

@ -6066,6 +6066,10 @@ MSG_HASH(
MENU_ENUM_LABEL_SCAN_WITHOUT_CORE_MATCH,
"scan_without_core_match"
)
MSG_HASH(
MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC,
"scan_serial_and_crc"
)
MSG_HASH(
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
"xmb_menu_animation_horizontal_highlight"

8
intl/msg_hash_us.h
View File

@ -7469,6 +7469,14 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_SCAN_WITHOUT_CORE_MATCH,
"Allow content to be scanned and added to a playlist without a core installed that supports it."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SCAN_SERIAL_AND_CRC,
"Scan checks CRC on possible duplicates"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SCAN_SERIAL_AND_CRC,
"Sometimes ISOs duplicate serials, particularly with PSP/PSN titles. Relying solely on the serial can sometimes cause the scanner to put content in the wrong system. This adds a CRC check, which slows down scanning considerably, but may be more accurate."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_PLAYLIST_MANAGER_LIST,
"Manage Playlists"

45
libretro-common/encodings/encoding_crc32.c
View File

@ -25,6 +25,45 @@
#include <encodings/crc32.h>
#include <stdlib.h>
#if __ARM_FEATURE_CRC32
#ifdef _M_ARM64
# include <arm64_neon.h>
#else
# include <arm_acle.h>
#endif
uint32_t encoding_crc32(uint32_t crc, const uint8_t *data, size_t len)
{
crc = ~crc;
// Align data if it is not aligned
while (((uintptr_t)data & 7) && len > 0)
{
crc = __crc32b(crc, *(uint8_t *)data);
data++;
len--;
}
while (len >= 8)
{
crc = __crc32d(crc, *(uint64_t *)data);
data += 8;
len -= 8;
}
while (len > 0)
{
crc = __crc32b(crc, *(uint8_t *)data);
data++;
len--;
}
return ~crc;
}
#else
static const uint32_t crc32_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
@ -82,10 +121,12 @@ static const uint32_t crc32_table[256] = {
uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len)
{
crc = crc ^ 0xffffffff;
crc = ~crc;
while (len--)
crc = crc32_table[(crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
return crc ^ 0xffffffff;
return ~crc;
}
#endif

4
menu/cbs/menu_cbs_sublabel.c
View File

@ -1290,6 +1290,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_thumbnail_delay,
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_runtime_log, MENU_ENUM_SUBLABEL_CONTENT_RUNTIME_LOG)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_runtime_log_aggregate, MENU_ENUM_SUBLABEL_CONTENT_RUNTIME_LOG_AGGREGATE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_scan_without_core_match, MENU_ENUM_SUBLABEL_SCAN_WITHOUT_CORE_MATCH)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_scan_serial_and_crc, MENU_ENUM_SUBLABEL_SCAN_SERIAL_AND_CRC)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_playlist_sublabel_runtime_type, MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_RUNTIME_TYPE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_playlist_sublabel_last_played_style, MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_internal_upscale_level, MENU_ENUM_SUBLABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL)
@ -5379,6 +5380,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_SCAN_WITHOUT_CORE_MATCH:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_scan_without_core_match);
break;
case MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_scan_serial_and_crc);
break;
case MENU_ENUM_LABEL_CONTENT_RUNTIME_LOG_AGGREGATE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_runtime_log_aggregate);
break;

1
menu/menu_displaylist.c
View File

@ -6706,6 +6706,7 @@ unsigned menu_displaylist_build_list(
{MENU_ENUM_LABEL_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE, PARSE_ONLY_UINT, false},
{MENU_ENUM_LABEL_PLAYLIST_FUZZY_ARCHIVE_MATCH, PARSE_ONLY_BOOL, true},
{MENU_ENUM_LABEL_SCAN_WITHOUT_CORE_MATCH, PARSE_ONLY_BOOL, true},
{MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC, PARSE_ONLY_BOOL, true},
{MENU_ENUM_LABEL_OZONE_TRUNCATE_PLAYLIST_NAME, PARSE_ONLY_BOOL, true},
{MENU_ENUM_LABEL_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME, PARSE_ONLY_BOOL, false},
{MENU_ENUM_LABEL_CONTENT_RUNTIME_LOG, PARSE_ONLY_BOOL, true},

15
menu/menu_setting.c
View File

@ -11266,6 +11266,21 @@ static bool setting_append_list(
general_read_handler,
SD_FLAG_NONE);
CONFIG_BOOL(
list, list_info,
&settings->bools.scan_serial_and_crc,
MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC,
MENU_ENUM_LABEL_VALUE_SCAN_SERIAL_AND_CRC,
DEFAULT_SCAN_SERIAL_AND_CRC,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
CONFIG_ACTION(
list, list_info,
MENU_ENUM_LABEL_CLOUD_SYNC_SETTINGS,

1
msg_hash.h
View File

@ -583,6 +583,7 @@ enum msg_hash_enums
MENU_LABEL(MENU_XMB_ANIMATION_MOVE_UP_DOWN),
MENU_LABEL(MENU_XMB_ANIMATION_OPENING_MAIN_MENU),
MENU_LABEL(SCAN_WITHOUT_CORE_MATCH),
MENU_LABEL(SCAN_SERIAL_AND_CRC),
MENU_LABEL(STREAMING_TITLE),
MENU_LABEL(STREAMING_MODE),
MENU_ENUM_LABEL_VALUE_VIDEO_STREAMING_MODE_TWITCH,

35
tasks/task_database.c
View File

@ -1058,6 +1058,26 @@ static int task_database_iterate_playlist_lutro(
return 0;
}
static bool task_database_check_serial_and_crc(
database_state_handle_t *db_state)
{
#ifdef RARCH_INTERNAL
settings_t *settings = config_get_ptr();
#endif
const char *db_path =
database_info_get_current_name(db_state);
#ifdef RARCH_INTERNAL
if (!settings->bools.scan_serial_and_crc)
return false;
#endif
/* the PSP shares serials for disc/download content */
return string_starts_with(
path_basename_nocompression(db_path),
"Sony - PlayStation Portable");
}
static int task_database_iterate_serial_lookup(
db_handle_t *_db,
database_state_handle_t *db_state,
@ -1100,8 +1120,19 @@ static int task_database_iterate_serial_lookup(
if (db_info_entry && db_info_entry->serial)
{
if (string_is_equal(db_state->serial, db_info_entry->serial))
return database_info_list_iterate_found_match(_db,
db_state, db, NULL);
{
if (task_database_check_serial_and_crc(db_state))
{
if (db_state->crc == 0)
intfstream_file_get_crc(name, 0, SIZE_MAX, &db_state->crc);
if (db_state->crc == db_info_entry->crc32)
return database_info_list_iterate_found_match(_db,
db_state, db, NULL);
}
else
return database_info_list_iterate_found_match(_db,
db_state, db, NULL);
}
}
}