From adf1db92c7a25f0438bda7bbc0dd8ca543b83545 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Tue, 28 Oct 2025 09:40:38 -0700 Subject: [PATCH] fix Ep3 quest download test --- src/Episode3/DataIndexes.cc | 9 ++++++++ tests/GCEp3-QuestDownload.test.txt | 34 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/Episode3/DataIndexes.cc b/src/Episode3/DataIndexes.cc index 386e09a3..6690bec9 100644 --- a/src/Episode3/DataIndexes.cc +++ b/src/Episode3/DataIndexes.cc @@ -2822,7 +2822,16 @@ MapIndex::MapIndex(const string& directory, bool raise_on_any_failure) { } }; + std::vector cat_items; for (const auto& cat_item : std::filesystem::directory_iterator(directory)) { + cat_items.emplace_back(cat_item); + } + auto sort_fn = +[](const std::filesystem::directory_entry& a, const std::filesystem::directory_entry& b) -> bool { + return a.path().filename().string() < b.path().filename().string(); + }; + sort(cat_items.begin(), cat_items.end(), sort_fn); + + for (const auto& cat_item : cat_items) { string cat_dir_path = cat_item.path().string(); if (cat_item.is_directory()) { diff --git a/tests/GCEp3-QuestDownload.test.txt b/tests/GCEp3-QuestDownload.test.txt index 6e8cedc9..f72371d7 100644 --- a/tests/GCEp3-QuestDownload.test.txt +++ b/tests/GCEp3-QuestDownload.test.txt @@ -3505,28 +3505,28 @@ I 22576 2025-10-26 23:12:10 - [Commands] Sending to C-1 (Tali Lv.7) @ ipss:N-1:1 I 22576 2025-10-26 23:12:12 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=10 flag=00) 0000 | 10 00 0C 00 11 00 00 11 11 44 44 11 | DD I 22576 2025-10-26 23:12:12 - [Commands] Sending to C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=A4 flag=02) -0000 | A4 02 34 01 01 00 00 01 01 00 00 00 54 72 69 61 | 4 Tria -0010 | 6C 20 64 6F 77 6E 6C 6F 61 64 73 00 00 00 00 00 | l downloads +0000 | A4 02 34 01 01 00 00 01 01 00 00 00 44 6F 77 6E | 4 Down +0010 | 6C 6F 61 64 73 00 00 00 00 00 00 00 00 00 00 00 | loads 0020 | 00 00 00 00 00 00 00 00 00 00 00 00 4D 61 70 73 | Maps 0030 | 20 6F 72 69 67 69 6E 61 6C 6C 79 20 6D 61 64 65 | originally made -0040 | 0A 66 6F 72 20 45 70 69 73 6F 64 65 20 33 20 54 | for Episode 3 T -0050 | 72 69 61 6C 0A 45 64 69 74 69 6F 6E 00 00 00 00 | rial Edition +0040 | 0A 66 6F 72 20 45 70 69 73 6F 64 65 20 33 20 66 | for Episode 3 f +0050 | 69 6E 61 6C 0A 65 64 69 74 69 6F 6E 00 00 00 00 | inal edition 0060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0070 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0080 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0090 | 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 01 | -00A0 | 03 00 00 00 44 6F 77 6E 6C 6F 61 64 73 00 00 00 | Downloads -00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | +00A0 | 02 00 00 00 54 72 69 61 6C 20 64 6F 77 6E 6C 6F | Trial downlo +00B0 | 61 64 73 00 00 00 00 00 00 00 00 00 00 00 00 00 | ads 00C0 | 00 00 00 00 4D 61 70 73 20 6F 72 69 67 69 6E 61 | Maps origina 00D0 | 6C 6C 79 20 6D 61 64 65 0A 66 6F 72 20 45 70 69 | lly made for Epi -00E0 | 73 6F 64 65 20 33 20 66 69 6E 61 6C 0A 65 64 69 | sode 3 final edi +00E0 | 73 6F 64 65 20 33 20 54 72 69 61 6C 0A 45 64 69 | sode 3 Trial Edi 00F0 | 74 69 6F 6E 00 00 00 00 00 00 00 00 00 00 00 00 | tion 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0110 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0120 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0130 | 00 00 00 00 | I 22576 2025-10-26 23:12:14 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=10 flag=00) -0000 | 10 00 0C 00 01 00 00 01 03 00 00 00 | +0000 | 10 00 0C 00 01 00 00 01 01 00 00 00 | I 22576 2025-10-26 23:12:14 - [Commands] Sending to C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=A4 flag=07) 0000 | A4 07 2C 04 55 03 03 55 85 03 00 00 46 61 6D 69 | , U U Fami 0010 | 74 73 75 20 43 75 70 00 00 00 00 00 00 00 00 00 | tsu Cup @@ -4400,30 +4400,30 @@ I 22576 2025-10-26 23:12:16 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N- I 22576 2025-10-26 23:12:19 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=10 flag=00) 0000 | 10 00 0C 00 11 00 00 11 11 44 44 11 | DD I 22576 2025-10-26 23:12:19 - [Commands] Sending to C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=A4 flag=02) -0000 | A4 02 34 01 01 00 00 01 01 00 00 00 54 72 69 61 | 4 Tria -0010 | 6C 20 64 6F 77 6E 6C 6F 61 64 73 00 00 00 00 00 | l downloads +0000 | A4 02 34 01 01 00 00 01 01 00 00 00 44 6F 77 6E | 4 Down +0010 | 6C 6F 61 64 73 00 00 00 00 00 00 00 00 00 00 00 | loads 0020 | 00 00 00 00 00 00 00 00 00 00 00 00 4D 61 70 73 | Maps 0030 | 20 6F 72 69 67 69 6E 61 6C 6C 79 20 6D 61 64 65 | originally made -0040 | 0A 66 6F 72 20 45 70 69 73 6F 64 65 20 33 20 54 | for Episode 3 T -0050 | 72 69 61 6C 0A 45 64 69 74 69 6F 6E 00 00 00 00 | rial Edition +0040 | 0A 66 6F 72 20 45 70 69 73 6F 64 65 20 33 20 66 | for Episode 3 f +0050 | 69 6E 61 6C 0A 65 64 69 74 69 6F 6E 00 00 00 00 | inal edition 0060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0070 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0080 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0090 | 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 01 | -00A0 | 03 00 00 00 44 6F 77 6E 6C 6F 61 64 73 00 00 00 | Downloads -00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | +00A0 | 02 00 00 00 54 72 69 61 6C 20 64 6F 77 6E 6C 6F | Trial downlo +00B0 | 61 64 73 00 00 00 00 00 00 00 00 00 00 00 00 00 | ads 00C0 | 00 00 00 00 4D 61 70 73 20 6F 72 69 67 69 6E 61 | Maps origina 00D0 | 6C 6C 79 20 6D 61 64 65 0A 66 6F 72 20 45 70 69 | lly made for Epi -00E0 | 73 6F 64 65 20 33 20 66 69 6E 61 6C 0A 65 64 69 | sode 3 final edi +00E0 | 73 6F 64 65 20 33 20 54 72 69 61 6C 0A 45 64 69 | sode 3 Trial Edi 00F0 | 74 69 6F 6E 00 00 00 00 00 00 00 00 00 00 00 00 | tion 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0110 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0120 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0130 | 00 00 00 00 | I 22576 2025-10-26 23:12:20 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=09 flag=00) -0000 | 09 00 0C 00 01 00 00 01 03 00 00 00 | +0000 | 09 00 0C 00 01 00 00 01 01 00 00 00 | I 22576 2025-10-26 23:12:20 - [Commands] Received from C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=10 flag=00) -0000 | 10 00 0C 00 01 00 00 01 03 00 00 00 | +0000 | 10 00 0C 00 01 00 00 01 01 00 00 00 | I 22576 2025-10-26 23:12:20 - [Commands] Sending to C-1 (Tali Lv.7) @ ipss:N-1:127.0.0.1:59232 (version=GC_EP3 command=A4 flag=07) 0000 | A4 07 2C 04 55 03 03 55 85 03 00 00 46 61 6D 69 | , U U Fami 0010 | 74 73 75 20 43 75 70 00 00 00 00 00 00 00 00 00 | tsu Cup