[pbs-devel] [PATCH v5 proxmox-widget-toolkit 28/28] file-browser: support pxar archive and fileref types

[Christian Ebner]

Covers cases for the special directory type archive and file
reference types as introduced by pxar format version 2.

Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
Changes since version 4:
- rebased to current master

Changes since version 3:
- no changes

Changes since version 2:
- not present in version 2

 src/Schema.js             |  2 ++
 src/window/FileBrowser.js | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Schema.js b/src/Schema.js
index e0f583a..b680f70 100644
--- a/src/Schema.js
+++ b/src/Schema.js
@@ -59,7 +59,9 @@ Ext.define('Proxmox.Schema', { // a singleton
 	b: { icon: 'cube', label: gettext('Block Device') },
 	c: { icon: 'tty', label: gettext('Character Device') },
 	d: { icon: 'folder-o', label: gettext('Directory') },
+	a: { icon: 'folder-o', label: gettext('Archive') },
 	f: { icon: 'file-text-o', label: gettext('File') },
+	r: { icon: 'file-text-o', label: gettext('FileRef') },
 	h: { icon: 'file-o', label: gettext('Hardlink') },
 	l: { icon: 'link', label: gettext('Softlink') },
 	p: { icon: 'exchange', label: gettext('Pipe/Fifo') },
diff --git a/src/window/FileBrowser.js b/src/window/FileBrowser.js
index e036d9f..4a288e6 100644
--- a/src/window/FileBrowser.js
+++ b/src/window/FileBrowser.js
@@ -8,7 +8,7 @@ Ext.define('proxmox-file-tree', {
 	    calculate: data => {
 		if (data.size === undefined) {
 		    return '';
-		} else if (false && data.type === 'd') { // eslint-disable-line no-constant-condition
+		} else if (false && (data.type === 'd' || data.type === 'a')) { // eslint-disable-line no-constant-condition
 		    // FIXME: enable again once we fixed trouble with confusing size vs item #
 		    let fs = data.size === 1 ? gettext('{0} Item') : gettext('{0} Items');
 		    return Ext.String.format(fs, data.size);
@@ -26,7 +26,7 @@ Ext.define('proxmox-file-tree', {
 	    name: 'iconCls',
 	    calculate: function(data) {
 		let icon = Proxmox.Schema.pxarFileTypes[data.type]?.icon ?? 'file-o';
-		if (data.expanded && data.type === 'd') {
+		if (data.expanded && (data.type === 'd' || data.type === 'a')) {
 		    icon = 'folder-open-o';
 		}
 		return `fa fa-${icon}`;
@@ -58,7 +58,9 @@ Ext.define("Proxmox.window.FileBrowser", {
 	downloadableFileTypes: {
 	    'h': true, // hardlinks
 	    'f': true, // "normal" files
+	    'r': true, // ref files
 	    'd': true, // directories
+	    'a': true, // archive
 	},
 
 	// prefix to prepend to downloaded file names
@@ -98,7 +100,7 @@ Ext.define("Proxmox.window.FileBrowser", {
 	    params.filepath = data.filepath;
 
 	    let filename = view.downloadPrefix + data.text;
-	    if (data.type === 'd') {
+	    if (data.type === 'd' || data.type === 'a') {
 		if (tar) {
 		    params.tar = 1;
 		    filename += ".tar.zst";
@@ -122,7 +124,7 @@ Ext.define("Proxmox.window.FileBrowser", {
 	    view.lookup('selectText').setText(st);
 
 	    let canDownload = view.downloadURL && view.downloadableFileTypes[data.type];
-	    let enableMenu = data.type === 'd';
+	    let enableMenu = data.type === 'd' || data.type === 'a';
 
 	    let downloadBtn = view.lookup('downloadBtn');
 	    downloadBtn.setDisabled(!canDownload || enableMenu);
@@ -201,6 +203,7 @@ Ext.define("Proxmox.window.FileBrowser", {
 	    });
 	    store.load((rec, op, success) => {
 		let root = store.getRoot();
+		console.log(root);
 		root.expand(); // always expand invisible root node
 		if (view.archive === 'all') {
 		    root.expandChildren(false);
@@ -269,6 +272,11 @@ Ext.define("Proxmox.window.FileBrowser", {
 			    } else if (a.data.type !== 'd' && b.data.type === 'd') {
 				return 1;
 			    }
+			    if (a.data.type === 'a' && b.data.type !== 'a') {
+				return -1;
+			    } else if (a.data.type !== 'a' && b.data.type === 'a') {
+				return 1;
+			    }
 
 			    let asize = a.data.size || 0;
 			    let bsize = b.data.size || 0;
-- 
2.39.2