Pre-scan the root of texture packs for hash-named files. #17380
Conversation
| files.insert(std::string(fn)); | ||
| } // else, it was a file with the same prefix as the path. like langregion.ini next to lang/. |
There was a problem hiding this comment.
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]
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Okay, yeah, making GetFileListing() add / makes sense.
But oops, now there's a source_assets/ziptest.zip. Oh, it's intentional for testing.
-[Unknown]
There was a problem hiding this comment.
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.
GPU/Common/TextureReplacer.cpp
Outdated
| 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")) { |
There was a problem hiding this comment.
Well, I guess we might as well add ".zim"?
-[Unknown]
|
I've solved the above comments, so I'll just get it in for 1.15.1. |
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 .