Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/dist/fileupload.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions assets/js/fileupload.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,27 @@
var fileUploadEl = document.getElementById('fileUpload');
if (!fileUploadEl) return;

// Read BZ2 support from bigdump-config element
var configEl = document.getElementById('bigdump-config');
var bz2Supported = false;
if (configEl && configEl.dataset.bz2Supported !== undefined) {
bz2Supported = configEl.dataset.bz2Supported === 'true';
}

// Build allowed types array based on extension support
var allowedTypes = ['sql', 'gz'];
if (bz2Supported) {
allowedTypes.push('bz2');
}
allowedTypes.push('csv');

// Read configuration from data attributes
var CONFIG = {
maxFileSize: parseInt(fileUploadEl.dataset.maxFileSize, 10) || 0,
maxConcurrent: 2,
allowedTypes: ['sql', 'gz', 'csv'],
uploadUrl: fileUploadEl.dataset.uploadUrl || ''
allowedTypes: allowedTypes,
uploadUrl: fileUploadEl.dataset.uploadUrl || '',
bz2Supported: bz2Supported
};

// State
Expand Down Expand Up @@ -82,6 +97,11 @@
function validateFile(file) {
var ext = getExtension(file.name);

// Special error message for .bz2 when extension not supported
if (ext === 'bz2' && !CONFIG.bz2Supported) {
return { valid: false, error: 'BZ2 files require the PHP bz2 extension which is not installed on the server' };
}

if (CONFIG.allowedTypes.indexOf(ext) === -1) {
return { valid: false, error: 'Invalid file type. Allowed: ' + CONFIG.allowedTypes.join(', ') };
}
Expand Down
24 changes: 22 additions & 2 deletions assets/src/js/fileupload.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,27 @@
var fileUploadEl = document.getElementById('fileUpload');
if (!fileUploadEl) return;

// Read BZ2 support from bigdump-config element
var configEl = document.getElementById('bigdump-config');
var bz2Supported = false;
if (configEl && configEl.dataset.bz2Supported !== undefined) {
bz2Supported = configEl.dataset.bz2Supported === 'true';
}

// Build allowed types array based on extension support
var allowedTypes = ['sql', 'gz'];
if (bz2Supported) {
allowedTypes.push('bz2');
}
allowedTypes.push('csv');

// Read configuration from data attributes
var CONFIG = {
maxFileSize: parseInt(fileUploadEl.dataset.maxFileSize, 10) || 0,
maxConcurrent: 2,
allowedTypes: ['sql', 'gz', 'csv'],
uploadUrl: fileUploadEl.dataset.uploadUrl || ''
allowedTypes: allowedTypes,
uploadUrl: fileUploadEl.dataset.uploadUrl || '',
bz2Supported: bz2Supported
};

// State
Expand Down Expand Up @@ -82,6 +97,11 @@
function validateFile(file) {
var ext = getExtension(file.name);

// Special error message for .bz2 when extension not supported
if (ext === 'bz2' && !CONFIG.bz2Supported) {
return { valid: false, error: 'BZ2 files require the PHP bz2 extension which is not installed on the server' };
}

if (CONFIG.allowedTypes.indexOf(ext) === -1) {
return { valid: false, error: 'Invalid file type. Allowed: ' + CONFIG.allowedTypes.join(', ') };
}
Expand Down
Loading