Merge pull request #3819 from zhaowenlan1779/game-list-refix

game_list: fix system title display
This commit is contained in:
James Rowe 2018-06-09 13:32:28 -06:00 committed by GitHub
commit ad81bca8dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -173,14 +173,20 @@ public:
&extension); &extension);
QString title = data(TitleRole).toString(); QString title = data(TitleRole).toString();
QString second_name = QString::fromStdString(filename + extension); QString second_name = QString::fromStdString(filename + extension);
static QRegExp installed_system_pattern( static QRegExp installed_pattern(
QString::fromStdString( QString::fromStdString(
FileUtil::GetUserPath(D_SDMC_IDX) + FileUtil::GetUserPath(D_SDMC_IDX) +
"Nintendo " "Nintendo "
"3DS/00000000000000000000000000000000/00000000000000000000000000000000/" "3DS/00000000000000000000000000000000/00000000000000000000000000000000/"
"title/000400(0|1)0/[0-9a-f]{8}/content/") "title/0004000(0|e)/[0-9a-f]{8}/content/")
.replace("\\", "\\\\")); .replace("\\", "\\\\"));
if (installed_system_pattern.exactMatch(QString::fromStdString(path))) { static QRegExp system_pattern(
QString::fromStdString(FileUtil::GetUserPath(D_NAND_IDX) +
"00000000000000000000000000000000/"
"title/00040010/[0-9a-f]{8}/content/")
.replace("\\", "\\\\"));
if (installed_pattern.exactMatch(QString::fromStdString(path)) ||
system_pattern.exactMatch(QString::fromStdString(path))) {
// Use a different mechanism for system / installed titles showing program ID // Use a different mechanism for system / installed titles showing program ID
second_name = QString("%1-%2") second_name = QString("%1-%2")
.arg(data(ProgramIdRole).toULongLong(), 16, 16, QChar('0')) .arg(data(ProgramIdRole).toULongLong(), 16, 16, QChar('0'))