aview-app 1.0.2

package/aardio/lib/fsys/time.aardio

@@ -0,0 +1,149 @@
+//time FILETIME结构
+import util.metaProperty;
+namespace fsys;
+
+class time{
+	ctor(fileTime,format){
+		if(type(fileTime)=="string") format,fileTime = fileTime;
+		
+		this = ::FILETIME();
+		this.format = format || "!%c";
+		
+		if(fileTime!==null){ 
+			var t = type(fileTime);
+			if(t=="table") ..table.assign(this,fileTime);
+			else ..raw.convert({LONG ftm = fileTime},this);
+		
+			if(format) this.format = format;
+		}
+	}; 
+	@_metaProperty;
+}
+
+namespace time{
+	_metaProperty = ..util.metaProperty(
+		toGmtTime = function(){
+			var tm = ..time.gmt();
+			if( (owner.dwLowDateTime===null) && (owner.dwHighDateTime===null) ) return  tm;
+			var ok,tm = FileTimeToSystemTime(owner,tm );
+			if(ok) return tm;
+		};
+		toSystemTime = function(){
+			var tm = ..time( ,owner.format)
+			if( (owner.dwLowDateTime===null) && (owner.dwHighDateTime===null) ) return  tm;
+			var ok,tm = FileTimeToSystemTime(owner,tm );
+			if(ok)return tm;
+		};
+		fromSystemTime = function(tm){
+			if( tm === null) tm = ..time(,owner.format);
+			if( !..time.istime(tm) ) error("不是合法的time对象",2)
+			owner.format = tm.format;
+			if( SystemTimeToFileTime(tm,owner) ) return owner;
+		}; 
+		toDosTime = function(){
+			if( (owner.dwLowDateTime===null) && (owner.dwHighDateTime===null) ) return 0,0;
+			var ok,fatDate,fatTime = FileTimeToDosDateTime(owner,0,0);
+			if(ok)return (fatDate << 16)|fatTime,fatDate,fatTime;
+		};
+		fromDosTime = function(fatDate,fatTime){
+			if(!fatTime){
+				var dosDate = fatDate;
+				fatDate = ( dosDate >>> 16 ) & 0xFFFF
+				fatTime = dosDate & 0xFFFF
+			};
+
+			if( DosDateTimeToFileTime(fatDate,fatTime,owner) ) return owner;
+		};
+		copy = function(){
+			var tm = ..fsys.time(,owner.format);
+			tm.dwLowDateTime = owner.dwLowDateTime;
+			tm.dwHighDateTime = owner.dwHighDateTime;
+			return tm;
+		};
+		local = function(copy){
+			if(owner.format[1]!='!'#){
+				if(!copy) return owner;
+				return owner.copy();
+			}
+			
+			var tm = ..fsys.time(,"%c");
+			FileTimeToLocalFileTime(owner,tm);
+			if( copy ){
+				return tm;
+			}
+			else {
+				owner.dwLowDateTime = tm.dwLowDateTime
+				owner.dwHighDateTime = tm.dwHighDateTime
+				owner.format = "%c";
+				return owner;
+			} 
+		};
+		utc = function(copy){
+			if(owner.format[1]=='!'#){
+				if(!copy) return owner;
+				return owner.copy();
+			}
+			
+			var tm = ..fsys.time(,"!%c");
+			LocalFileTimeToFileTime(owner,tm);
+			if( copy ){
+				return tm;
+			}
+			else {
+				owner.dwLowDateTime = tm.dwLowDateTime
+				owner.dwHighDateTime = tm.dwHighDateTime
+				owner.format = "!%c";
+				return owner;
+			} 
+		}; 
+		now = function(){
+			::Kernel32.GetSystemTimeAsFileTime(owner);
+			return owner;
+		};
+		stamp = function(str){
+			var t = owner.size64() / 10000 - 11644473600000
+			if(str) return tostring(t);
+			return tonumber(t);
+		};
+		size64 = function(){
+			return ..raw.convert(owner,{LONG ftm = ..math.size64()}).ftm;
+		} 
+		_tostring = function(...){
+			return tostring( owner.toSystemTime(),... );
+		} 
+		_tonumber = function(){
+			return ..raw.convert(owner,{LONG ftm}).ftm;
+		} 
+	) 
+	
+	FileTimeToSystemTime = ::Kernel32.api("FileTimeToSystemTime","bool(struct filetime,struct& time)")
+	SystemTimeToFileTime = ::Kernel32.api("SystemTimeToFileTime","bool(struct tm,struct& filetime)")  
+	DosDateTimeToFileTime = ::Kernel32.api("DosDateTimeToFileTime","bool(WORD wFatDate,WORD wFatTime,struct &fileTime)") 
+    FileTimeToDosDateTime = ::Kernel32.api("FileTimeToDosDateTime","bool(struct fileTime,WORD &wFatDate,WORD &wFatTime)")  
+	FileTimeToLocalFileTime = ::Kernel32.api("FileTimeToLocalFileTime","bool(struct ftm,struct &ftmLocal)")  
+	LocalFileTimeToFileTime = ::Kernel32.api("LocalFileTimeToFileTime","bool(struct ftmLocal,struct &ftm)")  
+}
+
+/**intellisense()
+fsys.time = 与 ::FILETIME 兼容的结构体，扩展了更多函数。\n用于存储自 1601年1月1日 开始以 100纳秒 为间隔的数值。\n100纳秒 也就是 0.0001毫秒
+fsys.time( = 创建 ::FILETIME 兼容结构体。\n\nfsys.time 对象可传入 tostring 转换为文本格式时间，\n可转换为文本的时间范围与 time 对象相同。\n\nfsys.time 对象传入 tonumber 函数返回存储 64 位无符号时间值的浮点数。\n使用 size64 函数可得到 64位 无符号数表示的时间值。\n该时间值为自 1601年1月1日 开始以 100纳秒 为间隔的数值
+fsys.time(.(fileTime,format) = 创建 FILETIME 结构\n\n@fileTime 参数可选传入以下类型参数：\n1、省略，null 值，注意这不会导致初始化为当前时间。\n2、::FILETIME 结构体或结构体的部分字段\n3、需要复制的 fsys.time 对象\n4、普通数值，应为存储 64位 无符号时间值的浮点数。\n5、存储无符号 64 位整数的 math.size64 对象\n此 64 位整数表示自 1601年1月1日 开始以 100纳秒 为间隔的时间值。\n\n可选用 @format 参数指定格式化串，语法与 time 对象相同。\n注意 format 首字符为 "!" 表示存储 UTC 时间。\n默认使用 UTC 时间格式 "!%c"
+fsys.time() = !fsys_time.
+!fsys_time.dwLowDateTime = 时间值低位
+!fsys_time.dwHighDateTime = 时间值高位
+!fsys_time.format = 格式化串，语法与 time 对象相同
+!fsys_time.copy() = 复制对象
+!fsys_time.local() = UTC 时间转换为本地时间,返回自身
+!fsys_time.local(true) = UTC 时间转换为本地时间,\n不修改自身,返回本地时间副本
+!fsys_time.utc() = 本地时间转换为 UTC 时间,返回自身
+!fsys_time.utc(true) = 本地时间转换为 UTC 时间,\n不修改自身,返回本地时间副本
+!fsys_time.toGmtTime() = 返回 time.gmt 对象。\n即 RFC1123 格式时间，HTTP 协议使用该格式。\n如果对象的时间值为 null，此函数会返回当前时间。\n!time.
+!fsys_time.toSystemTime() = 返回 time 对象。\n如果对象的时间值为 null，此函数会返回当前时间。\n!time.
+!fsys_time.fromSystemTime(.(time对象) = 标准时间对象转换为 FILETIME 对象\n省略参数则调用 time.now 函数获取当前时间\n!fsys_time.
+!fsys_time.toDosTime() = 成功返回 dosTime,高位,低位
+!fsys_time.fromDosTime(.(fatDate,fatTime) = DOS 时间格式转换为 FILETIME 格式\n如果省略第二个参数,则取第一个参数的高位作为参数二
+!fsys_time.size64() = 转换为存储无符号 64 位整数的 math.size64 对象。\n此整数表示自 1601年1月1日 开始以 100纳秒 为间隔的时间值
+!fsys_time.now() = 获取当前时间，返回自身。\n!fsys_time.
+!fsys_time.stamp() = 以数值类型返回 Unix 时间戳，以毫秒为单位。\n时间戳 0 表示 ISO8601 时间 1970-01-01T00:00:00Z
+!fsys_time.stamp(true) = 以字符串类型返回 Unix 时间戳，以毫秒为单位。\n时间戳 0 表示 ISO8601 时间 1970-01-01T00:00:00Z
+end intellisense**/

