FEAT: implemented QUERY/MODE for FILE, DIR, INPUT (console) and HTTP ports

Oldes · Oldes · commit c02753a66a82 · 2018-12-03T18:45:05.000+01:00
diff --git a/src/boot/sysobj.r b/src/boot/sysobj.r
@@ -255,8 +255,10 @@ standard: context [
 	]
 
 	console-info: context [
-		buffer-size: none
-		window-size: none
+		buffer-cols: none
+		buffer-rows: none
+		window-cols: none
+		window-rows: none
 	]
 
 	extension: context [
diff --git a/src/boot/words.r b/src/boot/words.r
@@ -216,3 +216,7 @@ unixtime-now
 unixtime-now-le
 random-bytes
 length?
+buffer-cols
+buffer-rows
+window-cols
+window-rows
diff --git a/src/core/c-frame.c b/src/core/c-frame.c
@@ -1162,6 +1162,24 @@
 	return NOT_FOUND;
 }
 
+/***********************************************************************
+**
+*/	REBSER* Get_Object_Words(REBVAL *object)
+/*
+**		Returns block of object's words converted to simple word (not set-word)
+**		Note:  used in query/mode function to return default modes
+**
+***********************************************************************/
+{
+	REBSER *prior = VAL_OBJ_WORDS(object);
+	REBSER *words = Copy_Block_Len(prior, 1, SERIES_TAIL(prior) - 1);
+	// convert set-words to just words:
+	REBVAL *word = BLK_HEAD(words);
+	for (; NOT_END(word); word++)
+		if (IS_SET_WORD(word)) SET_TYPE(word, REB_WORD);
+	return words;
+}
+
 
 /***********************************************************************
 **
diff --git a/src/core/p-console.c b/src/core/p-console.c
@@ -49,6 +49,8 @@
 	REBINT result;
 	REBVAL *arg = D_ARG(2);
 	REBSER *ser;
+	REBCNT args = 0;
+	REBVAL *spec;
 
 	Validate_Port(port, action);
 
@@ -129,13 +131,16 @@
 		return R_FALSE;
 
 	case A_QUERY:
-		if (OS_DO_DEVICE(req, RDC_QUERY) < 0) return R_NONE;
-		REBVAL *spec = Get_System(SYS_STANDARD, STD_CONSOLE_INFO);
+		spec = Get_System(SYS_STANDARD, STD_CONSOLE_INFO);
 		if (!IS_OBJECT(spec)) Trap_Arg(spec);
-		REBSER *obj = CLONE_OBJECT(VAL_OBJ_FRAME(spec));
-		SET_OBJECT(D_RET, obj);
-		SET_PAIR(OFV(obj, STD_CONSOLE_INFO_BUFFER_SIZE), req->console.buffer_cols, req->console.buffer_rows);
-		SET_PAIR(OFV(obj, STD_CONSOLE_INFO_WINDOW_SIZE), req->console.window_cols, req->console.window_rows);
+		args = Find_Refines(ds, ALL_QUERY_REFS);
+		if ((args & AM_QUERY_MODE) && IS_NONE(D_ARG(ARG_QUERY_FIELD))) {
+			Set_Block(D_RET, Get_Object_Words(spec));
+			return R_RET;
+		}
+		if (OS_DO_DEVICE(req, RDC_QUERY) < 0) return R_NONE;
+
+		Ret_Query_Console(req, D_RET, D_ARG(ARG_QUERY_FIELD), spec);
 		break;
 
 	default:
@@ -145,6 +150,55 @@
 	return R_RET;
 }
 
+/***********************************************************************
+**
+*/	static REBOOL Set_Console_Mode_Value(REBREQ *req, REBCNT mode, REBVAL *ret)
+/*
+**		Set a value with file data according specified mode
+**
+***********************************************************************/
+{
+	switch (mode) {
+	case SYM_BUFFER_COLS:
+		SET_INTEGER(ret, req->console.buffer_cols);
+		break;
+	case SYM_BUFFER_ROWS:
+		SET_INTEGER(ret, req->console.buffer_rows);
+		break;
+	case SYM_WINDOW_COLS:
+		SET_INTEGER(ret, req->console.window_cols);
+		break;
+	case SYM_WINDOW_ROWS:
+		SET_INTEGER(ret, req->console.window_rows);
+		break;
+	default:
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/***********************************************************************
+**
+*/	void Ret_Query_Console(REBREQ *req, REBVAL *ret, REBVAL *info, REBVAL *spec)
+/*
+**		Query file and set RET value to resulting STD_FILE_INFO object.
+**
+***********************************************************************/
+{
+	if (IS_WORD(info)) {
+		if (!Set_Console_Mode_Value(req, VAL_WORD_CANON(info), ret))
+			Trap1(RE_INVALID_ARG, info);
+	}
+	else {
+		REBSER *obj = CLONE_OBJECT(VAL_OBJ_FRAME(spec));
+		SET_INTEGER(OFV(obj, STD_CONSOLE_INFO_BUFFER_COLS), req->console.buffer_cols);
+		SET_INTEGER(OFV(obj, STD_CONSOLE_INFO_BUFFER_ROWS), req->console.buffer_rows);
+		SET_INTEGER(OFV(obj, STD_CONSOLE_INFO_WINDOW_COLS), req->console.window_cols);
+		SET_INTEGER(OFV(obj, STD_CONSOLE_INFO_WINDOW_ROWS), req->console.window_rows);
+		SET_OBJECT(ret, obj);
+	}
+}
+
 
 /***********************************************************************
 **
diff --git a/src/core/p-dir.c b/src/core/p-dir.c
@@ -331,10 +331,15 @@
 
 	case A_QUERY:
 		//Trap_Security(flags[POL_READ], POL_READ, path);
+		args = Find_Refines(ds, ALL_QUERY_REFS);
+		if ((args & AM_QUERY_MODE) && IS_NONE(D_ARG(ARG_QUERY_FIELD))) {
+			Ret_File_Modes(port, D_RET);
+			return R_RET;
+		}
 		SET_NONE(state);
 		Init_Dir_Path(&dir, path, -1, REMOVE_TAIL_SLASH | POL_READ);
 		if (OS_DO_DEVICE(&dir, RDC_QUERY) < 0) return R_NONE;
-		Ret_Query_File(port, &dir, D_RET);
+		Ret_Query_File(port, &dir, D_RET, D_ARG(ARG_QUERY_FIELD));
 		///OS_FREE(dir.file.path);
 		break;
 
diff --git a/src/core/p-file.c b/src/core/p-file.c
@@ -96,33 +96,68 @@
 	Set_Date(val, &dat);
 }
 
+/***********************************************************************
+**
+*/	static REBOOL Set_File_Mode_Value(REBREQ *file, REBCNT mode, REBVAL *ret)
+/*
+**		Set a value with file data according specified mode 
+**
+***********************************************************************/
+{
+	switch (mode) {
+	case SYM_SIZE:
+		SET_INTEGER(ret, file->file.size);
+		break;
+	case SYM_TYPE:
+		Init_Word(ret, GET_FLAG(file->modes, RFM_DIR) ? SYM_DIR : SYM_FILE);
+		break;
+	case SYM_DATE:
+		Set_File_Date(file, ret);
+		break;
+	case SYM_NAME:
+		Set_Series(REB_FILE, ret, To_REBOL_Path(file->file.path, 0, OS_WIDE, 0));
+		break;
+	default:
+		return FALSE;
+	}
+	return TRUE;
+}
 
 /***********************************************************************
 **
-*/	void Ret_Query_File(REBSER *port, REBREQ *file, REBVAL *ret)
+*/	void Ret_Query_File(REBSER *port, REBREQ *file, REBVAL *ret, REBVAL *info)
 /*
 **		Query file and set RET value to resulting STD_FILE_INFO object.
 **
 ***********************************************************************/
 {
-	REBVAL *info = In_Object(port, STD_PORT_SCHEME, STD_SCHEME_INFO, 0);
 	REBSER *obj;
-	REBSER *ser;
 
-	if (!info || !IS_OBJECT(info)) Trap_Port(RE_INVALID_SPEC, port, -10);
-
-	obj = CLONE_OBJECT(VAL_OBJ_FRAME(info));
-
-	SET_OBJECT(ret, obj);
-	Init_Word(OFV(obj, STD_FILE_INFO_TYPE), GET_FLAG(file->modes, RFM_DIR) ? SYM_DIR : SYM_FILE);
-	SET_INTEGER(OFV(obj, STD_FILE_INFO_SIZE), file->file.size);
-	Set_File_Date(file, OFV(obj, STD_FILE_INFO_DATE));
-
-	ser = To_REBOL_Path(file->file.path, 0, OS_WIDE, 0);
-
-	Set_Series(REB_FILE, OFV(obj, STD_FILE_INFO_NAME), ser);
+	if ( IS_WORD(info) ) {
+		if(!Set_File_Mode_Value(file, VAL_WORD_CANON(info), ret))
+			Trap1(RE_INVALID_ARG, info);
+	} else {
+		info = In_Object(port, STD_PORT_SCHEME, STD_SCHEME_INFO, 0);
+		if (!info || !IS_OBJECT(info)) Trap_Port(RE_INVALID_SPEC, port, -10);
+		obj = CLONE_OBJECT(VAL_OBJ_FRAME(info));
+		Set_File_Mode_Value(file, SYM_TYPE, OFV(obj, STD_FILE_INFO_TYPE));
+		Set_File_Mode_Value(file, SYM_SIZE, OFV(obj, STD_FILE_INFO_SIZE));
+		Set_File_Mode_Value(file, SYM_DATE, OFV(obj, STD_FILE_INFO_DATE));
+		Set_File_Mode_Value(file, SYM_NAME, OFV(obj, STD_FILE_INFO_NAME));
+		SET_OBJECT(ret, obj);
+	}
 }
 
+/***********************************************************************
+**
+*/	void Ret_File_Modes(REBSER *port, REBVAL *ret)
+/*
+**		Sets value with block of possible file mode names
+**
+***********************************************************************/
+{
+	Set_Block(ret, Get_Object_Words(In_Object(port, STD_PORT_SCHEME, STD_SCHEME_INFO, 0)));
+}
 
 /***********************************************************************
 **
@@ -461,11 +496,16 @@ REBINT Mode_Syms[] = {
 		break;
 
 	case A_QUERY:
+		args = Find_Refines(ds, ALL_QUERY_REFS);
+		if ((args & AM_QUERY_MODE) && IS_NONE(D_ARG(ARG_QUERY_FIELD))) {
+			Ret_File_Modes(port, D_RET);
+			return R_RET;
+		}
 		if (!IS_OPEN(file)) {
 			Setup_File(file, 0, path);
 			if (OS_DO_DEVICE(file, RDC_QUERY) < 0) return R_NONE;
 		}
-		Ret_Query_File(port, file, D_RET);
+		Ret_Query_File(port, file, D_RET, D_ARG(ARG_QUERY_FIELD));
 		// !!! free file path?
 		break;
 
@@ -476,7 +516,6 @@ REBINT Mode_Syms[] = {
 			if (OS_DO_DEVICE(file, RDC_MODIFY) < 0) return R_NONE;
 		}
 		return R_TRUE;
-		break;
 
 	case A_INDEXQ:
 		SET_INTEGER(D_RET, file->file.index + 1);
@@ -535,7 +574,6 @@ REBINT Mode_Syms[] = {
 		A_REMOVE,				// 52
 		A_CHANGE,				// 53
 		A_POKE,					// 54
-		A_QUERY,				// 64
 		A_FLUSH,				// 65
 	*/
 
diff --git a/src/mezz/base-files.r b/src/mezz/base-files.r
@@ -20,27 +20,21 @@ exists?: func [
 	{Determines if a file or URL exists.}
 	target [file! url!]
 ][
-	to logic! query target
+	not none? query/mode target 'type
 ]
 
 size?: func [
 	{Returns the size of a file.}
 	target [file! url!]
 ][
-	all [
-		target: attempt [query target]
-		target/size
-	]
+	query/mode target 'size
 ]
 
 modified?: func [
 	{Returns the last modified date of a file.}
 	target [file! url!]
 ][
-	all [
-		target: attempt [query target]
-		target/date
-	]
+	query/mode target 'date
 ]
 
 suffix?: func [
diff --git a/src/mezz/mezz-help.r b/src/mezz/mezz-help.r
@@ -178,11 +178,10 @@ import module [
 		'word [any-type!]
 		/into "Help text will be inserted into provided string instead of printed"
 			string [string!] "Returned series will be past the insertion"
-		/local value spec args refs rets type ret desc arg def des tmp
+		/local value spec args refs rets type ret desc arg def des ref
 	][
 		try [
-			tmp: query system/ports/input
-			max-desc-width: tmp/window-size/x - 36
+			max-desc-width: (query/mode system/ports/input 'buffer-cols) - 36
 		]
 		buffer: any [string  make string! 1024]
 		catch [
@@ -278,8 +277,8 @@ import module [
 						output "^/^/^[[4;1;36mREFINEMENTS^[[m:"
 						parse back refs [
 							any [
-								set tmp refinement! (output ajoin ["^/     ^[[1;32m" pad mold tmp 14 "^[[m"])
-								opt [set tmp string! (output tmp)]
+								set ref refinement! (output ajoin ["^/     ^[[1;32m" pad mold ref 14 "^[[m"])
+								opt [set des string! (output des)]
 								any [
 									set arg [word! | lit-word! | get-word!] 
 									set def opt block! 
diff --git a/src/mezz/prot-http.r b/src/mezz/prot-http.r
@@ -646,11 +646,12 @@ sys/make-scheme [
 		]
 		query: func [
 			port [port!]
+			/mode
+			field [word! none!]
 			/local error state
 		] [
-			either port/state [
-				state: port/state
-			][
+			if all [mode none? field] [ return words-of system/standard/file-info]
+			if none? state: port/state [
 				open port ;there is port opening in sync-op, but it would also close the port later and so clear the state
 				attempt [sync-op port [parse-write-dialect port [HEAD]]]
 				state: port/state
@@ -659,9 +660,11 @@ sys/make-scheme [
 			;?? state
 			either all [
 				state
-				find [ok redirect] state/info/response-parsed
+				state/info/response-parsed
 			][
-				state/info
+				either field [
+					select state/info field
+				][	state/info ]
 			][	none ]
 		]
 		length?: func [
diff --git a/src/tests/units/port-test.r3 b/src/tests/units/port-test.r3
diff --git a/src/tools/make-headers.r b/src/tools/make-headers.r

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,10 @@ standard: context [`
`255`	`255`	`]`
`256`	`256`
`257`	`257`	`console-info: context [`
`258`		`- buffer-size: none`
`259`		`- window-size: none`
	`258`	`+ buffer-cols: none`
	`259`	`+ buffer-rows: none`
	`260`	`+ window-cols: none`
	`261`	`+ window-rows: none`
`260`	`262`	`]`
`261`	`263`
`262`	`264`	`extension: context [`