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

Pre-scan the root of texture packs for hash-named files. #17380

Merged
merged 4 commits into from
May 2, 2023

Conversation

hrydgard
Copy link
Owner

@hrydgard hrydgard commented May 1, 2023

Since it only happens on startup, shouldn't be too crazy-slow even on Android with scoped storage.

This allows finding files like 040cc000000007086a89188c.ktx2 without adding entries to the ini file, even though its extension doesn't match the default extension of ".png".

Also fixes broken-ness when doing dir listings in zip files.

Fixes #17365 .

@hrydgard hrydgard added this to the v1.15.1 milestone May 1, 2023
files.insert(std::string(fn));
} // else, it was a file with the same prefix as the path. like langregion.ini next to lang/.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do we protect against this case now?

So let's say path is "assets/lang". We did check it starts with "assets/lang", so that's good. But "assets/langregion" matches that and does not have a /. So won't we match it and add it to the list as "egion" or something?

I might also be missing something about name + pathlen. In my above scenario, "assets/lang/foo.ini" would not find a slash after name + pathlen + 1 (which is "foo.ini") but wouldn't fn become "/foo.ini"? Seems confusing.

It feels like this new logic might only be something that works when path == ""? Which does look like it was broken before.

-[Unknown]

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I somehow convinced myself that since all directories in a zip file always end wih '/', they'd be caught in the first case anyway - but that doesn't even make sense. Don't know what I was thinking.

I'll make a unit test for this today to really make sure all cases comes out right.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this does work - just gotta follow the convention of directory paths ending with "/" consistently throughout.

The unit test revealed a number of bugs, but I've fixed it and it's working now.

Copy link
Collaborator

@unknownbrackets unknownbrackets May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, yeah, making GetFileListing() add / makes sense.

But oops, now there's a source_assets/ziptest.zip. Oh, it's intentional for testing.

-[Unknown]

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we don't have a designated directory for testdata, at least not that I found. Though I suppose could have put the zip in /unittest too.

continue;
}
// OK, it's hash-like enough to try to parse it into the map.
if (equalsNoCase(ext, ".ktx2") || equalsNoCase(ext, ".png") || equalsNoCase(ext, ".dds")) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I guess we might as well add ".zim"?

-[Unknown]

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

late night coding, oops.

@hrydgard
Copy link
Owner Author

hrydgard commented May 2, 2023

I've solved the above comments, so I'll just get it in for 1.15.1.

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

Successfully merging this pull request may close these issues.

DDS format reported not to work
2 participants