From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v5 proxmox-widget-toolkit 28/28] file-browser: support pxar archive and fileref types
Date: Wed, 15 Nov 2023 16:48:13 +0100 [thread overview]
Message-ID: <20231115154813.281564-29-c.ebner@proxmox.com> (raw)
In-Reply-To: <20231115154813.281564-1-c.ebner@proxmox.com>
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@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
prev parent reply other threads:[~2023-11-15 15:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 15:47 [pbs-devel] [PATCH-SERIES v5 pxar proxmox-backup proxmox-widget-toolkit 00/28] fix #3174: improve file-level backup Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 1/28] fix #3174: decoder: factor out skip_bytes from skip_entry Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 2/28] fix #3174: decoder: impl skip_bytes for sync dec Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 3/28] fix #3174: encoder: calc filename + metadata byte size Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 4/28] fix #3174: enc/dec: impl PXAR_APPENDIX_REF entrytype Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 5/28] fix #3174: enc/dec: impl PXAR_APPENDIX entrytype Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 6/28] fix #3174: encoder: helper to add to encoder position Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 7/28] fix #3174: enc/dec: impl PXAR_APPENDIX_TAIL entrytype Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 pxar 8/28] fix #3174: enc/dec: introduce pxar format version 2 Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 09/28] fix #3174: index: add fn index list from start/end-offsets Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 10/28] fix #3174: index: add fn digest for DynamicEntry Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 11/28] fix #3174: api: double catalog upload size Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 12/28] fix #3174: catalog: introduce extended format v2 Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 13/28] fix #3174: archiver/extractor: impl appendix ref Christian Ebner
2023-11-15 15:47 ` [pbs-devel] [PATCH v5 proxmox-backup 14/28] fix #3174: catalog: add specialized Archive entry Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 15/28] fix #3174: extractor: impl seq restore from appendix Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 16/28] fix #3174: archiver: store ref to previous backup Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 17/28] fix #3174: upload stream: impl reused chunk injector Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 18/28] fix #3174: chunker: add forced boundaries Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 19/28] fix #3174: backup writer: inject queued chunk in upload steam Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 20/28] fix #3174: archiver: reuse files with unchanged metadata Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 21/28] fix #3174: specs: add backup detection mode specification Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 22/28] fix #3174: client: Add detection mode to backup creation Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 23/28] test-suite: add detection mode change benchmark Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 24/28] test-suite: Add bin to deb, add shell completions Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 25/28] catalog: fetch offset and size for files and refs Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 26/28] pxar: add heuristic to reduce reused chunk fragmentation Christian Ebner
2023-11-15 15:48 ` [pbs-devel] [PATCH v5 proxmox-backup 27/28] catalog: use format version 2 conditionally Christian Ebner
2023-11-15 15:48 ` Christian Ebner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231115154813.281564-29-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox