Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include version number in renamed CIA / titles

Browse Source
This commit is contained in:
d0k3 2021-03-11 20:25:32 +01:00
parent ddfdf81cf7
commit 4e00b8b7b6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arm9/source/utils/gameutil.c
View File

@ -2777,7 +2777,7 @@ u32 BuildCiaFromGameFile(const char* path, bool force_legit) {
} }
// replace extension // replace extension
char* dot = strrchr(dest, '.'); char* dot = strrchr(dest, '.');
if (!dot || (dot < strrchr(dest, '/'))) if (!dot || (strpbrk(dot, "/(){}[]!$#*+-")))
dot = dest + strnlen(dest, 256); dot = dest + strnlen(dest, 256);
snprintf(dot, 16, ".%s", "tmp.cia"); snprintf(dot, 16, ".%s", "tmp.cia");
@ -3970,6 +3970,14 @@ u32 GetGoodName(char* name, const char* path, bool quick) {
strncpy(appid_str + 1, name, 8); strncpy(appid_str + 1, name, 8);
} }
char version_str[16] = { 0 };
if (!quick && (type_donor & (GAME_CIA|GAME_TIE|GAME_TMD|GAME_CDNTMD|GAME_TWLTMD))) {
u32 version = GetGameFileTitleVersion(path);
if (version < 0x10000)
snprintf(version_str, 16, " (v%lu.%lu.%lu)",
(version>>10)&0x3F, (version>>4)&0x3F, version&0xF);
}
char path_content[256]; char path_content[256];
if (type_donor & GAME_TMD) { if (type_donor & GAME_TMD) {
if (GetTmdContentPath(path_content, path) != 0) return 1; if (GetTmdContentPath(path_content, path) != 0) return 1;
@ -4006,7 +4014,7 @@ u32 GetGoodName(char* name, const char* path, bool quick) {
TwlHeader* twl = (TwlHeader*) header; TwlHeader* twl = (TwlHeader*) header;
if (quick) { if (quick) {
if (twl->unit_code & 0x02) { // TWL if (twl->unit_code & 0x02) { // TWL
snprintf(name, 128, "%016llX (TWL-%.4s).%s", twl->title_id, twl->game_code, ext); snprintf(name, 128, "%016llX%s (TWL-%.4s).%s", twl->title_id, appid_str, twl->game_code, ext);
} else { // NTR } else { // NTR
snprintf(name, 128, "%.12s (NTR-%.4s).%s", twl->game_title, twl->game_code, ext); snprintf(name, 128, "%.12s (NTR-%.4s).%s", twl->game_title, twl->game_code, ext);
} }
@ -4029,8 +4037,8 @@ u32 GetGoodName(char* name, const char* path, bool quick) {
if (!*region) snprintf(region, 8, "UNK"); if (!*region) snprintf(region, 8, "UNK");
char* unit_str = (twl->unit_code == TWL_UNITCODE_TWLNTR) ? "DSi Enhanced" : "DSi Exclusive"; char* unit_str = (twl->unit_code == TWL_UNITCODE_TWLNTR) ? "DSi Enhanced" : "DSi Exclusive";
snprintf(name, 128, "%016llX %s (TWL-%.4s) (%s) (%s).%s", snprintf(name, 128, "%016llX%s %s (TWL-%.4s) (%s) (%s)%s.%s",
twl->title_id, title_name, twl->game_code, unit_str, region, ext); twl->title_id, appid_str, title_name, twl->game_code, unit_str, region, version_str, ext);
} else { // NTR } else { // NTR
snprintf(name, 128, "%s (NTR-%.4s).%s", title_name, twl->game_code, ext); snprintf(name, 128, "%s (NTR-%.4s).%s", title_name, twl->game_code, ext);
} }
@ -4055,8 +4063,8 @@ u32 GetGoodName(char* name, const char* path, bool quick) {
if (strncmp(region, "JUECKT", 8) == 0) snprintf(region, 8, "W"); if (strncmp(region, "JUECKT", 8) == 0) snprintf(region, 8, "W");
if (!*region) snprintf(region, 8, "UNK"); if (!*region) snprintf(region, 8, "UNK");
snprintf(name, 128, "%016llX%s %s (%.16s) (%s).%s", snprintf(name, 128, "%016llX%s %s (%.16s) (%s)%s.%s",
ncch->programId, appid_str, title_name, ncch->productcode, region, ext); ncch->programId, appid_str, title_name, ncch->productcode, region, version_str, ext);
} }
} }