Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMMON: Refactor ArchiveMember directory support #5309

merged 5 commits into from Sep 17, 2023


Copy link

@elasota elasota commented Sep 3, 2023

This adds a few new functions:

  • Archive::isPathDirectory: Returns true if a specified path is a directory
  • ArchiveMember:isDirectory: Returns true if the archive member is a directory
  • ArchiveMember::listChildren: Lists the children of an archive member

This also introduces some potentially-breaking functionality changes:

  • Common::String::matchString will no longer match excluded characters with a trailing asterisk. This was apparently unintentional, and causes listMatchingMembers and similar to not behave the same way for FSDirectory as it does for other archive types that support listing members.
  • ZipArchive now strips trailing path separators from directory entries. The directory detection code has also been updated to detect directory entries without trailing path separators from the external file attributes field.

Finally, it updates Sword 2.5's package manager to be compatible with this change.

Further testing is needed.

Copy link

sev- commented Sep 17, 2023


@sev- sev- merged commit e0b8e66 into scummvm:master Sep 17, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet
2 participants