Bläddra i källkod

auto escape slashes in convert path regexps

Nicolas Cannasse 3 år sedan
förälder
incheckning
52b68267e7
1 ändrade filer med 5 tillägg och 4 borttagningar
  1. 5 4
      hxd/fs/FileConverter.hx

+ 5 - 4
hxd/fs/FileConverter.hx

@@ -37,8 +37,8 @@ class FileConverter {
 	static var extraConfigs:Array<Dynamic> = [];
 	static var extraConfigs:Array<Dynamic> = [];
 
 
 	/**
 	/**
-		Add extra convert configuration. Should be props.json-compatible structure.  
-		Can be used to add or override converts that are enabled by default.  
+		Add extra convert configuration. Should be props.json-compatible structure.
+		Can be used to add or override converts that are enabled by default.
 		Sample code of Convert registration and enabling it by default:
 		Sample code of Convert registration and enabling it by default:
 		```haxe
 		```haxe
 		// Register Convert
 		// Register Convert
@@ -89,9 +89,10 @@ class FileConverter {
 		var merge = mergeRec(def, conf);
 		var merge = mergeRec(def, conf);
 		for( f in Reflect.fields(merge) ) {
 		for( f in Reflect.fields(merge) ) {
 			var cmd = makeCommmand(Reflect.field(merge,f));
 			var cmd = makeCommmand(Reflect.field(merge,f));
-			var pt = if( f.charCodeAt(0) == "^".code )
+			var pt = if( f.charCodeAt(0) == "^".code ) {
+				f = f.split("\\/").join("/").split("/").join("\\/");
 				Regexp(new EReg(f,""));
 				Regexp(new EReg(f,""));
-			else if( ~/^[a-zA-Z0-9,]+$/.match(f) ) {
+			} else if( ~/^[a-zA-Z0-9,]+$/.match(f) ) {
 				var el = f.toLowerCase().split(",");
 				var el = f.toLowerCase().split(",");
 				el.length == 1 ? Ext(el[0]) : Exts(el);
 				el.length == 1 ? Ext(el[0]) : Exts(el);
 			} else if( f == "*" )
 			} else if( f == "*" )