package/aardio/lib/fsys/untar.aardio

@@ -0,0 +1,190 @@
+//untar TAR格式解压
+import zlib;
+import fsys;
+import fsys.file;
+import fsys.time;
+namespace fsys;
+
+class untar{
+
+	ctor( path,saveDir  ){
+		var tarFile;
+		if(type(path)!="string" && type(path.size) == "function"){
+			tarFile = path;
+			if( ! (saveDir?..fsys.createDir(saveDir) ) ) return null,"错误的存储目录";
+		}
+		else{
+			var path = ..io.exist(path);
+			if(!path) return null,"错误的tar文件路径";
+			
+			if(!saveDir)saveDir = ..string.match(path,"(.*\\\w+)\.[\w.]+$");
+			if( ! (saveDir?..fsys.createDir(saveDir) ) ) return null,"错误的存储目录";
+			
+				
+			if( ..string.match(path,"<.gz>|<.tgz>$") ){
+				tarFile = ..zlib.gzFile(path,"rb")
+			}
+			else {
+				tarFile = ..io.open(path,"rb")
+			}
+			if(!tarFile) return null,"打开tar文件失败";
+		}
+
+		{
+			var size = tarFile.size(1);
+			if( size < 0 ) size = 0xFFFFFFFF;
+			this.blocksCount = ( size / 512 ) - 1;
+			if( this.blocksCount < 1 ) return null,"tar文件格式错误";
+		}
+		
+		var curFileName,curFile;
+		var curFileSize = 0;
+		var curFileTime = ..fsys.time()
+		
+		var tarHeader = tar_header();
+		var buffer = ..raw.buffer(512);
+		
+		this.utf8 = false;
+		..table.gc(this,"close");
+	};
+	nextBlock = function(){
+		if( curFileSize <= 0){
+			if( curFile ) curFile.close(); 
+			if( ! tarFile.read( tarHeader ) ){
+				return null,"读取TAR头失败";
+			}
+			
+			var name =  ..string.str(tarHeader.name);
+			if( !#name ){ 
+				this.complete = true;
+				return;//last block
+			}
+			this.complete = false;
+			
+			if( this.utf8 === false ){
+				name = ..string.fromto(name,0,65001);
+			}
+			elseif( this.utf8 !== true ) {
+				if( !..string.len(name) ){
+					name = ..string.fromto(name,0,65001);
+				}
+			}
+			
+			tarHeader.name = name;
+			curFileName = ..fsys.joinpath(saveDir,name); 
+			curFileSize = tonumber(tarHeader.size,8)  
+			
+			var linkflag = tarHeader.linkflag;
+			var mtime = tonumber(tarHeader.mtime,8) 
+			curFileTime.fromSystemTime( ..time(mtime) );
+			curFileTime.utc()
+
+			if( linkflag == '5'#/*LF_DIR*/ ){
+				..fsys.createDir(curFileName);  
+				if( this.onProgressFolder ){
+					this.onProgressFolder(name);
+				}
+				return curFileName,0;
+			}
+			if( this.onProgressFile ){
+				this.onProgressFile(name);
+			}
+			
+			if( curFileSize == 0 ){
+				return curFileName,0;
+			}  
+			..fsys.createParentDir( curFileName ); 
+			
+			curFile = ..fsys.file(curFileName,"w+b"); 
+			if(!curFile) return null,"写入文件失败:" + name;
+			
+			curFile.setFileTime( creation = curFileTime ;access = curFileTime ;write = curFileTime);
+			return curFileName,0,curFileSize;
+		}
+		 
+		var writeSize = ..math.min(512,curFileSize )  
+		tarFile.readBuffer(buffer,512);
+		curFile.writeBuffer( buffer,writeSize );
+		 
+		curFileSize = curFileSize - writeSize; 
+		return curFileName,writeSize,curFileSize;
+	} 
+	eachBlock = function(posRange){
+		if(!posRange) return this.nextBlock;
+		
+		var processed = 0;
+		var step = this.blocksCount / posRange;
+		var posOld,posNew;
+		
+		this.lastError = null;
+		var nextBlock; 
+		nextBlock = function(){
+			var fileName,writeSize,remainSize = this.nextBlock();
+			if(fileName) {
+				processed++;
+				
+				posNew = ..math.floor(processed / step);
+				if( posNew != posOld ){
+					posOld = posNew
+					return fileName,writeSize,remainSize,posNew
+				}
+				
+				return nextBlock();
+			}
+			else {
+				this.lastError = writeSize;
+			}
+		}
+		return nextBlock;
+	} 
+	close = function(){
+		if( tarFile ){
+			tarFile.close();
+			tarFile = null;
+			return this.complete;
+		}
+	}
+}
+
+namespace untar {
+
+	class tar_header {
+		byte name[100];
+		byte mode[8];
+		byte uid[8];
+		byte gid[8];
+		byte size[12];
+		byte mtime[12];
+		byte chksum[8];
+		byte linkflag;
+		byte linkname[100];
+		byte magic[8];
+		byte uname[32];
+		byte gname[32];
+		byte devmajor[8];
+		byte devminor[8];
+		byte prefix[155];
+		byte data[12]
+	}
+}
+
+/**intellisense()
+fsys.untar = tar文件操作
+fsys.untar(.("tar文件路径",存储路径) = 参数@1可以是 *.tar, *.tar.gz, *.tgz 类型文件路径,\n参数 @1 也可以指定 fsys.stream 或 fsys.file,io.file 等文件对象,\n如果参数@1为文件路径,则参数@2为可选参数
+fsys.untar() = !fsys_untarfile.
+!fsys_untarfile.utf8 = 是否使用UTF8编码文件名\n默认值为false，表示ansi多字节编码\n设为true表示使用utf8编码,\n设为null则自动检测，因为tar格式并不支持编码声明,所以可能出现文件名乱码
+!fsys_untarfile.blocksCount = 数据块总数,\n仅供进度条使用的估算值
+!fsys_untarfile.onProgressFolder = @.onProgressFolder = function(path){
+	__/*正在创建目录*/
+}
+!fsys_untarfile.onProgressFile = @.onProgressFile = function(path){
+	__/*正在创建文件*/
+}
+!fsys_untarfile.nextBlock() = 释放下一个块,\n成功返回文件名,释放大小,\n同一文件可能需要释放多个文件块
+!fsys_untarfile.eachBlock(posRange) = @for(fileName,writeSize,remainSize,pos in ??.eachBlock() ){
+	 __/*循环展开所有文件块,\n文件块较多时指定posRange参数可以减少循环次数以优化性能\nposRange参数可选指定一个表示进度上限的数值,\n指定posRange参数则返回值pos表示当前进度*/
+} 
+!fsys_untarfile.close() = 关闭文件,\n如果解包完成返回true
+!fsys_untarfile.lastError = 调用eachBlock解包时，可使用lastError获取错误信息
+!fsys_untarfile.complete = 所有文件是否解包完成
+end intellisense**/

