web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Embed the mediatag library in the file app

Browse Source
This commit is contained in:
yflory 2017-06-15 14:58:18 +02:00
parent cd5705b3f3
commit 2068a8b85b
3 changed files with 78 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/cryptpad-common.js
View File

@ -962,7 +962,7 @@ define([
data.FM.handleFile(file, ev); data.FM.handleFile(file, ev);
if (callback) { callback(); } if (callback) { callback(); }
}); });
button.click(function () { $input.click(); }) button.click(function () { $input.click(); });
break; break;
case 'template': case 'template':
if (!AppConfig.enableTemplates) { return; } if (!AppConfig.enableTemplates) { return; }

11
www/file/inner.html
View File

@ -21,14 +21,9 @@
data-localization="download_button"></label> data-localization="download_button"></label>
<span class="block" id="progress"></span> <span class="block" id="progress"></span>
</div> </div>
<!--<table id="status" style="display: none;"> <div id="download-view" style="display: none;">
<tr> <media-tag id="encryptedFile"></media-tag>
<td data-localization="upload_name">File name</td> </div>
<td data-localization="upload_size">Size</td>
<td data-localization="upload_progress">Progress</td>
<td data-localization="cancel">Cancel</td>
</tr>
</table>-->
<div id="feedback" class="block hidden"> <div id="feedback" class="block hidden">
</div> </div>
</body> </body>

104
www/file/main.js
View File

@ -23,6 +23,7 @@ define([
var $iframe = $('#pad-iframe').contents(); var $iframe = $('#pad-iframe').contents();
var $form = $iframe.find('#upload-form'); var $form = $iframe.find('#upload-form');
var $dlform = $iframe.find('#download-form'); var $dlform = $iframe.find('#download-form');
var $dlview = $iframe.find('#download-view');
var $label = $form.find('label'); var $label = $form.find('label');
var $progress = $iframe.find('#progress'); var $progress = $iframe.find('#progress');
var $body = $iframe.find('body'); var $body = $iframe.find('body');
@ -94,7 +95,6 @@ define([
Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle); Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle);
if (!uploadMode) { if (!uploadMode) {
$dlform.show();
var src = Cryptpad.getBlobPathFromHex(hexFileName); var src = Cryptpad.getBlobPathFromHex(hexFileName);
var cryptKey = secret.keys && secret.keys.fileKeyStr; var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey); var key = Nacl.util.decodeBase64(cryptKey);
@ -104,42 +104,82 @@ define([
var title = document.title = metadata.name; var title = document.title = metadata.name;
Title.updateTitle(title || Title.defaultTitle); Title.updateTitle(title || Title.defaultTitle);
var displayFile = function (ev) {
console.log(e);
$mt = $dlview.find('media-tag');
var cryptKey = secret.keys && secret.keys.fileKeyStr;
var hexFileName = Cryptpad.base64ToHex(secret.channel);
$mt.attr('src', '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName);
$mt.attr('data-crypto-key', 'cryptpad:'+cryptKey);
$(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent;
if (decrypted.callback) { decrypted.callback(); }
$dlview.show();
$dlform.hide();
if (ev) {
var $dlButton = $dlview.find('media-tag button');
$dlButton.click();
}
Cryptpad.removeLoadingScreen();
})
.on('decryptionError', function (e) {
var error = e.originalEvent;
Cryptpad.alert(error.message);
})
.on('decryptionProgress', function (e) {
var progress = e.originalEvent;
var p = progress.percent +'%';
$progress.width(p);
console.log(progress.percent);
});
require(['/common/media-tag.js'], function (MediaTag) {
/**
* Allowed mime types that have to be set for a rendering after a decryption.
*
* @type {Array}
*/
var allowedMediaTypes = [
'image/png',
'image/jpeg',
'image/jpg',
'image/gif',
'audio/mp3',
'audio/ogg',
'audio/wav',
'audio/webm',
'video/mp4',
'video/ogg',
'video/webm',
'application/pdf',
'application/dash+xml',
'download'
];
MediaTag.CryptoFilter.setAllowedMediaTypes(allowedMediaTypes);
MediaTag($mt[0]);
});
};
var todoBigFile = function (sizeMb) {
$dlform.show();
Cryptpad.removeLoadingScreen(); Cryptpad.removeLoadingScreen();
var decrypting = false; var decrypting = false;
$dlform.find('#dl, #progress').click(function () { var onClick = function () {
if (decrypting) { return; } if (decrypting) { return; }
if (myFile) { return void exportFile(); } if (myFile) { return void exportFile(); }
decrypting = true; decrypting = true;
displayFile();
return Cryptpad.fetch(src, function (e, u8) { };
if (e) { if (sizeMb < 5) { return void onClick(); }
decrypting = false; Cryptpad.removeLoadingScreen();
return void Cryptpad.alert(e); $dlform.find('#dl, #progress').click(onClick);
} };
Cryptpad.getFileSize(window.location.href, function (e, data) {
// now decrypt the u8 if (e) { return void Cryptpad.errorLoadingScreen(e); }
if (!u8 || !u8.length) { var size = Cryptpad.bytesToMegabytes(data);
return void Cryptpad.errorLoadingScreen(e); return void todoBigFile(size);
}
FileCrypto.decrypt(u8, key, function (e, data) {
if (e) {
decrypting = false;
return console.error(e);
}
console.log(data);
var title = document.title = data.metadata.name;
myFile = data.content;
myDataType = data.metadata.type;
Title.updateTitle(title || Title.defaultTitle);
exportFile();
decrypting = false;
}, function (progress) {
var p = progress * 100 +'%';
$progress.width(p);
console.error(progress);
});
});
}); });
}); });
return; return;