Path Normalization

Normalize path inside of models to be posix/unix-like forward slashes
- Fixes #53

Author: SnaveSutit

src/util/minecraft/resourcepack.ts

@@ -2,6 +2,7 @@
 import * as path from 'path'
 import { CustomError } from '../customError'
 import { tl } from '../intl'
+import { normalizePath } from '../misc'
 import { format } from '../replace'
 
 export function getTexturePath(texture: any) {
@@ -32,8 +33,11 @@ export function getTexturePath(texture: any) {
 				const textureIndex = relative.indexOf('textures') // Locate 'texture' in the path
 				if (textureIndex > -1) {
 					relative.splice(textureIndex, 1) // Remove 'texture' from the path
-					console.log('Texture Path', `${namespace}:${path.join(...relative)}`)
-					return `${namespace}:${path.join(...relative)}` // Generate texture path
+					const textureReference = `${namespace}:${normalizePath(
+						path.join(...relative)
+					)}` // Generate texture path
+					console.log('Texture Reference:', textureReference)
+					return textureReference
 				}
 			}
 		}
@@ -69,8 +73,11 @@ export function getModelPath(modelPath: string, modelName: string) {
 				const modelsIndex = relative.indexOf('models') // Locate 'texture' in the path
 				if (modelsIndex > -1) {
 					relative.splice(modelsIndex, 1) // Remove 'texture' from the path
-					console.log('Model Path', `${namespace}:${path.join(...relative)}`)
-					return `${namespace}:${path.join(...relative)}` // Generate texture path
+					const modelReference = `${namespace}:${normalizePath(
+						path.join(...relative)
+					)}` // Generate texture path
+					console.log('Model Reference:', modelReference)
+					return modelReference
 				}
 			}
 		}
@@ -83,7 +90,7 @@ export function getModelPath(modelPath: string, modelName: string) {
 			lines: format(
 				tl('animatedJava.popup.error.unableToGenerateModelPath.body'),
 				{
-					modelName
+					modelName,
 				}
 			)
 				.split('\n')

src/util/misc.ts

@@ -32,3 +32,28 @@ export function size(item: any) {
 export function wrapNumber(num: number, min: number, max: number): number {
 	return ((((num - min) % (max - min)) + (max - min)) % (max - min)) + min
 }
+
+export function normalizePath(path: string, stripTrailing?: boolean) {
+	if (path === '\\' || path === '/') return '/'
+
+	var len = path.length
+	if (len <= 1) return path
+
+	// ensure that win32 namespaces has two leading slashes, so that the path is
+	// handled properly by the win32 version of path.parse() after being normalized
+	// https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+	var prefix = ''
+	if (len > 4 && path[3] === '\\') {
+		var ch = path[2]
+		if ((ch === '?' || ch === '.') && path.slice(0, 2) === '\\\\') {
+			path = path.slice(2)
+			prefix = '//'
+		}
+	}
+
+	var segs = path.split(/[/\\]+/)
+	if (stripTrailing !== false && segs[segs.length - 1] === '') {
+		segs.pop()
+	}
+	return prefix + segs.join('/')
+}