by allowing 'qcow2', 'vmdk', 'raw' and 'img' files to upload.
Implement 'extension aliases' for the upload window, that append the
'real' extension to the filename after selecting a file with such an
alias. This is necessary so that we have seperate lists for the file
selector and the filename validator. Use that to mark '.img' an alias of
'.raw' for import.
For the download, the api checks the filename for us first, so we
just have to rename '.img' to '.img.raw'.
partially fixes #2424
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
no changes in v6
www/manager6/window/DownloadUrlToStorage.js | 4 ++++
www/manager6/window/UploadToStorage.js | 24 +++++++++++++++++----
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/www/manager6/window/DownloadUrlToStorage.js
b/www/manager6/window/DownloadUrlToStorage.js
index 3ac80ac9..aabc9d3c 100644
--- a/www/manager6/window/DownloadUrlToStorage.js
+++ b/www/manager6/window/DownloadUrlToStorage.js
@@ -89,6 +89,10 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
filename = matches[1];
compression = matches[2].toLowerCase();
}
+ } else if (view.content === 'import') {
+ if (filename.endsWith('.img')) {
+ filename += '.raw';
+ }
}
view.setValues({
diff --git a/www/manager6/window/UploadToStorage.js
b/www/manager6/window/UploadToStorage.js
index cdf548a8..f29d80f4 100644
--- a/www/manager6/window/UploadToStorage.js
+++ b/www/manager6/window/UploadToStorage.js
@@ -9,19 +9,28 @@ Ext.define('PVE.window.UploadToStorage', {
title: gettext('Upload'),
acceptedExtensions: {
- 'import': ['.ova'],
+ 'import': ['.ova', '.qcow2', '.raw', '.vmdk'],
iso: ['.img', '.iso'],
vztmpl: ['.tar.gz', '.tar.xz', '.tar.zst'],
},
+ // accepted for file selection, will be renamed to real extension
+ extensionAliases: {
+ 'import': {
+ '.img': '.raw',
+ },
+ },
+
cbindData: function(initialConfig) {
const me = this;
const ext = me.acceptedExtensions[me.content] || [];
me.url = `/nodes/${me.nodename}/storage/${me.storage}/upload`;
+ let fileSelectorExt =
ext.concat(Object.keys(me.extensionAliases[me.content] ?? {}));
+
return {
- extensions: ext.join(', '),
+ extensions: fileSelectorExt.join(', '),
filenameRegex: RegExp('^.*(?:' + ext.join('|').replaceAll('.',
'\\.') + ')$', 'i'),
};
},
@@ -134,8 +143,15 @@ Ext.define('PVE.window.UploadToStorage', {
},
fileChange: function(input) {
- const vm = this.getViewModel();
- const name = input.value.replace(/^.*(\/|\\)/, '');
+ const me = this;
+ const vm = me.getViewModel();
+ const view = me.getView();
+ let name = input.value.replace(/^.*(\/|\\)/, '');
+ for (const [alias, real] of
Object.entries(view.extensionAliases[view.content] ?? {})) {
+ if (name.endsWith(alias)) {
+ name += real;
+ }
+ }
const fileInput = input.fileInputEl.dom;
vm.set('filename', name);
vm.set('size', (fileInput.files[0] &&
Proxmox.Utils.format_size(fileInput.files[0].size)) || '-');
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
