diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js index d2359c44b..40efab91e 100644 --- a/customize.dist/translations/messages.es.js +++ b/customize.dist/translations/messages.es.js @@ -411,8 +411,10 @@ define(function () { out.upgradeTitle = "Mejora tu cuenta para obtener más espacio"; out.MB = "MB"; out.GB = "GB"; + out.KB = "KB"; out.formattedMB = "{0} MB"; out.formattedGB = "{0} GB"; + out.formattedKB = "{0} KB"; out.pinLimitReached = "Has llegado al limite de espacio"; out.pinLimitReachedAlert = "Has llegado al limite de espacio. Nuevos pads no serán movidos a tu CryptDrive.
Para resolver este problema, puedes quitar pads de tu CryptDrive (incluso en la papelera) o mejorar tu cuenta para obtener más espacio."; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 5dfd383b0..4ef512615 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -62,8 +62,11 @@ define(function () { out.upgradeTitle = "Améliorer votre compte pour augmenter la limite de stockage"; out.MB = "Mo"; out.GB = "Go"; + out.KB = "Ko"; + out.formattedMB = "{0} Mo"; out.formattedGB = "{0} Go"; + out.formattedKB = "{0} Ko"; out.greenLight = "Tout fonctionne bien"; out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur"; @@ -351,6 +354,21 @@ define(function () { out.settings_logoutEverywhere = "Se déconnecter de toutes les autres sessions."; out.settings_logoutEverywhereConfirm = "Êtes-vous sûr ? Vous devrez vous reconnecter sur tous vos autres appareils."; + out.upload_serverError = "Erreur interne: impossible d'uploader le fichier pour l'instant."; + out.upload_uploadPending = "Vous avez déjà un fichier en cours d'upload. Souhaitez-vous l'annuler et uploader ce nouveau fichier ?"; + out.upload_success = "Votre fichier ({0}) a été uploadé avec succès et ajouté à votre CryptDrive."; + out.upload_notEnoughSpace = "Il n'y a pas assez d'espace libre dans votre CryptDrive pour ce fichier."; + out.upload_tooLarge = "Ce fichier dépasse la taille maximale autorisée."; + out.upload_choose = "Choisir un fichier"; + out.upload_pending = "En attente"; + out.upload_cancelled = "Annulé"; + out.upload_name = "Nom du fichier"; + out.upload_size = "Taille"; + out.upload_progress = "État"; + + // general warnings + out.warn_notPinned = "Ce pad n'est stocké dans aucun CryptDrive. Il va expirer après 3 mois d'inactivité. En savoir plus..."; + // index.html //about.html diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 6cbff3d7f..4643afb55 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -64,9 +64,11 @@ define(function () { out.upgradeTitle = "Upgrade your account to increase the storage limit"; out.MB = "MB"; out.GB = "GB"; + out.KB = "KB"; out.formattedMB = "{0} MB"; out.formattedGB = "{0} GB"; + out.formattedKB = "{0} KB"; out.greenLight = "Everything is working fine"; out.orangeLight = "Your slow connection may impact your experience"; @@ -240,8 +242,6 @@ define(function () { out.fm_info_template = 'Contains all the pads stored as templates and that you can re-use when you create a new pad.'; out.fm_info_trash = 'Files deleted from the trash are also removed from "All files" and it is impossible to recover them from the file manager.'; // Same here for "All files" and "out.fm_filesDataName" out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here - out.fm_info_login = "Log in"; - out.fm_info_register = "Sign up"; out.fm_info_anonymous = 'You are not logged in so these pads may be deleted (find out why). ' + 'Sign up or Log in to keep them alive.'; out.fm_alert_backupUrl = "Backup link for this drive.
" + @@ -364,6 +364,12 @@ define(function () { out.upload_success = "Your file ({0}) has been successfully uploaded and added to your drive."; out.upload_notEnoughSpace = "There is not enough space for this file in your CryptDrive."; out.upload_tooLarge = "This file exceeds the maximum upload size."; + out.upload_choose = "Choose a file"; + out.upload_pending = "Pending"; + out.upload_cancelled = "Cancelled"; + out.upload_name = "File name"; + out.upload_size = "Size"; + out.upload_progress = "Progress"; // general warnings out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. Learn more..."; diff --git a/rpc.js b/rpc.js index e7d3c1627..a155c8272 100644 --- a/rpc.js +++ b/rpc.js @@ -13,7 +13,7 @@ var RPC = module.exports; var Store = require("./storage/file"); -var DEFAULT_LIMIT = 50 * 1024 * 1024; +var DEFAULT_LIMIT = 150 * 1024 * 1024; var isValidId = function (chan) { return /^[a-fA-F0-9]/.test(chan) || diff --git a/www/file/file.css b/www/file/file.css index 08c95f730..375a356cc 100644 --- a/www/file/file.css +++ b/www/file/file.css @@ -68,3 +68,42 @@ body { z-index: 10000; display: block; } +#status { + display: none; + width: 80vw; + margin-top: 50px; + margin-left: 10vw; + border: 1px solid black; + border-collapse: collapse; +} +#status tr:nth-child(1) { + background-color: #ccc; + border: 1px solid #999; +} +#status tr:nth-child(1) td { + text-align: center; +} +#status td { + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + padding: 0 10px; +} +#status .upProgress { + width: 200px; + position: relative; + text-align: center; +} +#status .progressContainer { + position: absolute; + width: 0px; + left: 5px; + top: 1px; + bottom: 1px; + background-color: rgba(0, 0, 255, 0.3); +} +#status .upCancel { + text-align: center; +} +#status .fa.cancel { + color: #ff0073; +} diff --git a/www/file/file.less b/www/file/file.less index 69432a539..b3074e33c 100644 --- a/www/file/file.less +++ b/www/file/file.less @@ -80,3 +80,38 @@ html, body { display: block; } +#status { + display: none; + width: 80vw; + margin-top: 50px; + margin-left: 10vw; + border: 1px solid black; + border-collapse: collapse; + tr:nth-child(1) { + background-color: #ccc; + border: 1px solid #999; + td { text-align: center; } + } + td { + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + padding: 0 10px; + } + .upProgress { + width: 200px; + position: relative; + text-align: center; + } + .progressContainer { + position: absolute; + width: 0px; + left: 5px; + top: 1px; bottom: 1px; + background-color: rgba(0,0,255,0.3); + } + .upCancel { text-align: center; } + .fa.cancel { + color: rgb(255, 0, 115); + } +} + diff --git a/www/file/inner.html b/www/file/inner.html index 727e11498..c6fe5fb32 100644 --- a/www/file/inner.html +++ b/www/file/inner.html @@ -11,8 +11,16 @@
+ + + + + + + +
File nameSizeProgressCancel
diff --git a/www/file/main.js b/www/file/main.js index 4ffcaa127..eb53cca47 100644 --- a/www/file/main.js +++ b/www/file/main.js @@ -21,8 +21,9 @@ define([ var ifrw = $('#pad-iframe')[0].contentWindow; var $iframe = $('#pad-iframe').contents(); var $form = $iframe.find('#upload-form'); - var $progress = $form.find('#progress'); + //var $progress = $form.find('#progress'); var $label = $form.find('label'); + var $table = $iframe.find('#status'); Cryptpad.addLoadingScreen(); @@ -31,8 +32,23 @@ define([ var myFile; var myDataType; - var upload = function (blob, metadata) { + var queue = { + queue: [], + inProgress: false + }; + + var uid = function () { + return 'file-' + String(Math.random()).substring(2); + }; + + var upload = function (blob, metadata, id) { console.log(metadata); + if (queue.inProgress) { return; } + queue.inProgress = true; + + var $cancelCell = $table.find('tr[id="'+id+'"]').find('.upCancel'); + $cancelCell.html('-'); + var u8 = new Uint8Array(blob); var key = Nacl.randomBytes(32); @@ -56,13 +72,19 @@ define([ if (err) { throw new Error(err); } if (box) { actual += box.length; - var progress = (actual / estimate * 100) + '%'; - console.log(progress); + var progressValue = (actual / estimate * 100); + var progress = progressValue + '%'; return void sendChunk(box, function (e) { if (e) { return console.error(e); } - $progress.css({ + /*$progress.css({ width: progress, + });*/ + var $pv = $table.find('tr[id="'+id+'"]').find('.progressValue'); + $pv.text(Math.round(progressValue*100)/100 + '%'); + var $pb = $table.find('tr[id="'+id+'"]').find('.progressContainer'); + $pb.css({ + width: (progressValue/100)*188+'px' }); next(again); @@ -82,7 +104,7 @@ define([ var b64Key = Nacl.util.encodeBase64(key); Cryptpad.replaceHash(Cryptpad.getFileHashFromKeys(id, b64Key)); - $form.hide(); + //$form.hide(); APP.toolbar.addElement(['fileshare'], {}); @@ -94,11 +116,15 @@ define([ APP.toolbar.title.show(); console.log(title); Cryptpad.alert(Messages._getKey('upload_success', [title])); + queue.inProgress = false; + queue.next(); }); }; Cryptpad.uploadStatus(estimate, function (e, pending) { if (e) { + queue.inProgress = false; + queue.next(); if (e === 'TOO_LARGE') { return void Cryptpad.alert(Messages.upload_tooLarge); } @@ -110,7 +136,7 @@ define([ } if (pending) { - // TODO queue uploads... ? + // TODO keep this message in case of pending files in another window? return void Cryptpad.confirm(Messages.upload_uploadPending, function (yes) { if (!yes) { return; } Cryptpad.uploadCancel(function (e, res) { @@ -126,6 +152,48 @@ define([ }); }; + var prettySize = function (bytes) { + var kB = Cryptpad.bytesToKilobytes(bytes); + if (kB < 1024) { return kB + Messages.KB; } + var mB = Cryptpad.bytesToMegabytes(bytes); + return mB + Messages.MB; + }; + + queue.next = function () { + if (queue.queue.length === 0) { return; } + if (queue.inProgress) { return; } + var file = queue.queue.shift(); + upload(file.blob, file.metadata, file.id); + }; + queue.push = function (obj) { + var id = uid(); + obj.id = id; + queue.queue.push(obj); + + $table.show(); + var estimate = FileCrypto.computeEncryptedSize(obj.blob.byteLength, obj.metadata); + + var $progressBar = $('
', {'class':'progressContainer'}); + var $progressValue = $('', {'class':'progressValue'}).text(Messages.upload_pending); + + var $tr = $('', {id: id}).appendTo($table); + + var $cancel = $('', {'class': 'cancel fa fa-times'}).click(function () { + queue.queue = queue.queue.filter(function (el) { return el.id !== id }); + $cancel.remove(); + $tr.find('.upCancel').text('-'); + $tr.find('.progressValue').text(Messages.upload_cancelled); + }); + + var $tr = $('', {id: id}).appendTo($table); + $('').text(obj.metadata.name).appendTo($tr); + $('').text(prettySize(estimate)).appendTo($tr); + $('', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr); + $('', {'class': 'upCancel'}).append($cancel).appendTo($tr); + + queue.next(); + }; + var uploadMode = false; var andThen = function () { @@ -225,9 +293,12 @@ define([ console.log(file); var reader = new FileReader(); reader.onloadend = function () { - upload(this.result, { - name: file.name, - type: file.type, + queue.push({ + blob: this.result, + metadata: { + name: file.name, + type: file.type, + } }); }; reader.readAsArrayBuffer(file);