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

Fix filename slashes #880

Merged
merged 3 commits into from
Aug 21, 2019
Merged

Conversation

jberg
Copy link
Collaborator

@jberg jberg commented Aug 21, 2019

No description provided.

@@ -92,12 +97,11 @@ export async function inlineIncludes(xml, zip) {
return node;
}
// TODO: Normalize file names so that they hit the same cache
const includedFile = await readXml(zip, node.attributes.file);
const filename = fixFilenameSlashes(node.attributes.file);
const includedFile = await readXml(zip, filename);
Copy link
Owner

Choose a reason for hiding this comment

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

I think this would lead to us double escaping.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh derp, missed that readXml already calls getCaseInsensitveFile. Won't double escape, since we are just replacing, but doesn't need to be in both places!

Thanks

@captbaritone captbaritone merged commit bae6a56 into captbaritone:master Aug 21, 2019
captbaritone pushed a commit that referenced this pull request Nov 30, 2019
* Fix windows filename slashes

* add comment

* readXml will already convert the slashes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants