arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated upload.js (ES2015)

Browse Source
This commit is contained in:
Tobias Reich 2015-07-12 13:19:57 +02:00
parent 961026b014
commit d4470341ff
3 changed files with 249 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/main.js vendored Normal file → Executable file
View File

Binary file not shown.

4
src/scripts/sidebar.js
View File

@ -1,6 +1,6 @@
/** /**
* @description This module takes care of the sidebar. * @description This module takes care of the sidebar.
* @copyright 2015 by Tobias Reich * @copyright 2015 by Tobias Reich
*/ */
sidebar = { sidebar = {

506
src/scripts/upload.js
View File

@ -1,6 +1,6 @@
/** /**
* @description Takes care of every action an album can handle and execute. * @description Takes care of every action an album can handle and execute.
* @copyright 2015 by Tobias Reich * @copyright 2015 by Tobias Reich
*/ */
upload = {} upload = {}
@ -17,23 +17,21 @@ upload.show = function(title, files, callback) {
} }
}, },
callback callback
}); })
} }
upload.notify = function(title, text) { 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) {
let popup = window.webkitNotifications.createNotification('', title, text)
if (window.webkitNotifications.checkPermission()===0&&title) { popup.show()
popup = window.webkitNotifications.createNotification('', title, text);
popup.show();
} }
} }
@ -42,261 +40,258 @@ upload.start = {
local: function(files) { local: function(files) {
var albumID = album.getID(), let albumID = album.getID(),
error = false, error = false,
warning = false, warning = false
process = function(files, file) {
var formData = new FormData(), const process = function(files, file) {
xhr = new XMLHttpRequest(),
pre_progress = 0,
progress = 0,
finish = function() {
window.onbeforeunload = null; let formData = new FormData(),
xhr = new XMLHttpRequest(),
pre_progress = 0,
progress = 0
$('#upload_files').val(''); const finish = function() {
if (error===false&&warning===false) { window.onbeforeunload = null
// Success $('#upload_files').val('')
basicModal.close();
upload.notify('Upload complete');
} else if (error===false&&warning===true) { if (error===false && warning===false) {
// Warning // Success
$('.basicModal #basicModal__action.hidden').show(); basicModal.close()
upload.notify('Upload complete'); upload.notify('Upload complete')
} else { } else if (error===false && warning===true) {
// Error // Warning
$('.basicModal #basicModal__action.hidden').show(); $('.basicModal #basicModal__action.hidden').show()
upload.notify('Upload complete', 'Failed to upload one or more photos.'); upload.notify('Upload complete')
} } else {
albums.refresh(); // Error
$('.basicModal #basicModal__action.hidden').show()
if (album.getID()===false) lychee.goto('0'); upload.notify('Upload complete', 'Failed to upload one or more photos.')
else album.load(albumID);
};
// Check if file is supported
if (file.supported===false) {
// Skip file
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;
for (var i = 0; i < files.length; i++) {
if (files[i].supported===true) {
hasSupportedFiles = true;
break;
}
}
if (hasSupportedFiles===false) setTimeout(finish, 2000);
}
return false;
} }
formData.append('function', 'Photo::add'); albums.refresh()
formData.append('albumID', albumID);
formData.append('tags', '');
formData.append(0, file);
xhr.open('POST', api.path); if (album.getID()===false) lychee.goto('0')
else album.load(albumID)
xhr.onload = function() { }
var wait = false, // Check if file is supported
errorText = ''; if (file.supported===false) {
file.ready = true; // Skip file
if (file.next!==null) process(files, file.next)
else {
// Set status // Look for supported files
if (xhr.status===200&&xhr.responseText==='1') { // If zero files are supported, hide the upload after a delay
// Success let hasSupportedFiles = false
for (let i = 0; i < files.length; i++) {
if (files[i].supported===true) {
hasSupportedFiles = true
break
}
}
if (hasSupportedFiles===false) setTimeout(finish, 2000)
}
return false
}
formData.append('function', 'Photo::add')
formData.append('albumID', albumID)
formData.append('tags', '')
formData.append(0, file)
xhr.open('POST', api.path)
xhr.onload = function() {
let wait = false,
errorText = ''
file.ready = true
// Set status
if (xhr.status===200 && xhr.responseText==='1') {
// Success
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Finished')
.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
// Error Status
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status') $('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Finished') .html('Failed')
.addClass('success'); .addClass('error')
} else if (xhr.responseText.substr(0, 8)==='Warning:') {
errorText = xhr.responseText.substr(8)
warning = true
// Warning Status
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Skipped')
.addClass('warning')
} else { } else {
if (xhr.responseText.substr(0, 6)==='Error:') { errorText = 'Server returned an unknown response. 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 Status
error = true; $('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Failed')
// Error Status .addClass('error')
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Failed')
.addClass('error');
} else if (xhr.responseText.substr(0, 8)==='Warning:') {
errorText = xhr.responseText.substr(8);
warning = true;
// Warning Status
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
.html('Skipped')
.addClass('warning');
} else {
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');
}
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') p.notice')
.html(errorText)
.show();
// Throw error
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 $('.basicModal .rows .row:nth-child(' + (file.num+1) + ') p.notice')
for (var i = 0; i < files.length; i++) { .html(errorText)
.show()
if (files[i].ready===false) { // Throw error
wait = true; if (error===true) lychee.error('Upload failed. Server returned the status code ' + xhr.status + '!', xhr, xhr.responseText)
break;
}
}
// Check if there are file which are not finished
for (let i = 0; i < files.length; i++) {
if (files[i].ready===false) {
wait = true
break
} }
// Finish upload when all files are finished }
if (wait===false) finish();
}; // Finish upload when all files are finished
if (wait===false) finish()
xhr.upload.onprogress = function(e) { }
if (e.lengthComputable) { xhr.upload.onprogress = function(e) {
// Calculate progress if (e.lengthComputable!==true) return false
progress = (e.loaded / e.total * 100 | 0);
// Set progress when progress has changed // Calculate progress
if (progress>pre_progress) { progress = (e.loaded / e.total * 100 | 0)
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%');
pre_progress = progress;
}
if (progress>=100) { // Set progress when progress has changed
if (progress>pre_progress) {
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%')
pre_progress = progress
}
// Scroll to the uploading file if (progress>=100) {
var scrollPos = 0;
if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
$('.basicModal .rows').scrollTop(scrollPos);
// Set status to processing // Scroll to the uploading file
$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing'); let scrollPos = 0
if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
$('.basicModal .rows').scrollTop(scrollPos)
// Upload next file // Set status to processing
if (file.next!==null) process(files, file.next); $('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing')
} // Upload next file
if (file.next!==null) process(files, file.next)
} }
}; }
xhr.send(formData); xhr.send(formData)
}; }
if (files.length<=0) return false; if (files.length<=0) return false
if (albumID===false||visible.albums()===true) albumID = 0; if (albumID===false || visible.albums()===true) albumID = 0
for (var i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
files[i].num = i; files[i].num = i
files[i].ready = false; files[i].ready = false
files[i].supported = true; files[i].supported = true
if (i < files.length-1) files[i].next = files[i+1]; if (i < files.length-1) files[i].next = files[i+1]
else files[i].next = null; else files[i].next = null
// Check if file is supported // 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') { 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].ready = true
files[i].supported = false; 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.show('Uploading', files, function() {
// Upload first file // Upload first file
process(files, files[0]); process(files, files[0])
}); })
}, },
url: function(url = '') { url: function(url = '') {
var albumID = album.getID(), let albumID = album.getID()
url = (typeof url === 'string' ? url : ''),
action;
if (albumID===false) albumID = 0; url = (typeof url === 'string' ? url : '')
action = function(data) { if (albumID===false) albumID = 0
var extension, const action = function(data) {
files = [];
if (data.link&&data.link.length>3) { let files = []
basicModal.close(); if (data.link && data.link.length>3) {
extension = data.link.split('.').pop(); basicModal.close()
if (extension!=='jpeg'&&extension!=='jpg'&&extension!=='png'&&extension!=='gif'&&extension!=='webp') {
loadingBar.show('error', 'File format of link not supported.'); let extension = data.link.split('.').pop()
return false; if (extension!=='jpeg' && extension!=='jpg' && extension!=='png' && extension!=='gif' && extension!=='webp') {
loadingBar.show('error', 'File format of link not supported.')
return false
} }
files[0] = { files[0] = {
name: data.link, name : data.link,
supported: true supported : true
} }
upload.show('Importing URL', files, function() { upload.show('Importing URL', files, function() {
var params; $('.basicModal .rows .row .status').html('Importing')
$('.basicModal .rows .row .status').html('Importing'); let params = {
params = {
url: data.link, url: data.link,
albumID albumID
} }
@ -309,41 +304,41 @@ upload.start = {
$('.basicModal .rows .row p.notice') $('.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.') .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') $('.basicModal .rows .row .status')
.html('Finished') .html('Finished')
.addClass('warning'); .addClass('warning')
// Show close button // Show close button
$('.basicModal #basicModal__action.hidden').show(); $('.basicModal #basicModal__action.hidden').show()
// Log error // Log error
lychee.error(null, params, data); lychee.error(null, params, data)
} else { } else {
basicModal.close(); basicModal.close()
} }
upload.notify('Import complete'); upload.notify('Import complete')
albums.refresh(); albums.refresh()
if (album.getID()===false) lychee.goto('0'); if (album.getID()===false) lychee.goto('0')
else album.load(albumID); else album.load(albumID)
}); })
}); })
} else basicModal.error('link'); } else basicModal.error('link')
} }
basicModal.show({ 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: { buttons: {
action: { action: {
title: 'Import', title: 'Import',
@ -354,53 +349,49 @@ upload.start = {
fn: basicModal.close fn: basicModal.close
} }
} }
}); })
}, },
server: function() { server: function() {
var albumID = album.getID(), let albumID = album.getID()
action; if (albumID===false) albumID = 0
if (albumID===false) albumID = 0; const action = function(data) {
action = function(data) { let files = []
var files = [];
files[0] = { files[0] = {
name: data.path, name : data.path,
supported: true supported : true
}; }
upload.show('Importing from server', files, function() { upload.show('Importing from server', files, function() {
var params; $('.basicModal .rows .row .status').html('Importing')
$('.basicModal .rows .row .status').html('Importing'); let params = {
params = {
albumID, albumID,
path: data.path path: data.path
} }
api.post('Import::server', params, function(data) { api.post('Import::server', params, function(data) {
albums.refresh(); albums.refresh()
upload.notify('Import complete'); upload.notify('Import complete')
if (data==='Notice: Import only contained albums!') { if (data==='Notice: Import only contained albums!') {
// No error, but the folder only contained albums // No error, but the folder only contained albums
// Go back to the album overview to show the imported albums // Go back to the album overview to show the imported albums
if (visible.albums()) lychee.load(); if (visible.albums()) lychee.load()
else lychee.goto(''); else lychee.goto('')
basicModal.close(); basicModal.close()
return true; return true
} else if (data==='Warning: Folder empty or no readable files to process!') { } else if (data==='Warning: Folder empty or no readable files to process!') {
@ -408,14 +399,14 @@ upload.start = {
$('.basicModal .rows .row p.notice') $('.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.') .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') $('.basicModal .rows .row .status')
.html('Failed') .html('Failed')
.addClass('error'); .addClass('error')
// Log 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) { } else if (data!==true) {
@ -423,37 +414,37 @@ upload.start = {
$('.basicModal .rows .row p.notice') $('.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.') .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') $('.basicModal .rows .row .status')
.html('Finished') .html('Finished')
.addClass('warning'); .addClass('warning')
// Log error // Log error
lychee.error(null, params, data); lychee.error(null, params, data)
} else { } else {
// No error, everything worked fine // No error, everything worked fine
basicModal.close(); basicModal.close()
} }
if (album.getID()===false) lychee.goto('0'); if (album.getID()===false) lychee.goto('0')
else album.load(albumID); else album.load(albumID)
// Show close button // Show close button
$('.basicModal #basicModal__action.hidden').show(); $('.basicModal #basicModal__action.hidden').show()
}); })
}); })
} }
basicModal.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: { buttons: {
action: { action: {
title: 'Import', title: 'Import',
@ -464,41 +455,38 @@ upload.start = {
fn: basicModal.close fn: basicModal.close
} }
} }
}); })
}, },
dropbox: function() { dropbox: function() {
var albumID = album.getID(), let albumID = album.getID()
links = '', if (albumID===false) albumID = 0
success;
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] = { files[i] = {
name: files[i].link, name : files[i].link,
supported: true supported : true
}; }
} }
// Remove last comma // Remove last comma
links = links.substr(0, links.length-1); links = links.substr(0, links.length-1)
upload.show('Importing from Dropbox', files, function() { upload.show('Importing from Dropbox', files, function() {
var params; $('.basicModal .rows .row .status').html('Importing')
$('.basicModal .rows .row .status').html('Importing'); let params = {
params = {
url: links, url: links,
albumID albumID
} }
@ -511,34 +499,34 @@ upload.start = {
$('.basicModal .rows .row p.notice') $('.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.') .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') $('.basicModal .rows .row .status')
.html('Finished') .html('Finished')
.addClass('warning'); .addClass('warning')
// Show close button // Show close button
$('.basicModal #basicModal__action.hidden').show(); $('.basicModal #basicModal__action.hidden').show()
// Log error // Log error
lychee.error(null, params, data); lychee.error(null, params, data)
} else { } else {
basicModal.close(); basicModal.close()
} }
upload.notify('Import complete'); upload.notify('Import complete')
albums.refresh(); albums.refresh()
if (album.getID()===false) lychee.goto('0'); if (album.getID()===false) lychee.goto('0')
else album.load(albumID); else album.load(albumID)
}); })
}); })
} }
@ -547,8 +535,8 @@ upload.start = {
linkType: 'direct', linkType: 'direct',
multiselect: true, multiselect: true,
success success
}); })
}); })
} }