package/aardio/lib/fsys/update/app.aardio

@@ -0,0 +1,171 @@
+//app 执行更新程序
+import thread.command;
+import web.json;
+
+namespace fsys.update;
+
+class app {
+	ctor(srcDir,dstDir,reusable,removable){ 
+		this = ..thread.command(); 
+		this[["apply"]] = function(){
+			if(removable === null){removable = true;}
+			..thread.invoke( apply ,this._form.hwnd,srcDir,dstDir,reusable,removable );
+		}; 
+		
+		var updateInfo = ..string.load( ..fsys.joinpath(srcDir,"update-info") );
+		if(updateInfo){
+			this[["updateInfo"]] = ..web.json.tryParse(updateInfo);
+		};
+	};
+}
+
+namespace app{
+
+	apply = function(hCmd,srcDir,dstDir,reusable,removable){
+		import fsys;
+		import process.file;
+		import thread.command;
+		
+		var send = ..thread.command.send;
+		var sendIdle = ..thread.command.sendIdle;
+		
+		var srcFilesDir = ..fsys.joinpath(srcDir,"files");
+		var filesPath = ..fsys.joinpath(srcDir,"update-files");
+		var foldersPath = ..fsys.joinpath(srcDir,"folders");
+		
+		if( !..io.exist(srcFilesDir) ){
+			send(hCmd,"onError","错误的更新源目录",srcFilesDir);
+		 	return;
+		}
+		if( !..io.exist(filesPath,4) ){
+			send(hCmd,"onError","错误的更新文件列表",filesPath);
+		 	return;
+		}
+		if( !..io.exist(foldersPath,4) ){
+			send(hCmd,"onError","错误的更新目录列表",foldersPath);
+		 	return;
+		} 
+		if( !..io.exist(dstDir) ){
+			send(hCmd,"onError","错误的更新目标程序目录",dstDir);
+		 	return;
+		}
+		
+		//创建所有目录
+		for path in io.lines(foldersPath) { 
+			var path = ..fsys.joinpath(dstDir,path);
+			..fsys.createDir(path);
+		} 
+		
+		var totalFiles = 0;
+		for path in ..io.lines(filesPath) { 
+			totalFiles++;
+		}
+		 
+		var exes = {}; 
+		for( path,prcs in ..process.file.each(dstDir) ){
+			..table.push( exes,path );
+		}
+		if( #exes ) if( send(hCmd,"onProcessCheck",exes ) === false ) {
+			send(hCmd,"onEnd",false );
+			return true; 
+		}
+			
+		var count = 0;
+		var srcPath,dstPath;
+		
+		send(hCmd,"onCopyBegin",totalFiles)
+		for path in ..io.lines(filesPath) {  
+			srcPath = ..fsys.joinpath(srcFilesDir,path);
+			dstPath = ..fsys.joinpath(dstDir,path);
+			
+			count++;
+			if( sendIdle(1000,hCmd,"onCopyFile",path,count) === false ) {
+				send(hCmd,"onEnd",false );
+				return true;
+			}
+			while( !  ..fsys.copy(srcPath,dstPath) ){
+				if( ..io.exist(dstPath) ){
+					if( ..process.isExe(dstPath) ){
+						if( send(hCmd,"onProcessFailed", { dstPath } ) === false ) {
+							send(hCmd,"onEnd",false );
+							return true;
+						} 
+						sleep(1);
+						
+						if( ..fsys.copy(srcPath,dstPath)  ) break;
+						sleep(1000);
+						continue;
+					}
+				}
+			
+				if( send(hCmd,"onCopyFailed",dstPath ) === false ) {
+					send(hCmd,"onEnd",false );
+					return true; 
+				}
+				sleep(1000);
+			}
+		}
+		
+		var checksumPath = ..fsys.joinpath(srcDir,"checksum");
+		var logPath = ..fsys.joinpath(srcDir,"log-files");
+		var crc32,uncompressedSize,size,path;
+		if( ..io.exist(logPath) && ..io.exist(checksumPath) ){
+			
+			var validcrc32 = {}
+			for line in ..io.lines(checksumPath) { 
+				crc32,uncompressedSize,size,path = ..string.match(line,"(.+?)\|(.+?)\|(.+?)\|(.+)"); 
+				validcrc32[path] = crc32;
+			}
+			
+			if(removable){
+				for line in ..io.lines(logPath) { 
+					crc32,uncompressedSize,size,path = ..string.match(line,"(.+?)\|(.+?)\|(.+?)\|(.+)"); 
+					if( validcrc32[path]===null ){
+						..fsys.delete( ..fsys.joinpath(dstDir,path)  );
+					}
+				}	
+			}
+			
+			..fsys.delete(logPath);
+		}
+		fsys.move(checksumPath,logPath);
+		 
+		if( !reusable ){
+			..fsys.delete(srcFilesDir);
+			..fsys.delete(filesPath);
+			..fsys.delete(foldersPath);
+			..fsys.delete(..fsys.joinpath(srcDir,"update-info"));
+		}
+		send(hCmd,"onEnd",true)
+	}
+}
+
+/**intellisense()
+fsys.update.app = 执行更新程序
+fsys.update.app(.(更新源,目标目录,是否保留更新补丁,是否允许移除文件) = 创建更新程序,\n如果参数@3为true，则更新后不删除源补丁\n如果参数@4指定为false，则更新时不删除在新版补丁中已移除的旧版本文件。
+fsys.update.app() = !fsys_update_app.
+!fsys_update_app.updateInfo.version = 更新的软件版本号
+!fsys_update_app.updateInfo.description = 更新说明
+!fsys_update_app.apply() = 创建更新线程,安装更新
+!fsys_update_app.onError = @.onError = function(err,filename){
+	io.print("更新遇到错误:",err,filename__/*导致错误的文件路径或URL\n该值可能为空*/ )
+}
+!fsys_update_app.onCopyBegin = @.onCopyBegin = function(total){
+	 __/*开始复制文件*/
+}
+!fsys_update_app.onCopyFile = @.onCopyFile = function(path,count){
+	 __/*开始复制参数@1指定的文件,返回false取消更新*/
+}
+!fsys_update_app.onProcessCheck = @.onProcessCheck = function(paths){
+	 __/*参数是更新程序所在目录下已运行的进程路径,\n返回false取消更新*/
+}
+!fsys_update_app.onProcessFailed = @.onProcessFailed = function(paths){
+	 __/*更新程序需要退出进程,\n参数是程序启动路径数组\n返回false取消更新*/
+}
+!fsys_update_app.onCopyFailed = @.onCopyFailed = function(path){
+	 __/*文件被占用,返回false取消更新*/
+}
+!fsys_update_app.onEnd = @.onEnd = function(succeeded){
+	 __/*更新操作已全部完成*/
+}
+end intellisense**/