Updated upload.js (ES2015)
This commit is contained in:
Tobias Reich
parent
961026b014
commit
d4470341ff
BIN
dist/main.js
vendored
Normal file → Executable file
BIN
dist/main.js
vendored
Normal file → Executable file
Binary file not shown.
@ -17,23 +17,21 @@ upload.show = function(title, files, callback) {
|
||||
}
|
||||
},
|
||||
callback
|
||||
});
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
upload.notify = function(title, text) {
|
||||
|
||||
var popup;
|
||||
if (text==null||text==='') text = 'You can now manage your new photo(s).'
|
||||
|
||||
if (!text||text==='') text = 'You can now manage your new photo(s).';
|
||||
if (!window.webkitNotifications) return false
|
||||
|
||||
if (!window.webkitNotifications) return false;
|
||||
|
||||
if (window.webkitNotifications.checkPermission()!==0) window.webkitNotifications.requestPermission();
|
||||
if (window.webkitNotifications.checkPermission()!==0) window.webkitNotifications.requestPermission()
|
||||
|
||||
if (window.webkitNotifications.checkPermission()===0 && title) {
|
||||
popup = window.webkitNotifications.createNotification('', title, text);
|
||||
popup.show();
|
||||
let popup = window.webkitNotifications.createNotification('', title, text)
|
||||
popup.show()
|
||||
}
|
||||
|
||||
}
|
||||
@ -42,90 +40,92 @@ upload.start = {
|
||||
|
||||
local: function(files) {
|
||||
|
||||
var albumID = album.getID(),
|
||||
let albumID = album.getID(),
|
||||
error = false,
|
||||
warning = false,
|
||||
process = function(files, file) {
|
||||
warning = false
|
||||
|
||||
var formData = new FormData(),
|
||||
const process = function(files, file) {
|
||||
|
||||
let formData = new FormData(),
|
||||
xhr = new XMLHttpRequest(),
|
||||
pre_progress = 0,
|
||||
progress = 0,
|
||||
finish = function() {
|
||||
progress = 0
|
||||
|
||||
window.onbeforeunload = null;
|
||||
const finish = function() {
|
||||
|
||||
$('#upload_files').val('');
|
||||
window.onbeforeunload = null
|
||||
|
||||
$('#upload_files').val('')
|
||||
|
||||
if (error===false && warning===false) {
|
||||
|
||||
// Success
|
||||
basicModal.close();
|
||||
upload.notify('Upload complete');
|
||||
basicModal.close()
|
||||
upload.notify('Upload complete')
|
||||
|
||||
} else if (error===false && warning===true) {
|
||||
|
||||
// Warning
|
||||
$('.basicModal #basicModal__action.hidden').show();
|
||||
upload.notify('Upload complete');
|
||||
$('.basicModal #basicModal__action.hidden').show()
|
||||
upload.notify('Upload complete')
|
||||
|
||||
} else {
|
||||
|
||||
// Error
|
||||
$('.basicModal #basicModal__action.hidden').show();
|
||||
upload.notify('Upload complete', 'Failed to upload one or more photos.');
|
||||
$('.basicModal #basicModal__action.hidden').show()
|
||||
upload.notify('Upload complete', 'Failed to upload one or more photos.')
|
||||
|
||||
}
|
||||
|
||||
albums.refresh();
|
||||
albums.refresh()
|
||||
|
||||
if (album.getID()===false) lychee.goto('0');
|
||||
else album.load(albumID);
|
||||
if (album.getID()===false) lychee.goto('0')
|
||||
else album.load(albumID)
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
// Check if file is supported
|
||||
if (file.supported===false) {
|
||||
|
||||
// Skip file
|
||||
if (file.next!==null) process(files, file.next);
|
||||
if (file.next!==null) process(files, file.next)
|
||||
else {
|
||||
|
||||
// Look for supported files
|
||||
// If zero files are supported, hide the upload after a delay
|
||||
|
||||
var hasSupportedFiles = false;
|
||||
let hasSupportedFiles = false
|
||||
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
|
||||
if (files[i].supported===true) {
|
||||
hasSupportedFiles = true;
|
||||
break;
|
||||
hasSupportedFiles = true
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (hasSupportedFiles===false) setTimeout(finish, 2000);
|
||||
if (hasSupportedFiles===false) setTimeout(finish, 2000)
|
||||
|
||||
}
|
||||
|
||||
return false;
|
||||
return false
|
||||
|
||||
}
|
||||
|
||||
formData.append('function', 'Photo::add');
|
||||
formData.append('albumID', albumID);
|
||||
formData.append('tags', '');
|
||||
formData.append(0, file);
|
||||
formData.append('function', 'Photo::add')
|
||||
formData.append('albumID', albumID)
|
||||
formData.append('tags', '')
|
||||
formData.append(0, file)
|
||||
|
||||
xhr.open('POST', api.path);
|
||||
xhr.open('POST', api.path)
|
||||
|
||||
xhr.onload = function() {
|
||||
|
||||
var wait = false,
|
||||
errorText = '';
|
||||
let wait = false,
|
||||
errorText = ''
|
||||
|
||||
file.ready = true;
|
||||
file.ready = true
|
||||
|
||||
// Set status
|
||||
if (xhr.status===200 && xhr.responseText==='1') {
|
||||
@ -133,156 +133,153 @@ upload.start = {
|
||||
// Success
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
|
||||
.html('Finished')
|
||||
.addClass('success');
|
||||
.addClass('success')
|
||||
|
||||
} else {
|
||||
|
||||
if (xhr.responseText.substr(0, 6)==='Error:') {
|
||||
|
||||
errorText = xhr.responseText.substr(6) + ' Please take a look at the console of your browser for further details.';
|
||||
error = true;
|
||||
errorText = xhr.responseText.substr(6) + ' Please take a look at the console of your browser for further details.'
|
||||
error = true
|
||||
|
||||
// Error Status
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
|
||||
.html('Failed')
|
||||
.addClass('error');
|
||||
.addClass('error')
|
||||
|
||||
} else if (xhr.responseText.substr(0, 8)==='Warning:') {
|
||||
|
||||
errorText = xhr.responseText.substr(8);
|
||||
warning = true;
|
||||
errorText = xhr.responseText.substr(8)
|
||||
warning = true
|
||||
|
||||
// Warning Status
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
|
||||
.html('Skipped')
|
||||
.addClass('warning');
|
||||
.addClass('warning')
|
||||
|
||||
} else {
|
||||
|
||||
errorText = 'Server returned an unknown response. Please take a look at the console of your browser for further details.';
|
||||
error = true;
|
||||
errorText = 'Server returned an unknown response. Please take a look at the console of your browser for further details.'
|
||||
error = true
|
||||
|
||||
// Error Status
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
|
||||
.html('Failed')
|
||||
.addClass('error');
|
||||
.addClass('error')
|
||||
|
||||
}
|
||||
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') p.notice')
|
||||
.html(errorText)
|
||||
.show();
|
||||
.show()
|
||||
|
||||
// Throw error
|
||||
if (error===true) lychee.error('Upload failed. Server returned the status code ' + xhr.status + '!', xhr, xhr.responseText);
|
||||
if (error===true) lychee.error('Upload failed. Server returned the status code ' + xhr.status + '!', xhr, xhr.responseText)
|
||||
|
||||
}
|
||||
|
||||
// Check if there are file which are not finished
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
|
||||
if (files[i].ready===false) {
|
||||
wait = true;
|
||||
break;
|
||||
wait = true
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Finish upload when all files are finished
|
||||
if (wait===false) finish();
|
||||
if (wait===false) finish()
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
xhr.upload.onprogress = function(e) {
|
||||
|
||||
if (e.lengthComputable) {
|
||||
if (e.lengthComputable!==true) return false
|
||||
|
||||
// Calculate progress
|
||||
progress = (e.loaded / e.total * 100 | 0);
|
||||
progress = (e.loaded / e.total * 100 | 0)
|
||||
|
||||
// Set progress when progress has changed
|
||||
if (progress>pre_progress) {
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%');
|
||||
pre_progress = progress;
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%')
|
||||
pre_progress = progress
|
||||
}
|
||||
|
||||
if (progress>=100) {
|
||||
|
||||
// Scroll to the uploading file
|
||||
var scrollPos = 0;
|
||||
let scrollPos = 0
|
||||
if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
|
||||
$('.basicModal .rows').scrollTop(scrollPos);
|
||||
$('.basicModal .rows').scrollTop(scrollPos)
|
||||
|
||||
// Set status to processing
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing');
|
||||
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing')
|
||||
|
||||
// Upload next file
|
||||
if (file.next!==null) process(files, file.next);
|
||||
if (file.next!==null) process(files, file.next)
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
xhr.send(formData)
|
||||
|
||||
xhr.send(formData);
|
||||
}
|
||||
|
||||
};
|
||||
if (files.length<=0) return false
|
||||
if (albumID===false || visible.albums()===true) albumID = 0
|
||||
|
||||
if (files.length<=0) return false;
|
||||
if (albumID===false||visible.albums()===true) albumID = 0;
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
files[i].num = i
|
||||
files[i].ready = false
|
||||
files[i].supported = true
|
||||
|
||||
files[i].num = i;
|
||||
files[i].ready = false;
|
||||
files[i].supported = true;
|
||||
|
||||
if (i < files.length-1) files[i].next = files[i+1];
|
||||
else files[i].next = null;
|
||||
if (i < files.length-1) files[i].next = files[i+1]
|
||||
else files[i].next = null
|
||||
|
||||
// Check if file is supported
|
||||
if (files[i].type!=='image/jpeg' && files[i].type!=='image/jpg' && files[i].type!=='image/png' && files[i].type!=='image/gif') {
|
||||
|
||||
files[i].ready = true;
|
||||
files[i].supported = false;
|
||||
files[i].ready = true
|
||||
files[i].supported = false
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
window.onbeforeunload = function() { return 'Lychee is currently uploading!'; };
|
||||
window.onbeforeunload = function() { return 'Lychee is currently uploading!' }
|
||||
|
||||
upload.show('Uploading', files, function() {
|
||||
|
||||
// Upload first file
|
||||
process(files, files[0]);
|
||||
process(files, files[0])
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
url: function(url = '') {
|
||||
|
||||
var albumID = album.getID(),
|
||||
url = (typeof url === 'string' ? url : ''),
|
||||
action;
|
||||
let albumID = album.getID()
|
||||
|
||||
if (albumID===false) albumID = 0;
|
||||
url = (typeof url === 'string' ? url : '')
|
||||
|
||||
action = function(data) {
|
||||
if (albumID===false) albumID = 0
|
||||
|
||||
var extension,
|
||||
files = [];
|
||||
const action = function(data) {
|
||||
|
||||
let files = []
|
||||
|
||||
if (data.link && data.link.length>3) {
|
||||
|
||||
basicModal.close();
|
||||
basicModal.close()
|
||||
|
||||
extension = data.link.split('.').pop();
|
||||
let extension = data.link.split('.').pop()
|
||||
if (extension!=='jpeg' && extension!=='jpg' && extension!=='png' && extension!=='gif' && extension!=='webp') {
|
||||
loadingBar.show('error', 'File format of link not supported.');
|
||||
return false;
|
||||
loadingBar.show('error', 'File format of link not supported.')
|
||||
return false
|
||||
}
|
||||
|
||||
files[0] = {
|
||||
@ -292,11 +289,9 @@ upload.start = {
|
||||
|
||||
upload.show('Importing URL', files, function() {
|
||||
|
||||
var params;
|
||||
$('.basicModal .rows .row .status').html('Importing')
|
||||
|
||||
$('.basicModal .rows .row .status').html('Importing');
|
||||
|
||||
params = {
|
||||
let params = {
|
||||
url: data.link,
|
||||
albumID
|
||||
}
|
||||
@ -309,41 +304,41 @@ upload.start = {
|
||||
|
||||
$('.basicModal .rows .row p.notice')
|
||||
.html('The import has been finished, but returned warnings or errors. Please take a look at the log (Settings -> Show Log) for further details.')
|
||||
.show();
|
||||
.show()
|
||||
|
||||
$('.basicModal .rows .row .status')
|
||||
.html('Finished')
|
||||
.addClass('warning');
|
||||
.addClass('warning')
|
||||
|
||||
// Show close button
|
||||
$('.basicModal #basicModal__action.hidden').show();
|
||||
$('.basicModal #basicModal__action.hidden').show()
|
||||
|
||||
// Log error
|
||||
lychee.error(null, params, data);
|
||||
lychee.error(null, params, data)
|
||||
|
||||
} else {
|
||||
|
||||
basicModal.close();
|
||||
basicModal.close()
|
||||
|
||||
}
|
||||
|
||||
upload.notify('Import complete');
|
||||
upload.notify('Import complete')
|
||||
|
||||
albums.refresh();
|
||||
albums.refresh()
|
||||
|
||||
if (album.getID()===false) lychee.goto('0');
|
||||
else album.load(albumID);
|
||||
if (album.getID()===false) lychee.goto('0')
|
||||
else album.load(albumID)
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
} else basicModal.error('link');
|
||||
} else basicModal.error('link')
|
||||
|
||||
}
|
||||
|
||||
basicModal.show({
|
||||
body: "<p>Please enter the direct link to a photo to import it: <input class='text' name='link' type='text' placeholder='http://' value='" + url + "'></p>",
|
||||
body: `<p>Please enter the direct link to a photo to import it: <input class='text' name='link' type='text' placeholder='http://' value='${ url }'></p>`,
|
||||
buttons: {
|
||||
action: {
|
||||
title: 'Import',
|
||||
@ -354,53 +349,49 @@ upload.start = {
|
||||
fn: basicModal.close
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
server: function() {
|
||||
|
||||
var albumID = album.getID(),
|
||||
action;
|
||||
let albumID = album.getID()
|
||||
if (albumID===false) albumID = 0
|
||||
|
||||
if (albumID===false) albumID = 0;
|
||||
const action = function(data) {
|
||||
|
||||
action = function(data) {
|
||||
|
||||
var files = [];
|
||||
let files = []
|
||||
|
||||
files[0] = {
|
||||
name : data.path,
|
||||
supported : true
|
||||
};
|
||||
}
|
||||
|
||||
upload.show('Importing from server', files, function() {
|
||||
|
||||
var params;
|
||||
$('.basicModal .rows .row .status').html('Importing')
|
||||
|
||||
$('.basicModal .rows .row .status').html('Importing');
|
||||
|
||||
params = {
|
||||
let params = {
|
||||
albumID,
|
||||
path: data.path
|
||||
}
|
||||
|
||||
api.post('Import::server', params, function(data) {
|
||||
|
||||
albums.refresh();
|
||||
upload.notify('Import complete');
|
||||
albums.refresh()
|
||||
upload.notify('Import complete')
|
||||
|
||||
if (data==='Notice: Import only contained albums!') {
|
||||
|
||||
// No error, but the folder only contained albums
|
||||
|
||||
// Go back to the album overview to show the imported albums
|
||||
if (visible.albums()) lychee.load();
|
||||
else lychee.goto('');
|
||||
if (visible.albums()) lychee.load()
|
||||
else lychee.goto('')
|
||||
|
||||
basicModal.close();
|
||||
basicModal.close()
|
||||
|
||||
return true;
|
||||
return true
|
||||
|
||||
} else if (data==='Warning: Folder empty or no readable files to process!') {
|
||||
|
||||
@ -408,14 +399,14 @@ upload.start = {
|
||||
|
||||
$('.basicModal .rows .row p.notice')
|
||||
.html('Folder empty or no readable files to process. Please take a look at the log (Settings -> Show Log) for further details.')
|
||||
.show();
|
||||
.show()
|
||||
|
||||
$('.basicModal .rows .row .status')
|
||||
.html('Failed')
|
||||
.addClass('error');
|
||||
.addClass('error')
|
||||
|
||||
// Log error
|
||||
lychee.error('Could not start import because the folder was empty!', params, data);
|
||||
lychee.error('Could not start import because the folder was empty!', params, data)
|
||||
|
||||
} else if (data!==true) {
|
||||
|
||||
@ -423,37 +414,37 @@ upload.start = {
|
||||
|
||||
$('.basicModal .rows .row p.notice')
|
||||
.html('The import has been finished, but returned warnings or errors. Please take a look at the log (Settings -> Show Log) for further details.')
|
||||
.show();
|
||||
.show()
|
||||
|
||||
$('.basicModal .rows .row .status')
|
||||
.html('Finished')
|
||||
.addClass('warning');
|
||||
.addClass('warning')
|
||||
|
||||
// Log error
|
||||
lychee.error(null, params, data);
|
||||
lychee.error(null, params, data)
|
||||
|
||||
} else {
|
||||
|
||||
// No error, everything worked fine
|
||||
|
||||
basicModal.close();
|
||||
basicModal.close()
|
||||
|
||||
}
|
||||
|
||||
if (album.getID()===false) lychee.goto('0');
|
||||
else album.load(albumID);
|
||||
if (album.getID()===false) lychee.goto('0')
|
||||
else album.load(albumID)
|
||||
|
||||
// Show close button
|
||||
$('.basicModal #basicModal__action.hidden').show();
|
||||
$('.basicModal #basicModal__action.hidden').show()
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
basicModal.show({
|
||||
body: "<p>This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' name='path' type='text' maxlength='100' placeholder='Absolute path to directory' value='" + lychee.location + "uploads/import/'></p>",
|
||||
body: `<p>This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' name='path' type='text' maxlength='100' placeholder='Absolute path to directory' value='${ lychee.location }uploads/import/'></p>`,
|
||||
buttons: {
|
||||
action: {
|
||||
title: 'Import',
|
||||
@ -464,41 +455,38 @@ upload.start = {
|
||||
fn: basicModal.close
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
dropbox: function() {
|
||||
|
||||
var albumID = album.getID(),
|
||||
links = '',
|
||||
success;
|
||||
let albumID = album.getID()
|
||||
if (albumID===false) albumID = 0
|
||||
|
||||
if (albumID===false) albumID = 0;
|
||||
const success = function(files) {
|
||||
|
||||
success = function(files) {
|
||||
let links = ''
|
||||
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
|
||||
links += files[i].link + ',';
|
||||
links += files[i].link + ','
|
||||
|
||||
files[i] = {
|
||||
name : files[i].link,
|
||||
supported : true
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Remove last comma
|
||||
links = links.substr(0, links.length-1);
|
||||
links = links.substr(0, links.length-1)
|
||||
|
||||
upload.show('Importing from Dropbox', files, function() {
|
||||
|
||||
var params;
|
||||
$('.basicModal .rows .row .status').html('Importing')
|
||||
|
||||
$('.basicModal .rows .row .status').html('Importing');
|
||||
|
||||
params = {
|
||||
let params = {
|
||||
url: links,
|
||||
albumID
|
||||
}
|
||||
@ -511,34 +499,34 @@ upload.start = {
|
||||
|
||||
$('.basicModal .rows .row p.notice')
|
||||
.html('The import has been finished, but returned warnings or errors. Please take a look at the log (Settings -> Show Log) for further details.')
|
||||
.show();
|
||||
.show()
|
||||
|
||||
$('.basicModal .rows .row .status')
|
||||
.html('Finished')
|
||||
.addClass('warning');
|
||||
.addClass('warning')
|
||||
|
||||
// Show close button
|
||||
$('.basicModal #basicModal__action.hidden').show();
|
||||
$('.basicModal #basicModal__action.hidden').show()
|
||||
|
||||
// Log error
|
||||
lychee.error(null, params, data);
|
||||
lychee.error(null, params, data)
|
||||
|
||||
} else {
|
||||
|
||||
basicModal.close();
|
||||
basicModal.close()
|
||||
|
||||
}
|
||||
|
||||
upload.notify('Import complete');
|
||||
upload.notify('Import complete')
|
||||
|
||||
albums.refresh();
|
||||
albums.refresh()
|
||||
|
||||
if (album.getID()===false) lychee.goto('0');
|
||||
else album.load(albumID);
|
||||
if (album.getID()===false) lychee.goto('0')
|
||||
else album.load(albumID)
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
});
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@ -547,8 +535,8 @@ upload.start = {
|
||||
linkType: 'direct',
|
||||
multiselect: true,
|
||||
success
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user