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

conversion edits

Browse source
This commit is contained in:
Cat 2013-08-28 11:07:05 +02:00
parent 025db7d66a
commit a24b7c674e
3 changed files with 55 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lsp/functions.js
View file

@ -733,17 +733,34 @@ function buildLogsTable(){
*/ */
function conversionDirQuery(query) { function conversionDirQuery(query) {
settings.settings.conversion.query = query; settings.settings.conversion.query = query;
$('#conv-edit-dir').val(query);
getData(function(data){ getData(function(data){
var c = data.conversion.arrayoffilenamesreturnedbyquery; var c = data.conversion.query;
//todo change this ^ var j = 0;
$('#conv-edit-input').html('');
for (var i in c) { for (var i in c) {
$('#conv-edit-input').append( if (c[i]) {
$('<option>').value(c[i]) $('#conv-edit-input').append(
); $('<option>').val($('#conv-edit-dir').val()+'/'+i).text(i)
);
j++;
}
} }
if (j == 0) {
$('#conv-edit-input').append(
$('<option>').val('').text('- No suitable files found -')
)
}
conversionSelectInput($('#conv-edit-input').val());
}); });
} }
function conversionSelectInput(filename) {
var filename = filename.split('.');
filename.pop();
filename = filename.join('.');
filename += '.dtsc';
$('#conv-edit-output').val(filename);
}
/** /**
* Tooltip creator - creates a tooltip near the cursor * Tooltip creator - creates a tooltip near the cursor

56
lsp/main.js
View file

@ -1302,14 +1302,17 @@
break; break;
case 'addconversion': case 'addconversion':
var c = settings.settings.conversion; var c = settings.settings.conversion;
var dir = settings.settings.config.basepath || './';
$('#page').append( $('#page').append(
$('<label>').attr('for', 'conv-edit-query').text('Directory').append( $('<label>').attr('for', 'conv-edit-query').text('Directory').append(
$('<input>').attr('type', 'text').attr('id', 'conv-edit-query').attr('value','./') $('<input>').addClass('nocapitals').attr('type', 'text').attr('id', 'conv-edit-query').attr('value',dir)
) )
).append(
$('<input>').attr('type','hidden').attr('id','conv-edit-dir')
).append( ).append(
$('<button>').text('search for input files').click(function(){ $('<button>').text('search for input files').click(function(){
conversionDirQuery($('#conv-edit-query').value); conversionDirQuery($('#conv-edit-query').val());
}) })
).append( ).append(
$('<div>').attr('id', 'editconversion') $('<div>').attr('id', 'editconversion')
@ -1318,18 +1321,13 @@
$('#editconversion').append( $('#editconversion').append(
$('<label>').attr('for', 'conv-edit-input').text('Input file').append( $('<label>').attr('for', 'conv-edit-input').text('Input file').append(
$('<select>').attr('id', 'conv-edit-input').width(237).change(function(){ $('<select>').attr('id', 'conv-edit-input').addClass('nocapitals').width(237).change(function(){
//get the input filename, remove the extension, add the dtsc extension conversionSelectInput($(this).val());
var filename = $(this).value().split();
filename.pop();
filename = filename.join('.');
filename += '.dtsc';
$('#conv-edit-output').text(filename);
}) })
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-output').text('Output file').append( $('<label>').attr('for', 'conv-edit-output').text('Output file').append(
$('<input>').attr('type', 'text').attr('id', 'conv-edit-output') $('<input>').attr('type', 'text').attr('id', 'conv-edit-output').addClass('nocapitals')
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-encoder').text('Encoder').append( $('<label>').attr('for', 'conv-edit-encoder').text('Encoder').append(
@ -1344,12 +1342,12 @@
$('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-video-fps') $('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-video-fps')
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-video-fps').text('Video size').append( $('<label>').attr('for', 'conv-edit-video-height').text('Video height*').append(
$('<input>').attr('type', 'text').attr('placeholder', 'width').attr('id', 'conv-edit-video-width').width(100) $('<input>').attr('type', 'text').attr('placeholder', 'height').attr('id', 'conv-edit-video-height')
).append( )
$('<span>').text('x').width(13).css('text-align','center') ).append(
).append( $('<label>').attr('for', 'conv-edit-video-width').text('Video width*').append(
$('<input>').attr('type', 'text').attr('placeholder', 'height').attr('id', 'conv-edit-video-height').width(100) $('<input>').attr('type', 'text').attr('placeholder', 'width').attr('id', 'conv-edit-video-width')
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-audio-codec').text('Audio codec').append( $('<label>').attr('for', 'conv-edit-audio-codec').text('Audio codec').append(
@ -1359,9 +1357,12 @@
$('<label>').attr('for', 'conv-edit-audio-samplerate').text('Audio samplerate').append( $('<label>').attr('for', 'conv-edit-audio-samplerate').text('Audio samplerate').append(
$('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-audio-samplerate') $('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-audio-samplerate')
) )
).append(
$('<span>').addClass('comment').text('*Fill in either the width or the height. Aspect ratio will be preserved.')
); );
conversionDirQuery('./'); conversionDirQuery(dir);
for (var i in c.encoders) { for (var i in c.encoders) {
$('#conv-edit-encoder').append( $('#conv-edit-encoder').append(
$('<option>').value(c.encoders[i]) $('<option>').value(c.encoders[i])
@ -1373,16 +1374,19 @@
$('<button>').text('Save').click(function(){ $('<button>').text('Save').click(function(){
var cobj = {}; //he object we will save var cobj = {}; //he object we will save
cobj.input = $('#conv-edit-input').value(); cobj.input = $('#conv-edit-input').val();
cobj.output = $('#conv-edit-output').value(); cobj.output = $('#conv-edit-output').val();
cobj.encoder = $('#conv-edit-encoder').value(); cobj.encoder = $('#conv-edit-encoder').val();
cobj.video.codec = $('#conv-edit-video-codec').value(); cobj.video = {};
cobj.video.fpks = $('#conv-edit-video-fps').value() * 1000; //todo: is this correct? cobj.video.codec = $('#conv-edit-video-codec').val();
cobj.video.width = $('#conv-edit-video-width').value(); cobj.video.fpks = $('#conv-edit-video-fps').val() * 1000; //todo: is this correct?
cobj.video.height = $('#conv-edit-video-height').value(); cobj.video.width = $('#conv-edit-video-width').val();
cobj.audio.codec = $('#conv-edit-audio-codec').value(); cobj.video.height = $('#conv-edit-video-height').val();
cobj.audio.samplerate = $('#conv-edit-audio-samplerate').value(); cobj.audio = {};
cobj.audio.codec = $('#conv-edit-audio-codec').val();
cobj.audio.samplerate = $('#conv-edit-audio-samplerate').val();
if (!c.convert) { c.convert = Array(); }
c.convert.push(cobj); c.convert.push(cobj);
loadSettings(function(){ loadSettings(function(){

3
lsp/style.css
View file

@ -120,6 +120,7 @@ button
color: #fff; color: #fff;
border: 0; border: 0;
margin: 0 2px 0 2px; margin: 0 2px 0 2px;
cursor: pointer;
} }
@ -320,7 +321,7 @@ span {
.nocapitals .nocapitals
{ {
text-transform: none ; text-transform: none !important;
} }
#editserver label input #editserver label input