فهرست منبع

hl zip.Compress support

Nicolas Cannasse 9 سال پیش
والد
کامیت
60f5636bb0
2فایلهای تغییر یافته به همراه74 افزوده شده و 5 حذف شده
  1. 69 0
      std/hl/_std/haxe/zip/Compress.hx
  2. 5 5
      std/hl/_std/haxe/zip/Uncompress.hx

+ 69 - 0
std/hl/_std/haxe/zip/Compress.hx

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C)2005-2016 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.zip;
+
+private typedef Deflater = hl.types.NativeAbstract<"fmt_zip">;
+
+@:coreApi @:hlNative("fmt")
+class Compress {
+
+	var s : Deflater;
+
+	public function new( level : Int ) : Void {
+		s = deflate_init(level);
+	}
+
+	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+		var read = 0, write = 0;
+		var done = deflate_buffer(s,src.getData(),srcPos,src.length,dst.getData(),dstPos,dst.length,read,write);
+		return { done : done, read : read, write : write };
+	}
+
+	public function setFlushMode( f : FlushMode ) : Void {
+		@:privateAccess Uncompress.zip_flush_mode(cast s,f.getIndex());
+	}
+
+	public function close() : Void {
+		@:privateAccess Uncompress.zip_end(cast s);
+	}
+
+	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
+		var c = new Compress(level);
+		c.setFlushMode(FlushMode.FINISH);
+		var out = haxe.io.Bytes.alloc(deflate_bound(c.s,s.length));
+		var r = c.execute(s,0,out,0);
+		c.close();
+		if( !r.done || r.read != s.length )
+			throw "Compression failed";
+		if( r.write < out.length*0.66 )
+			return out.sub(0, r.write);
+		@:privateAccess out.length = r.write;
+		return out;
+	}
+
+	static function deflate_init( level : Int ) : Deflater { return null; }
+	static function deflate_buffer( i : Deflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
+		return false;
+	}
+	static function deflate_bound( i : Deflater, length : Int ) : Int { return 0; }
+
+}

+ 5 - 5
std/hl/_std/haxe/zip/Uncompress.hx

@@ -21,7 +21,7 @@
  */
  */
 package haxe.zip;
 package haxe.zip;
 
 
-private typedef Inflater = hl.types.NativeAbstract<"fmt_inflater">;
+private typedef Inflater = hl.types.NativeAbstract<"fmt_zip">;
 
 
 @:coreApi @:hlNative("fmt")
 @:coreApi @:hlNative("fmt")
 class Uncompress {
 class Uncompress {
@@ -39,11 +39,11 @@ class Uncompress {
 	}
 	}
 
 
 	public function setFlushMode( f : FlushMode ) : Void {
 	public function setFlushMode( f : FlushMode ) : Void {
-		inflate_flush_mode(s,f.getIndex());
+		zip_flush_mode(s,f.getIndex());
 	}
 	}
 
 
 	public function close() : Void {
 	public function close() : Void {
-		inflate_end(s);
+		zip_end(s);
 	}
 	}
 
 
 	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
 	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
@@ -68,7 +68,7 @@ class Uncompress {
 	static function inflate_buffer( i : Inflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
 	static function inflate_buffer( i : Inflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
 		return false;
 		return false;
 	}
 	}
-	static function inflate_end( i : Inflater ) : Void { }
-	static function inflate_flush_mode( i : Inflater, flush : Int ) : Void {}
+	static function zip_end( i : Inflater ) : Void { }
+	static function zip_flush_mode( i : Inflater, flush : Int ) : Void {}
 
 
 }
 }