Merge branch 'update-v4-dirs'

* update-v4-dirs:
  put url in the title until board info is fully loaded
  change log message
  hide .Trash-1000 as a system file
  replace ".board_locked #file_list" with "#file_list.dir_locked"
  start reading writable property per directory

Author: Neradoc

assets/backends/web.js

@@ -9,9 +9,9 @@ import * as tools from "../lib/tools.js"
 import * as mdns from "../lib/mdns.js"
 
 class WebResponse extends WorkflowResponse {
-	constructor(response, content, ok=null) {
+	constructor(response, content, ok=null, properties=null) {
 		if(ok===null) ok = response.ok
-		super(ok, content, response.status, response.statusText)
+		super(ok, content, response.status, response.statusText, properties)
 	}
 }
 
@@ -172,13 +172,15 @@ class WebWorkflow extends WorkflowWithCredentials {
 		)
 		try {
 			var data = await response.json()
+			var properties = {}
 			if(this.api_version > 3 && "files" in data ) {
 				var files = data["files"]
 				var file_list = files.map((d) => new WebWorkflowFile(d))
+				properties = data
 			} else {
 				var file_list = data.map((d) => new WebWorkflowFile(d))
 			}
-			return new WebResponse(response, file_list)
+			return new WebResponse(response, file_list, null, properties)
 		} catch {
 			return new WebResponse(response, [], false)
 		}

assets/backends/workflow_base.js

@@ -4,11 +4,16 @@ SPDX-License-Identifier: MIT
 */
 
 class WorkflowResponse {
-	constructor(ok, content, status=200, statusText="OK") {
+	constructor(ok, content, status=200, statusText="OK", properties=null) {
 		this.ok = ok
 		this.status = status
 		this.statusText = statusText
 		this.content = content
+		if(properties) {
+			this.properties = properties
+		} else {
+			this.properties = {}
+		}
 		// have text and json ?
 		// rename json to array/dict ?
 	}

assets/main/board_page.css

@@ -247,12 +247,20 @@ tr.odd { background: var(--color-pair1); }
 #file_list td .view { display: none; }
 #file_list td .pencil { display: none; }
 #file_list td:hover .pencil { display: inline; }
+
+/* 
 .board_locked #file_list td:hover .view { display: inline; }
 .board_locked #file_list td .pencil { display: none; }
-
 .board_locked #file_list .icon_locked { display: inline; }
 .board_locked #file_list td .delete { display: none; }
 .board_locked #file_list td .rename { display: none; }
+ */
+
+#file_list.dir_locked td:hover .view { display: inline; }
+#file_list.dir_locked td .pencil { display: none; }
+#file_list.dir_locked .icon_locked { display: inline; }
+#file_list.dir_locked td .delete { display: none; }
+#file_list.dir_locked td .rename { display: none; }
 
 #file_list .triangle {
 	cursor: pointer;

assets/main/board_page.js

@@ -41,7 +41,7 @@ async function start_circup() {
 			console.log("No CP version found, assume latest ?")
 			cpver = [8, 0, 0]
 		}
-		console.log("CP version found is ", cpver)
+		console.log("Using CP version:", cpver)
 		// 2 - setup the library bundle with the version from the board
 		// init circup with the CP version
 		if(common.is_electron) {
@@ -472,6 +472,7 @@ async function init_page() {
 	board_control = common.board_control
 	await board_control.start()
 	window.board_url = await board_control.get_board_url()
+	$("title").html(`${window.board_url}`)
 	var vinfo = await board_control.device_info()
 	var workflow_type = board_control.type
 	is_editable = await board_control.is_editable()

assets/main/common.js

@@ -12,6 +12,7 @@ export const DEFAULT_SYSTEM_FILES = [
 	".fseventsd",
 	".metadata_never_index",
 	".Trashes",
+	".Trash-1000",
 	".TemporaryItems",
 	"System Volume Information",
 ]

assets/main/list_directory.js

@@ -89,6 +89,14 @@ async function insert_files_list(current_list_path, list_depth="") {
 	var new_children = []
 	var template = $('#file_list_template')
 
+	if("writable" in response.properties) {
+		if(! response.properties["writable"]) {
+			$("#file_list").addClass("dir_locked")
+		}
+	} else if($("body").hasClass("board_locked")) {
+		$("#file_list").addClass("dir_locked")
+	}
+
 	var link = $("#file_list .go_back_up")
 	if (current_list_path != "/") {
 		if(list_depth == "") {