Merge pull request #27 from ousado/genpy

read resources from files

genpy.ml

@@ -1728,7 +1728,7 @@ module Generator = struct
 
 	let gen_resources ctx =
 		if Hashtbl.length ctx.com.resources > 0 then begin
-			spr ctx "def _hx_resources__():\n\treturn {";
+			spr ctx "import os;\ndef _hx_resources__():\n\treturn {";
 			let first = ref true in
 			Hashtbl.iter (fun k v ->
 				let prefix = if !first then begin
@@ -1737,7 +1737,8 @@ module Generator = struct
 				end else
 					","
 				in
-				print ctx "%s'%s':'''%s'''" prefix k (Codegen.bytes_serialize v)
+				print ctx "%s'%s': open('%%s.%%s'%%(__file__,'%s'),'rb').read()" prefix k k;
+				Std.output_file (ctx.com.file ^ "." ^ k) v
 			) ctx.com.resources;
 			spr ctx "}\n"
 		end

std/haxe/Resource.hx

@@ -20,6 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package haxe;
+#if python
+import haxe.io.Bytes;
+import haxe.io.BytesData;
+#end
 
 /**
 	Resource can be used to access resources that were added through the
@@ -35,7 +39,7 @@ class Resource {
 	#if (java || cs)
 	@:keep static var content : Array<String>;
 	#elseif python
-	static var content : python.lib.Types.Dict<String, String>;
+	static var content : python.lib.Types.Dict<String, BytesData>;
 	#else
 	static var content : Array<{ name : String, data : String, str : String }>;
 	#end
@@ -98,6 +102,7 @@ class Resource {
 			return new cs.io.NativeInput(str).readAll().toString();
 		return null;
 		#elseif python
+        #if embed_resources
 		for( k in content.keys().iter() )
 			if( k == name ) {
 				var b : haxe.io.Bytes = haxe.crypto.Base64.decode(content.get(k, null));
@@ -105,6 +110,9 @@ class Resource {
 
 			}
 		return null;
+        #else
+        return content.hasKey(name) ? Bytes.ofData(content.get(name,null)).toString() : null;
+        #end
 		#else
 		for( x in content )
 			if( x.name == name ) {
@@ -140,12 +148,16 @@ class Resource {
 			return new cs.io.NativeInput(str).readAll();
 		return null;
 		#elseif python
+        #if embed_resources
 		for( k in content.keys().iter() )
 			if( k == name ) {
 				var b : haxe.io.Bytes = haxe.crypto.Base64.decode(content.get(k, null));
 				return b;
 
 			}
+        #else
+        return Bytes.ofData(content.get(name,null));
+        #end
 		return null;
 		#else
 		for( x in content )

tests/unit/Test.hx

@@ -257,7 +257,7 @@ class Test #if swf_mark implements mt.Protect #end {
 			new TestEReg(),
 			new TestXML(),
 			new TestMisc(),
-			//new TestResource(),
+			new TestResource(),
 			new TestInt64(),
 			new TestReflect(),
 			new TestSerialize(),