Browse Source

[python] move haxe.Resource implementation into a target-specific folder

Dan Korostelev 11 years ago
parent
commit
cdb129f5c2
2 changed files with 62 additions and 46 deletions
  1. 1 46
      std/haxe/Resource.hx
  2. 61 0
      std/python/_std/haxe/Resource.hx

+ 1 - 46
std/haxe/Resource.hx

@@ -20,10 +20,6 @@
  * 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
@@ -36,26 +32,14 @@ import haxe.io.BytesData;
 **/
 class Resource {
 
-	#if python
-	static var content : python.lib.Dict<String, BytesData>;
-	#else
 	static var content : Array<{ name : String, data : String, str : String }>;
-	#end
 
 	/**
 		Lists all available resource names. The resource name is the name part
 		of the -resource file@name command line parameter.
 	**/
 	public static function listNames() : Array<String> {
-		var names = new Array();
-		#if python
-		for ( k in content.keys().iter())
-			names.push(k);
-		#else
-		for ( x in content )
-			names.push(x.name);
-		#end
-		return names;
+		return [for (x in content) x.name];
 	}
 
 	/**
@@ -64,19 +48,6 @@ class Resource {
 		If `name` does not match any resource name, null is returned.
 	**/
 	public static function getString( name : String ) : String {
-		#if 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.toString();
-
-			}
-		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 ) {
 				#if neko
@@ -88,7 +59,6 @@ class Resource {
 				#end
 			}
 		return null;
-		#end
 	}
 
 	/**
@@ -98,18 +68,6 @@ class Resource {
 		If `name` does not match any resource name, null is returned.
 	**/
 	public static function getBytes( name : String ) : haxe.io.Bytes {
-		#if 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
-		#else
 		for( x in content )
 			if( x.name == name ) {
 				#if neko
@@ -120,7 +78,6 @@ class Resource {
 				#end
 			}
 		return null;
-		#end
 	}
 
 	static function __init__() {
@@ -131,8 +88,6 @@ class Resource {
 		content = null;
 		#elseif as3
 		null;
-		#elseif python
-		content = untyped _hx_resources__();
 		#else
 		content = untyped __resources__();
 		#end

+ 61 - 0
std/python/_std/haxe/Resource.hx

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C)2005-2014 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe;
+
+import haxe.io.Bytes;
+import haxe.io.BytesData;
+
+@:coreApi class Resource {
+
+	static var content : python.lib.Dict<String, BytesData> = untyped _hx_resources__();
+
+	public static function listNames() : Array<String> {
+		return python.internal.HxBuiltin.list(content.keys());
+	}
+
+	public static function getString( name : String ) : String {
+        #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.toString();
+			}
+		}
+		return null;
+        #else
+        return content.hasKey(name) ? Bytes.ofData(content.get(name, null)).toString() : null;
+        #end
+	}
+
+	public static function getBytes( name : String ) : haxe.io.Bytes {
+        #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
+	}
+}