Merge pull request #23042 from hrydgard/ui-changes

Zip import fixes, busy save slots in the pause menu
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-11-11 21:08:50 +01:00
commit b9b12d0ccc
54 files changed
+145 -8

No files matched your search

+1 -1
View File
@@ -330,7 +330,7 @@ enum class UIMessage {
RECENT_FILES_CHANGED,
SAVE_FRAME_DUMP,
ADHOC_SERVER_LIST_CHANGED,
SAVESTATE_SLOT_SAVED, // A slot's save state file was written.
SAVESTATE_SLOT_SAVED, // A save state save finished: written, failed or refused.
SOFT_KEYBOARD_HIDDEN, // The platform closed a soft keyboard forced by System_SetSoftKeyboardForced.
};
+11
View File
@@ -676,6 +676,7 @@ void DetectZipFileContents(zip_t *z, ZipFileInfo *info) {
bool hasIcon0PNG = false;
bool hasPRX = false;
bool hasPluginIni = false;
bool isPS3SaveData = false; // Same PARAM.SFO + ICON0.PNG layout as a PSP save, but useless to us.
s64 totalFileSize = 0;
std::vector<ArchiveEntry> archiveEntries; // In the root or one level down, where a disc image can be.
@@ -757,6 +758,10 @@ void DetectZipFileContents(zip_t *z, ZipFileInfo *info) {
if (ZipExtractFileToMemory(z, i, &paramSFOContents)) {
ParamSFOData sfo;
if (sfo.ReadSFO((const u8 *)paramSFOContents.data(), paramSFOContents.size())) {
// PSP saves have category MS, PS3 saves SD.
if (sfo.GetValueString("CATEGORY") == "SD") {
isPS3SaveData = true;
}
if (sfo.HasKey("TITLE")) {
info->gameTitle = sfo.GetValueString("TITLE");
info->savedataTitle = sfo.GetValueString("SAVEDATA_TITLE");
@@ -772,6 +777,9 @@ void DetectZipFileContents(zip_t *z, ZipFileInfo *info) {
}
}
}
} else if (lowerCaseName == "param.pfd" || endsWith(lowerCaseName, "/param.pfd")) {
// The PS3's save data protection file. PSP saves don't have one.
isPS3SaveData = true;
} else if (endsWith(lowerCaseName, "/icon0.png")) {
hasIcon0PNG = true;
} else if (endsWith(lowerCaseName, "/plugin.ini") && slashCount >= 1) {
@@ -827,6 +835,9 @@ void DetectZipFileContents(zip_t *z, ZipFileInfo *info) {
info->stripChars = stripCharsTexturePack;
info->ignoreMetaFiles = true;
info->contents = ZipFileContents::TEXTURE_PACK;
} else if (isPS3SaveData) {
WARN_LOG(Log::Loader, "Zip contains PS3 save data, not PSP");
info->contents = ZipFileContents::UNKNOWN;
} else if (stripChars == 0 && filesInRoot == 0 && hasParamSFO && hasIcon0PNG && !isExtractedISO) {
// As downloaded from GameFAQs, for example.
info->contents = ZipFileContents::SAVE_DATA;
+14 -5
View File
@@ -454,9 +454,16 @@ int g_screenshotFailures;
// A save is done (written, failed or refused). Returns the callbacks of its repeats.
static std::vector<Callback> FinishPendingSave(const std::shared_ptr<SaveRecord> &save) {
std::lock_guard<std::mutex> guard(mutex);
g_pendingSaves.erase(std::remove(g_pendingSaves.begin(), g_pendingSaves.end(), save), g_pendingSaves.end());
return std::move(save->repeats);
std::vector<Callback> repeats;
{
std::lock_guard<std::mutex> guard(mutex);
g_pendingSaves.erase(std::remove(g_pendingSaves.begin(), g_pendingSaves.end(), save), g_pendingSaves.end());
repeats = std::move(save->repeats);
}
// The pause screen shows a slot with a save pending as busy, or listed it before the file was there.
// Posted after the save left the pending list, so the refresh doesn't still see it.
System_PostUIMessage(UIMessage::SAVESTATE_SLOT_SAVED);
return repeats;
}
static void RefuseOperation(const Operation &op) {
@@ -935,6 +942,10 @@ int g_screenshotFailures;
return g_files.find(GenerateSaveSlotFilename(gamePrefix, slot, extension)) != g_files.end();
}
bool IsSlotSavePending(std::string_view gamePrefix, int slot) {
return IsSavePending(GenerateSaveSlotPath(gamePrefix, slot, STATE_EXTENSION));
}
bool HasSaveInSlot(std::string_view gamePrefix, int slot) {
return SaveStateFileExists(gamePrefix, slot, STATE_EXTENSION);
}
@@ -1254,8 +1265,6 @@ int g_screenshotFailures;
g_Config.Save("Saving config for savestate last save undo");
}
g_filesStale = true;
// The pause screen may have listed the slots before the file was there.
System_PostUIMessage(UIMessage::SAVESTATE_SLOT_SAVED);
}
} else {
if (result == CChunkFileReader::ERROR_BROKEN_STATE) {
+2
View File
@@ -68,6 +68,8 @@ namespace SaveState {
// Checks whether there's an existing save in the specified slot.
bool HasSaveInSlot(std::string_view gamePrefix, int slot);
// A save to the slot was asked for and isn't written yet. UIMessage::SAVESTATE_SLOT_SAVED says when it ends.
bool IsSlotSavePending(std::string_view gamePrefix, int slot);
bool HasUndoSaveInSlot(std::string_view gamePrefix, int slot);
bool HasUndoLastSave(std::string_view gamePrefix);
bool HasUndoLoad(std::string_view gamePrefix);
+4
View File
@@ -451,7 +451,11 @@ bool TextureReplacer::LoadIniValues(IniFile &ini, VFSBackend *dir, bool isOverri
if (badFileNameCount > 0) {
auto err = GetI18NCategory(I18NCat::ERRORS);
// Let's not bother with this warning on mobile. It's meant for texture pack authors, who are likely working on desktop.
// Though nowadays, you never know...
#if !defined(MOBILE_DEVICE)
g_OSD.Show(OSDType::MESSAGE_WARNING, err->T("textures.ini filenames may not be cross-platform (banned characters)"), badFilenames, 6.0f);
#endif
WARN_LOG(Log::TexReplacement, "Potentially bad filenames: %s", badFilenames.c_str());
}
+7 -2
View File
@@ -74,6 +74,7 @@ void InstallZipScreen::CreateSettingsViews(UI::ViewGroup *parent) {
auto iz = GetI18NCategory(I18NCat::INSTALLZIP);
auto er = GetI18NCategory(I18NCat::ERRORS);
auto ga = GetI18NCategory(I18NCat::GAME);
auto sa = GetI18NCategory(I18NCat::SAVEDATA);
std::string shortFilename = zipPath_.GetFilename();
@@ -98,13 +99,17 @@ void InstallZipScreen::CreateSettingsViews(UI::ViewGroup *parent) {
showDeleteCheckbox = true;
break;
case ZipFileContents::TEXTURE_PACK:
case ZipFileContents::SAVE_DATA:
case ZipFileContents::SAVE_STATES:
case ZipFileContents::PRX_PLUGIN:
installChoice_ = parent->Add(new Choice(iz->T("Install"), ImageID("I_FOLDER_UPLOAD")));
installChoice_->OnClick.Handle(this, &InstallZipScreen::OnInstall);
showDeleteCheckbox = true;
break;
case ZipFileContents::SAVE_DATA:
case ZipFileContents::SAVE_STATES:
installChoice_ = parent->Add(new Choice(sa->T("Import"), ImageID("I_FOLDER_UPLOAD")));
installChoice_->OnClick.Handle(this, &InstallZipScreen::OnInstall);
showDeleteCheckbox = true;
break;
case ZipFileContents::FRAME_DUMP:
// It's a frame dump, add a play button!
playChoice_ = parent->Add(new Choice(ga->T("Play"), ImageID("I_PLAY")));
+11
View File
@@ -311,11 +311,18 @@ SaveSlotView::SaveSlotView(std::string_view saveStatePrefix, int slot, UI::Layou
OnScreenshotClicked.Trigger(e);
});
// A save to this slot is still being written (slow storage, a save asked for just before the menu
// opened). The screen is rebuilt when it finishes, on UIMessage::SAVESTATE_SLOT_SAVED.
const bool savePending = SaveState::IsSlotSavePending(saveStatePrefix_, slot_);
saveStateButton_->SetEnabled(!savePending);
fv->SetEnabled(!savePending);
if (SaveState::HasSaveInSlot(saveStatePrefix_, slot_)) {
if (!Achievements::HardcoreModeActive()) {
loadStateButton_ = buttons->Add(new Button(pa->T("Load State"), new LinearLayoutParams(0.0, Gravity::G_VCENTER)));
loadStateButton_->OnClick.Handle(this, &SaveSlotView::OnLoadState);
loadStateButton_->SetRoundCorners();
loadStateButton_->SetEnabled(!savePending);
}
std::string nameStr = SaveState::GetSlotCustomName(saveStatePrefix_, slot_);
@@ -340,6 +347,10 @@ SaveSlotView::SaveSlotView(std::string_view saveStatePrefix, int slot, UI::Layou
} else {
fv->SetFilename(Path());
}
if (savePending) {
buttons->Add(new Spinner(nullptr, 0, new LinearLayoutParams(32.0f, 32.0f, 0.0f, Gravity::G_VCENTER)));
}
}
void SaveSlotView::Draw(UIContext &dc) {
+1
View File
@@ -1477,6 +1477,7 @@ Export = تصدير # AI translated
Export all saves for this game = تصدير كل بيانات الحفظ لهذه اللعبة # AI translated
Export failed = فشل التصدير # AI translated
Filename = إسم الملف
Import = استيراد # AI translated
InstalledDataNotExported = هذه بيانات ثبّتتها اللعبة، وليست بيانات حفظ، لذا لا يمكن تصديرها. # AI translated
No screenshot = لا توجد لقطة شاشة # AI translated
None yet. Things will appear here after you save. = ليس بعد. الأشياء سوف تظهر هنا بعد الحفظ.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Fayl adı
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = Ekran çəkilişi yoxdur
None yet. Things will appear here after you save. = Hələlik heç nə. Qoruduqdan sonra burada nəsnələr oluşacaq.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Экспартаваць # AI translated
Export all saves for this game = Экспартаваць усе захаванні гэтай гульні # AI translated
Export failed = Не ўдалося экспартаваць # AI translated
Filename = Імя файла
Import = Імпартаваць # AI translated
InstalledDataNotExported = Гэта даныя, усталяваныя гульнёй, а не захаванне, таму іх нельга экспартаваць. # AI translated
No screenshot = Няма здымка экрана # AI translated
None yet. Things will appear here after you save. = Пакуль нічога няма. Тут з'явяцца захаванні, калі вы захаваецеся. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Експортирай # AI translated
Export all saves for this game = Експортиране на всички запазени данни за тази игра # AI translated
Export failed = Експортирането не бе успешно # AI translated
Filename = Име на файла # AI translated
Import = Импортирай # AI translated
InstalledDataNotExported = Това са данни, инсталирани от играта, а не запис, затова не могат да бъдат експортирани. # AI translated
No screenshot = Няма скрийншот # AI translated
None yet. Things will appear here after you save. = Все още няма нищо. Тук ще се появят записи, след като запазите. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Exporta # AI translated
Export all saves for this game = Exporta totes les dades desades d'aquest joc # AI translated
Export failed = No s'ha pogut exportar # AI translated
Filename = Nom del fitxer
Import = Importa # AI translated
InstalledDataNotExported = Són dades que ha instal·lat el joc, no una partida desada, així que no es poden exportar. # AI translated
No screenshot = Sense captura de pantalla
None yet. Things will appear here after you save. = No hi ha dades. Un cop desis partida apareixeran aquí. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Exportovat # AI translated
Export all saves for this game = Exportovat všechna uložená data této hry # AI translated
Export failed = Export se nezdařil # AI translated
Filename = Název souboru # AI translated
Import = Importovat # AI translated
InstalledDataNotExported = Toto jsou data nainstalovaná hrou, ne uložená pozice, takže je nelze exportovat. # AI translated
No screenshot = Žádný snímek obrazovky # AI translated
None yet. Things will appear here after you save. = Zatím žádné. Položky zde budou zobrazeny, až uložíte hru.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Eksportér # AI translated
Export all saves for this game = Eksportér alle gemte data for dette spil # AI translated
Export failed = Eksporten mislykkedes # AI translated
Filename = Filnavn # AI translated
Import = Importér # AI translated
InstalledDataNotExported = Dette er data, som spillet har installeret, ikke gemte data, så de kan ikke eksporteres. # AI translated
No screenshot = Intet skærmdump # AI translated
None yet. Things will appear here after you save. = Intet endnu. Ting vises her, når du har gemt. # AI translated
+1
View File
@@ -1466,6 +1466,7 @@ Export = Exportieren # AI translated
Export all saves for this game = Alle Speicherdaten dieses Spiels exportieren # AI translated
Export failed = Export fehlgeschlagen # AI translated
Filename = Dateiname
Import = Importieren # AI translated
InstalledDataNotExported = Das sind vom Spiel installierte Daten, keine Speicherdaten, daher können sie nicht exportiert werden. # AI translated
No screenshot = Kein Bildschirmfoto
None yet. Things will appear here after you save. = Noch keine. Dinge werden hier erscheinen, nachdem du gespeichert hast.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Filename
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = No screenshot
None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
+1
View File
@@ -1492,6 +1492,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Filename
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = No screenshot
None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
+1
View File
@@ -1468,6 +1468,7 @@ Export = Exportar # AI translated
Export all saves for this game = Exportar todos los datos guardados de este juego # AI translated
Export failed = Error al exportar # AI translated
Filename = Nombre de archivo
Import = Importar # AI translated
InstalledDataNotExported = Son datos que instaló el juego, no una partida guardada, así que no se pueden exportar. # AI translated
No screenshot = Sin captura de pantalla
None yet. Things will appear here after you save. = Ninguna todavía. Las cosas aparecerán aquí después de guardar.
+1
View File
@@ -1469,6 +1469,7 @@ Export = Exportar # AI translated
Export all saves for this game = Exportar todas las partidas guardadas de este juego # AI translated
Export failed = Error al exportar # AI translated
Filename = Nombre de archivo
Import = Importar # AI translated
InstalledDataNotExported = Son datos que instaló el juego, no una partida guardada, así que no se pueden exportar. # AI translated
No screenshot = No hay capturas de pantalla.
None yet. Things will appear here after you save. = No hay datos. Una vez que guardes partida aparecerán aquí.
+1
View File
@@ -1467,6 +1467,7 @@ Export = خروجی گرفتن # AI translated
Export all saves for this game = خروجی گرفتن از همهٔ داده‌های ذخیرهٔ این بازی # AI translated
Export failed = خروجی گرفتن ناموفق بود # AI translated
Filename = نام فایل
Import = وارد کردن # AI translated
InstalledDataNotExported = این داده‌ای است که بازی نصب کرده، نه دادهٔ ذخیره، بنابراین نمی‌توان از آن خروجی گرفت. # AI translated
No screenshot = بدون نماگرفت
None yet. Things will appear here after you save. = هنوز چیزی نیست. پس از ذخیره، موارد اینجا نمایش داده می‌شوند. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Vie # AI translated
Export all saves for this game = Vie kaikki tämän pelin tallennukset # AI translated
Export failed = Vienti epäonnistui # AI translated
Filename = Tiedostonimi
Import = Tuo # AI translated
InstalledDataNotExported = Nämä ovat pelin asentamia tietoja eivätkä tallennus, joten niitä ei voi viedä. # AI translated
No screenshot = Ei kuvakaappausta
None yet. Things will appear here after you save. = Ei vielä. Tähän ilmestyy asioita tallentamisen jälkeen.
+1
View File
@@ -1494,6 +1494,7 @@ Export = Exporter # AI translated
Export all saves for this game = Exporter toutes les sauvegardes de ce jeu # AI translated
Export failed = Échec de l'exportation # AI translated
Filename = Nom de fichier
Import = Importer # AI translated
InstalledDataNotExported = Ce sont des données installées par le jeu, pas une sauvegarde : elles ne peuvent donc pas être exportées. # AI translated
No screenshot = Pas de capture d'écran
None yet. Things will appear here after you save. = Rien à afficher pour le moment.\nDes choses apparaîtront ici lorsque vous sauvegarderez.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Exportar # AI translated
Export all saves for this game = Exportar todos os datos de gardado deste xogo # AI translated
Export failed = Non se puido exportar # AI translated
Filename = Nome do ficheiro # AI translated
Import = Importar # AI translated
InstalledDataNotExported = Son datos que instalou o xogo, non unha partida gardada, así que non se poden exportar. # AI translated
No screenshot = Sen captura # AI translated
None yet. Things will appear here after you save. = Aínda nada. Os elementos aparecerán aquí despois de gardar. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Εξαγωγή # AI translated
Export all saves for this game = Εξαγωγή όλων των δεδομένων αποθήκευσης αυτού του παιχνιδιού # AI translated
Export failed = Η εξαγωγή απέτυχε # AI translated
Filename = Όνομα αρχείου # AI translated
Import = Εισαγωγή # AI translated
InstalledDataNotExported = Αυτά είναι δεδομένα που εγκατέστησε το παιχνίδι, όχι αποθήκευση, οπότε δεν μπορούν να εξαχθούν. # AI translated
No screenshot = Χωρίς στιγμιότυπο οθόνης
None yet. Things will appear here after you save. = Τίποτα προς το παρόν. Θα εμφανιστούν στοιχεία αφότου πραγματοποιήσετε αποθήκευση.
+1
View File
@@ -1467,6 +1467,7 @@ Export = ייצוא # AI translated
Export all saves for this game = ייצוא כל נתוני השמירה של משחק זה # AI translated
Export failed = הייצוא נכשל # AI translated
Filename = שם קובץ # AI translated
Import = ייבוא # AI translated
InstalledDataNotExported = אלה נתונים שהמשחק התקין, לא שמירה, ולכן לא ניתן לייצא אותם. # AI translated
No screenshot = אין צילום מסך # AI translated
None yet. Things will appear here after you save. = אין עדיין. פריטים יופיעו כאן לאחר שתשמור. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Izvezi # AI translated
Export all saves for this game = Izvezi sve savedate ove igre # AI translated
Export failed = Izvoz nije uspio # AI translated
Filename = Ime datoteke
Import = Uvezi # AI translated
InstalledDataNotExported = Ovo su podaci koje je igra instalirala, a ne spremljena igra, pa se ne mogu izvesti. # AI translated
No screenshot = Nema snimke zaslona
None yet. Things will appear here after you save. = Još ništa. Stvari će se ovdje pojaviti nakon što nešto spremiš.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Exportálás # AI translated
Export all saves for this game = A játék összes mentésének exportálása # AI translated
Export failed = Az exportálás sikertelen # AI translated
Filename = Fájlnév
Import = Importálás # AI translated
InstalledDataNotExported = Ezek a játék által telepített adatok, nem mentés, ezért nem exportálhatók. # AI translated
No screenshot = Nincs kép
None yet. Things will appear here after you save. = Itt jelennek majd meg a mentések. Még nincs semmi.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Ekspor # AI translated
Export all saves for this game = Ekspor semua data simpanan game ini # AI translated
Export failed = Gagal mengekspor # AI translated
Filename = Nama berkas
Import = Impor # AI translated
InstalledDataNotExported = Ini adalah data yang dipasang oleh game, bukan data simpanan, jadi tidak dapat diekspor. # AI translated
No screenshot = Tidak ada tangkapan layar
None yet. Things will appear here after you save. = Belum ada. Sesuatu akan muncul di sini setelah anda menyimpan.
+1
View File
@@ -1470,6 +1470,7 @@ Export = Esporta # AI translated
Export all saves for this game = Esporta tutti i salvataggi di questo gioco # AI translated
Export failed = Esportazione non riuscita # AI translated
Filename = Nome del file
Import = Importa # AI translated
InstalledDataNotExported = Questi sono dati installati dal gioco, non un salvataggio, quindi non possono essere esportati. # AI translated
No screenshot = Nessuno screenshot
None yet. Things will appear here after you save. = Ancora niente. Si inizierà a vedere qualcosa dopo il salvataggio.
+1
View File
@@ -1468,6 +1468,7 @@ Export = エクスポート # AI translated
Export all saves for this game = このゲームのセーブデータをすべてエクスポート # AI translated
Export failed = エクスポートに失敗しました # AI translated
Filename = ファイル名
Import = インポート # AI translated
InstalledDataNotExported = これはゲームがインストールしたデータで、セーブデータではないため、エクスポートできません。 # AI translated
No screenshot = スクリーンショットなし
None yet. Things will appear here after you save. = まだありません。セーブ後に項目が表示されます。
+1
View File
@@ -1467,6 +1467,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Filename
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = Ora ana tangkapan layar
None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
+1
View File
@@ -1468,6 +1468,7 @@ Export = នាំចេញ # AI translated
Export all saves for this game = Export all saves for this game
Export failed = ការនាំចេញបានបរាជ័យ # AI translated
Filename =ឈ្មោះឯកសារ
Import = នាំចូល # AI translated
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot =គ្មានរូបថតអេក្រង់ទេ។
None yet. Things will appear here after you save. =មិនទាន់មានទេ។ អ្វីៗនឹងបង្ហាញនៅទីនេះ បន្ទាប់ពីអ្នករក្សាទុក។
+1
View File
@@ -1467,6 +1467,7 @@ Export = 내보내기 # AI translated
Export all saves for this game = 이 게임의 모든 저장 데이터 내보내기 # AI translated
Export failed = 내보내기 실패 # AI translated
Filename = 파일이름
Import = 가져오기 # AI translated
InstalledDataNotExported = 이 데이터는 게임이 설치한 데이터이며 저장 데이터가 아니므로 내보낼 수 없습니다. # AI translated
No screenshot = 스크린샷 없음
None yet. Things will appear here after you save. = 아직 없습니다. 저장하면 여기에 항목이 표시됩니다.
+1
View File
@@ -1481,6 +1481,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Filename
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = No screenshot
None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Export
Export all saves for this game = Export all saves for this game
Export failed = Export failed
Filename = Filename
Import = Import
InstalledDataNotExported = This is data the game installed, not a save, so it can't be exported.
No screenshot = ບໍ່ມີການຈັບພາບໜ້າຈໍ
None yet. Things will appear here after you save. = ຍັງບໍ່ມີຂໍ້ມູນເທື່ອ. ຈະມີກໍຕໍ່ເມື່ອເຈົ້າໄດ້ກົດບັນທຶກເອົາໄວ້.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Eksportuoti # AI translated
Export all saves for this game = Eksportuoti visus šio žaidimo išsaugotus duomenis # AI translated
Export failed = Eksportuoti nepavyko # AI translated
Filename = Failo pavadinimas # AI translated
Import = Importuoti # AI translated
InstalledDataNotExported = Tai žaidimo įdiegti duomenys, o ne išsaugojimas, todėl jų negalima eksportuoti. # AI translated
No screenshot = Nėra ekrano nuotraukos # AI translated
None yet. Things will appear here after you save. = Kol kas nieko nėra. Įrašai atsiras čia, kai išsaugosite. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Eksport # AI translated
Export all saves for this game = Eksport semua data simpanan permainan ini # AI translated
Export failed = Gagal mengeksport # AI translated
Filename = Nama fail
Import = Import # same as English
InstalledDataNotExported = Ini ialah data yang dipasang oleh permainan, bukan data simpanan, jadi ia tidak boleh dieksport. # AI translated
No screenshot = Tiada tangkapan skrin
None yet. Things will appear here after you save. = Belum ada lagi. Item akan muncul di sini selepas anda menyimpan.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Exporteren # AI translated
Export all saves for this game = Alle savedata van deze game exporteren # AI translated
Export failed = Exporteren mislukt # AI translated
Filename = Bestandsnaam # AI translated
Import = Importeren # AI translated
InstalledDataNotExported = Dit zijn gegevens die de game heeft geïnstalleerd, geen savedata, dus ze kunnen niet worden geëxporteerd. # AI translated
No screenshot = Geen screenshot
None yet. Things will appear here after you save. = Nog niets. Er zullen hier dingen verschijnen zodra u iets opslaat.
+1
View File
@@ -1492,6 +1492,7 @@ Export = Eksporter # AI translated
Export all saves for this game = Eksporter alle lagringsdata for dette spelet # AI translated
Export failed = Eksporten mislukkast # AI translated
Filename = Filnamn
Import = Importer # AI translated
InstalledDataNotExported = Dette er data som spelet har installert, ikkje lagringsdata, så dei kan ikkje eksporterast. # AI translated
No screenshot = Ingen skjermbilete
None yet. Things will appear here after you save. = Ingenting enno. Ting dukkar opp her etter at du har lagra.
+1
View File
@@ -1492,6 +1492,7 @@ Export = Eksporter # AI translated
Export all saves for this game = Eksporter alle lagringsdata for dette spillet # AI translated
Export failed = Eksporten mislyktes # AI translated
Filename = Filnavn
Import = Importer # AI translated
InstalledDataNotExported = Dette er data som spillet har installert, ikke lagringsdata, så de kan ikke eksporteres. # AI translated
No screenshot = Ingen skjermklipp
None yet. Things will appear here after you save. = Ingenting ennå. Ting vises her etter at du har lagret.
+1
View File
@@ -1471,6 +1471,7 @@ Export = Eksportuj # AI translated
Export all saves for this game = Eksportuj wszystkie zapisy tej gry # AI translated
Export failed = Eksport nie powiódł się # AI translated
Filename = Nazwa pliku
Import = Importuj # AI translated
InstalledDataNotExported = To dane zainstalowane przez grę, a nie zapis, więc nie można ich wyeksportować. # AI translated
No screenshot = Brak obrazka
None yet. Things will appear here after you save. = Na razie nic tu nie ma. Wpisy pojawią się, gdy zapiszesz grę.
+1
View File
@@ -1495,6 +1495,7 @@ Export = Exportar # AI translated
Export all saves for this game = Exportar todos os dados salvos deste jogo # AI translated
Export failed = Falha ao exportar # AI translated
Filename = Nome do arquivo
Import = Importar # AI translated
InstalledDataNotExported = Estes são dados instalados pelo jogo, não dados salvos, então não podem ser exportados. # AI translated
No screenshot = Sem screenshot
None yet. Things will appear here after you save. = Nada ainda. As coisas aparecerão aqui após você salvar.
+1
View File
@@ -1491,6 +1491,7 @@ Export = Exportar # AI translated
Export all saves for this game = Exportar todos os dados salvos deste jogo # AI translated
Export failed = Falha ao exportar # AI translated
Filename = Nome do ficheiro
Import = Importar # AI translated
InstalledDataNotExported = Estes são dados instalados pelo jogo, não dados salvos, por isso não podem ser exportados. # AI translated
No screenshot = Sem Captura de tela
None yet. Things will appear here after you save. = Nada ainda. As coisas vão aparecer aqui após salvares.
+1
View File
@@ -1468,6 +1468,7 @@ Export = Exportă # AI translated
Export all saves for this game = Exportă toate salvările acestui joc # AI translated
Export failed = Exportul a eșuat # AI translated
Filename = Nume fișier # AI translated
Import = Importă # AI translated
InstalledDataNotExported = Acestea sunt date instalate de joc, nu o salvare, deci nu pot fi exportate. # AI translated
No screenshot = Fără captură de ecran # AI translated
None yet. Things will appear here after you save. = Nimic încă. Elementele vor apărea aici după ce salvați. # AI translated
+1
View File
@@ -1467,6 +1467,7 @@ Export = Экспорт # AI translated
Export all saves for this game = Экспортировать все сохранения этой игры # AI translated
Export failed = Не удалось экспортировать # AI translated
Filename = Имя файла
Import = Импорт # AI translated
InstalledDataNotExported = Это данные, установленные игрой, а не сохранение, поэтому их нельзя экспортировать. # AI translated
No screenshot = Нет скриншота
None yet. Things will appear here after you save. = Здесь ничего нет. Появится после сохранения.
+1
View File
@@ -1468,6 +1468,7 @@ Export = Exportera # AI translated
Export all saves for this game = Exportera all sparad data för det här spelet # AI translated
Export failed = Exporten misslyckades # AI translated
Filename = Filnamn
Import = Importera # AI translated
InstalledDataNotExported = Det här är data som spelet har installerat, inte sparad data, så den kan inte exporteras. # AI translated
No screenshot = Ingen skärmdump
None yet. Things will appear here after you save. = Inget ännu. Innehåll visas här när du har sparat.
+1
View File
@@ -1468,6 +1468,7 @@ Export = I-export # AI translated
Export all saves for this game = I-export ang lahat ng savedata ng larong ito # AI translated
Export failed = Nabigo ang pag-export # AI translated
Filename = Pangalan ng file
Import = I-import # AI translated
InstalledDataNotExported = Ito ay data na in-install ng laro, hindi save, kaya hindi ito maaaring i-export. # AI translated
No screenshot = Walang Screenshot
None yet. Things will appear here after you save. = Wala pa. Makikita mo dito kapag may na i-savestate ka na
+1
View File
@@ -1477,6 +1477,7 @@ Export = ส่งออก # AI translated
Export all saves for this game = ส่งออกเซฟทั้งหมดของเกมนี้ # AI translated
Export failed = ส่งออกไม่สำเร็จ # AI translated
Filename = ตามชื่อ
Import = นำเข้า # AI translated
InstalledDataNotExported = นี่คือข้อมูลที่เกมติดตั้งไว้ ไม่ใช่เซฟ จึงส่งออกไม่ได้ # AI translated
No screenshot = ไม่มีภาพประกอบ
None yet. Things will appear here after you save. = ยังไม่มีข้อมูล จะมีก็ต่อเมื่อหลังจากที่คุณได้กดบันทึกเอาไว้
+1
View File
@@ -1468,6 +1468,7 @@ Export = Dışa aktar # AI translated
Export all saves for this game = Bu oyunun tüm kayıtlarını dışa aktar # AI translated
Export failed = Dışa aktarma başarısız # AI translated
Filename = Dosya Adı
Import = İçe aktar # AI translated
InstalledDataNotExported = Bu, oyunun yüklediği veridir, kayıt değildir, bu yüzden dışa aktarılamaz. # AI translated
No screenshot = Ekran Görüntüsü Yok
None yet. Things will appear here after you save. = Henüz bir şey yok. Kayıt aldığında kayıtların burada görünecek.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Експорт # AI translated
Export all saves for this game = Експортувати всі збереження цієї гри # AI translated
Export failed = Не вдалося експортувати # AI translated
Filename = Ім'я файлу
Import = Імпорт # AI translated
InstalledDataNotExported = Це дані, встановлені грою, а не збереження, тому їх не можна експортувати. # AI translated
No screenshot = Немає скріншоту
None yet. Things will appear here after you save. = Тут поки що нічого немає. З'явиться після вашого збереження.
+1
View File
@@ -1467,6 +1467,7 @@ Export = Xuất # AI translated
Export all saves for this game = Xuất tất cả dữ liệu lưu của trò chơi này # AI translated
Export failed = Xuất thất bại # AI translated
Filename = Tên file
Import = Nhập # AI translated
InstalledDataNotExported = Đây là dữ liệu do trò chơi cài đặt, không phải dữ liệu lưu, nên không thể xuất. # AI translated
No screenshot = Không có screenshot
None yet. Things will appear here after you save. = Không có gì ở đây. Mọi thứ sẽ xuất hiện ở đây sau khi bạn lưu.
+1
View File
@@ -1468,6 +1468,7 @@ Export = 导出 # AI translated
Export all saves for this game = 导出此游戏的所有存档 # AI translated
Export failed = 导出失败 # AI translated
Filename = 文件名
Import = 导入 # AI translated
InstalledDataNotExported = 这是游戏安装的数据,不是存档,因此无法导出。 # AI translated
No screenshot = 没有截图
None yet. Things will appear here after you save. = 暂无内容,游戏保存数据之后再回来吧。
+1
View File
@@ -1467,6 +1467,7 @@ Export = 匯出 # AI translated
Export all saves for this game = 匯出此遊戲的所有儲存資料 # AI translated
Export failed = 匯出失敗 # AI translated
Filename = 檔案名稱
Import = 匯入 # AI translated
InstalledDataNotExported = 這是遊戲安裝的資料,不是儲存資料,因此無法匯出。 # AI translated
No screenshot = 沒有螢幕截圖
None yet. Things will appear here after you save. = 尚無,將在存檔後出現新項目
+49
View File
@@ -184,6 +184,53 @@ static bool TestRootSaveDataZip() {
return true;
}
// A PS3 save folder has the same PARAM.SFO + ICON0.PNG layout as a PSP one. Each signal alone must reject it.
static bool TestPS3SaveDataZip() {
Path tempRoot = File::GetCurDirectory() / "unittest_zip_ps3save_test";
File::DeleteDirRecursively(tempRoot);
EXPECT_TRUE(File::CreateDir(tempRoot));
for (int variant = 0; variant < 2; variant++) {
const bool sdCategory = variant == 0;
ParamSFOData sfo;
sfo.SetValue("CATEGORY", sdCategory ? "SD" : "MS", 4);
sfo.SetValue("TITLE", "Some PS3 game", 128);
sfo.SetValue("SAVEDATA_DIRECTORY", "BCES00141", 64);
u8 *sfoData = nullptr;
size_t sfoSize = 0;
sfo.WriteSFO(&sfoData, &sfoSize);
std::string sfoContents((const char *)sfoData, sfoSize);
delete[] sfoData;
Path zipPath = tempRoot / "ps3save.zip";
int errorp = 0;
zip_t *z = zip_open(zipPath.c_str(), ZIP_CREATE | ZIP_TRUNCATE, &errorp);
EXPECT_TRUE(z != nullptr);
static const char *const contents = "data";
zip_source_t *source = zip_source_buffer(z, sfoContents.data(), sfoContents.size(), 0);
EXPECT_TRUE(zip_file_add(z, "BCES00141/PARAM.SFO", source, ZIP_FL_ENC_UTF_8) >= 0);
std::vector<const char *> names = { "BCES00141/ICON0.PNG", "BCES00141/0" };
if (!sdCategory) {
names.push_back("BCES00141/PARAM.PFD");
}
for (const char *name : names) {
source = zip_source_buffer(z, contents, strlen(contents), 0);
EXPECT_TRUE(zip_file_add(z, name, source, ZIP_FL_ENC_UTF_8) >= 0);
}
EXPECT_TRUE(zip_close(z) == 0);
z = zip_open(zipPath.c_str(), 0, &errorp);
EXPECT_TRUE(z != nullptr);
ZipFileInfo info;
DetectZipFileContents(z, &info);
zip_close(z);
EXPECT_EQ_INT((int)info.contents, (int)ZipFileContents::UNKNOWN);
}
File::DeleteDirRecursively(tempRoot);
return true;
}
static bool TestIsSafePathComponent() {
EXPECT_TRUE(IsSafePathComponent("ULUS10041"));
EXPECT_TRUE(IsSafePathComponent("NPJH-50465"));
@@ -214,5 +261,7 @@ bool TestZipSlip() {
return false;
if (!TestRootSaveDataZip())
return false;
if (!TestPS3SaveDataZip())
return false;
return true;
}