hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LSP - Encryption UI, longer timeout for conversion dir query request + loading message, fixed conversion status request

Browse source
This commit is contained in:
Cat 2013-10-07 12:55:55 +02:00
parent 5078667a86
commit 7211e2ee6d
2 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lsp/functions.js
View file

@ -153,7 +153,7 @@
"command": JSON.stringify(data)
},
'dataType': 'jsonp',
'timeout': 10000,
'timeout': 300000,
'error': function(){},
'success': function(d)
{
@ -400,7 +400,9 @@
"capabilities": {},
"log": {},
"statistics": {},
"conversion": {}
"conversion": {
"status" : ""
}
}, d)
if (settings.settings.LTS == 1) {
$('.LTSonly').show();
@ -738,15 +740,20 @@ function buildLogsTable(){
if (!settings.settings.conversion.query) { settings.settings.conversion.query = {}; }
settings.settings.conversion.query.path = query;
$('#conv-edit-dir').val(query);
$('#conversiondirquery-status').text(' Searching for input files..');
getData(function(data){
var c = data.conversion.query;
var j = 0;
var dir = $('#conv-edit-dir').val();
if (dir.substr(dir.length -1) != '/') { dir += '/'; }
delete settings.settings.conversion.query;
$('#conv-edit-input').html('');
for (var i in c) {
if (c[i]) {
var ext = i.split('.');
ext = ext[ext.length-1];
if ((c[i] == null) && (ext != 'dtsc')) {
$('#conv-edit-input').append(
$('<option>').val($('#conv-edit-dir').val()+i).text(i)
$('<option>').val(dir+i).text(i)
);
j++;
}
@ -757,7 +764,7 @@ function buildLogsTable(){
)
}
conversionSelectInput($('#conv-edit-input').val());
$('#conversiondirquery-status').text('');
});
}
function conversionSelectInput(filename) {

35
lsp/main.js
View file

@ -887,7 +887,10 @@
'preset':
{
'cmd': ''
}
},
'contentkey':'',
'keyid':'',
'keyseed':''
},sdata);
$('#page').append( $('<p>').text(title) );
@ -933,6 +936,31 @@
)
);
// ENCRYPT
$('#editserver').append(
$('<span>').addClass('LTS-only').append(
$('<br>')
).append(
$('<p>').text('Encrypt this stream')
).append(
$('<label>').attr('id','stream-edit-contentkey-label').attr('for','stream-edit-contentkey').text('Content key').append(
$('<input>').attr('type','text').attr('id','stream-edit-contentkey').attr('value', sdata.contentkey)
)
).append(
$('<span>').text('- or -')
).append(
$('<label>').attr('id','stream-edit-keyid-label').attr('for','stream-edit-keyid').text('Key ID').append(
$('<input>').attr('type','text').attr('id','stream-edit-keyid').attr('value', sdata.keyid)
)
).append(
$('<label>').attr('id','stream-edit-keyseed-label').attr('for','stream-edit-keyseed').text('Key seed').append(
$('<input>').attr('type','text').attr('id','stream-edit-keyseed').attr('value', sdata.keyseed)
)
).append(
$('<br>')
)
);
var text = $('#stream-edit-source').val();
//if the source is not live, show any stuff marked as live-only
if(text.charAt(0) == '/')
@ -984,6 +1012,9 @@
sdata.error = null;
sdata.record = r.val();
if (b.val() != '') { sdata.DVR = b.val(); }
sdata.contentkey = $('#stream-edit-contentkey').val();
sdata.contentkey = $('#stream-edit-keyid').val();
sdata.contentkey = $('#stream-edit-keyseed').val();
if(streamname == 'new')
{
@ -1340,6 +1371,8 @@
$('<button>').text('search for input files').click(function(){
conversionDirQuery($('#conv-edit-query').val());
})
).append(
$('<span>').attr('id','conversiondirquery-status')
).append(
$('<div>').attr('id', 'editconversion')
);