X Tutup
Skip to content

ENGINES: Add detection table dumping for Glk and Scumm#6524

Merged
bluegr merged 4 commits intoscummvm:masterfrom
ShivangNagta:shivang-scummvm-detection
Apr 26, 2025
Merged

ENGINES: Add detection table dumping for Glk and Scumm#6524
bluegr merged 4 commits intoscummvm:masterfrom
ShivangNagta:shivang-scummvm-detection

Conversation

@ShivangNagta
Copy link
Contributor

@ShivangNagta ShivangNagta commented Mar 30, 2025

  • Add detection table dumping for Glk
  • Add detection table dumping for Scumm

@sev- sev- added the GSoC Part of a Google Summer of Code project label Mar 30, 2025
@sev-
Copy link
Member

sev- commented Mar 30, 2025

I do not quite understand, what is so different in other GLK subengines, so you added only one.

Please consider adding more engine support. Maybe, maybe there will be one or two variants.

@ShivangNagta ShivangNagta force-pushed the shivang-scummvm-detection branch from 99c8028 to f40e5f2 Compare April 13, 2025 16:24
@bluegr
Copy link
Member

bluegr commented Apr 26, 2025

Nice work. Thanks!

@bluegr bluegr merged commit f36491f into scummvm:master Apr 26, 2025
8 checks passed
@sev-
Copy link
Member

sev- commented Apr 27, 2025

This should've not been merged in this state.

  • Why printf() was replaced with debug()
  • Was this tested with the integrity service?
    • Does the out put even parse?
    • How does the matching work?

@ShivangNagta
Copy link
Contributor Author

This should've not been merged in this state.

  • Why printf() was replaced with debug()

  • Was this tested with the integrity service?

    • Does the out put even parse?
    • How does the matching work?
  1. It was functioning the same with debug, i am not sure what the difference is.
  2. Yes, the output parses normally on the python side. But the problem was with the filenames, as I mentioned in discord. There was no way to get the filenames of the checksums with which they were associated with, so I kept the gameIDs as the filenames. We will have to rely on the extra metadata that we receive in the future to correct the filename.
  3. I checked the initial seeding, which was working as it should be. I haven't properly tested the merging part.

@bluegr
Copy link
Member

bluegr commented Apr 28, 2025

I was the one who merged this, but as mentioned, it wasn't ready to be merged in the state it was in this PR.

Since this PR was merged, additional tests and commits have been made, which address the following issues:

  • Replace debug() calls with printf() in both engines, to avoid outputting debug info together with the detection entries
  • Match MD5 detection entries with their corresponding detection file entries for SCUMM - commit 049feec
  • Add missing terminators to the game entries returned from GLK subengines that use different game entry formats, namely, Comprehend, Level9 and ZCode - commit d1950e8
  • Fix whitespace issues (some of which were caused by my commits) - the commits above plus commit 75f327b

With the changes above, the game entries seem to be dumped correctly for both engines. More tests need to be performed to check all edge cases, so in the meantime the entry dumping code for both engines is disabled on master, and will be re-enabled in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

GSoC Part of a Google Summer of Code project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

X Tutup