Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
Martin Konecny
commit
6e239d08e9
|
|
@ -1297,6 +1297,9 @@ SQL;
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check if file exists
|
||||||
|
$qry->add("file_exists", "true", Criteria::EQUAL);
|
||||||
$qry->addAscendingOrderByColumn('random()');
|
$qry->addAscendingOrderByColumn('random()');
|
||||||
}
|
}
|
||||||
// construct limit restriction
|
// construct limit restriction
|
||||||
|
|
|
||||||
|
|
@ -776,9 +776,9 @@ SQL;
|
||||||
$row['image'] = '<img title="Playlist preview" src="/css/images/icon_playlist.png">';
|
$row['image'] = '<img title="Playlist preview" src="/css/images/icon_playlist.png">';
|
||||||
} elseif ($type == "st") {
|
} elseif ($type == "st") {
|
||||||
$row['audioFile'] = $row['id'];
|
$row['audioFile'] = $row['id'];
|
||||||
$row['image'] = '<img title="Webstream preview" src="/css/images/record_icon.png">';
|
$row['image'] = '<img title="Webstream preview" src="/css/images/icon_webstream.png">';
|
||||||
} elseif ($type == "bl") {
|
} elseif ($type == "bl") {
|
||||||
$row['image'] = '<img title="Smart Block" src="/css/images/delete.png">';
|
$row['image'] = '<img title="Smart Block" src="/css/images/icon_smart-block.png">';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<?php echo $this->element->getElement('sb_time_start'); ?>
|
<?php echo $this->element->getElement('sb_time_start'); ?>
|
||||||
<?php echo $this->element->getElement('sb_date_end'); ?>
|
<?php echo $this->element->getElement('sb_date_end'); ?>
|
||||||
<?php echo $this->element->getElement('sb_time_end'); ?>
|
<?php echo $this->element->getElement('sb_time_end'); ?>
|
||||||
<div id="sb_submit" class="ui-button ui-state-default" title="Find Shows">
|
|
||||||
<span class="ui-icon ui-icon-search"></span>
|
<a id="sb_submit" class="btn btn-small" href="#" title="Find Shows">
|
||||||
</div>
|
<i class="icon-white icon-search"></i> Find Shows</a>
|
||||||
<div class="sb-advanced-options">
|
<div class="sb-advanced-options">
|
||||||
<fieldset class="padded display_field push-down-8 closed">
|
<fieldset class="padded display_field push-down-8 closed">
|
||||||
<legend style="cursor: pointer;">
|
<legend style="cursor: pointer;">
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,9 @@
|
||||||
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
|
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
|
||||||
<div class="sb-timerange">
|
<div class="sb-timerange">
|
||||||
<?php if(!$this->disableLib && !$this->showLib):?>
|
<?php if(!$this->disableLib && !$this->showLib):?>
|
||||||
<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
|
<a id="sb_edit" class="btn btn-small" href="#" title="open the library to schedule files.">
|
||||||
<span class="ui-icon ui-icon-arrowthick-1-nw"></span>
|
Schedule files
|
||||||
</div>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php echo $this->sb_form; ?>
|
<?php echo $this->sb_form; ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,7 @@ td.library_bitrate {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.fg-toolbar .btn-toolbar {margin: 6px 5px 6px 2px;}
|
.fg-toolbar .btn-toolbar {margin: 6px 5px -6px 5px;}
|
||||||
|
|
||||||
|
|
||||||
/* ///////////////////// ADVANCED SEARCH ///////////////////// */
|
/* ///////////////////// ADVANCED SEARCH ///////////////////// */
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,45 @@
|
||||||
var AIRTIME = (function(AIRTIME){
|
var AIRTIME = (function(AIRTIME) {
|
||||||
var mod,
|
var mod, DEFAULT_CLASS = 'ui-button ui-state-default', DISABLED_CLASS = 'ui-state-disabled';
|
||||||
DEFAULT_CLASS = 'ui-button ui-state-default',
|
|
||||||
DISABLED_CLASS = 'ui-state-disabled';
|
|
||||||
|
|
||||||
if (AIRTIME.button === undefined) {
|
if (AIRTIME.button === undefined) {
|
||||||
AIRTIME.button = {};
|
AIRTIME.button = {};
|
||||||
}
|
}
|
||||||
mod = AIRTIME.button;
|
mod = AIRTIME.button;
|
||||||
|
|
||||||
mod.isDisabled = function(c) {
|
mod.isDisabled = function(c) {
|
||||||
var button = $("."+c);
|
var button = $("." + c);
|
||||||
|
|
||||||
if (button.hasClass(DISABLED_CLASS)) {
|
if (button.hasClass(DISABLED_CLASS)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.enableButton = function(c) {
|
mod.enableButton = function(c, useParent) {
|
||||||
var button = $("."+c);
|
if (useParent) {
|
||||||
|
var button = $("." + c).parent();
|
||||||
|
} else {
|
||||||
|
var button = $("." + c);
|
||||||
|
}
|
||||||
|
|
||||||
if (button.hasClass(DISABLED_CLASS)) {
|
if (button.hasClass(DISABLED_CLASS)) {
|
||||||
button.removeClass(DISABLED_CLASS);
|
button.removeClass(DISABLED_CLASS);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.disableButton = function(c) {
|
mod.disableButton = function(c, useParent) {
|
||||||
var button = $("."+c);
|
if (useParent) {
|
||||||
|
var button = $("." + c).parent();
|
||||||
|
} else {
|
||||||
|
var button = $("." + c);
|
||||||
|
}
|
||||||
|
|
||||||
if (!button.hasClass(DISABLED_CLASS)) {
|
if (!button.hasClass(DISABLED_CLASS)) {
|
||||||
button.addClass(DISABLED_CLASS);
|
button.addClass(DISABLED_CLASS);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return AIRTIME;
|
return AIRTIME;
|
||||||
|
|
||||||
}(AIRTIME || {}));
|
}(AIRTIME || {}));
|
||||||
|
|
@ -1,169 +1,156 @@
|
||||||
var AIRTIME = (function(AIRTIME){
|
var AIRTIME = (function(AIRTIME) {
|
||||||
var mod;
|
var mod;
|
||||||
|
|
||||||
if (AIRTIME.library === undefined) {
|
if (AIRTIME.library === undefined) {
|
||||||
AIRTIME.library = {};
|
AIRTIME.library = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
mod = AIRTIME.library;
|
mod = AIRTIME.library;
|
||||||
|
|
||||||
mod.checkAddButton = function() {
|
mod.checkAddButton = function() {
|
||||||
var selected = mod.getChosenItemsLength(),
|
var selected = mod.getChosenItemsLength(), sortable = $('#spl_sortable'), check = false;
|
||||||
sortable = $('#spl_sortable'),
|
|
||||||
check = false;
|
|
||||||
|
|
||||||
//make sure audioclips are selected and a playlist is currently open.
|
// make sure audioclips are selected and a playlist is currently open.
|
||||||
if (selected !== 0 && sortable.length !== 0) {
|
if (selected !== 0 && sortable.length !== 0) {
|
||||||
check = true;
|
check = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (check === true) {
|
if (check === true) {
|
||||||
AIRTIME.button.enableButton("lib-button-add");
|
AIRTIME.button.enableButton("icon-plus", true);
|
||||||
}
|
} else {
|
||||||
else {
|
AIRTIME.button.disableButton("icon-plus", true);
|
||||||
AIRTIME.button.disableButton("lib-button-add");
|
}
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
|
mod.fnRowCallback = function(nRow, aData, iDisplayIndex, iDisplayIndexFull) {
|
||||||
var $nRow = $(nRow);
|
var $nRow = $(nRow);
|
||||||
if (aData.ftype === "audioclip") {
|
if (aData.ftype === "audioclip") {
|
||||||
$nRow.addClass("lib-audio");
|
$nRow.addClass("lib-audio");
|
||||||
} else if (aData.ftype === "stream"){
|
} else if (aData.ftype === "stream") {
|
||||||
$nRow.addClass("lib-stream");
|
$nRow.addClass("lib-stream");
|
||||||
} else if (aData.ftype === "block") {
|
} else if (aData.ftype === "block") {
|
||||||
$nRow.addClass("lib-block");
|
$nRow.addClass("lib-block");
|
||||||
} else {
|
} else {
|
||||||
$nRow.addClass("lib-pl");
|
$nRow.addClass("lib-pl");
|
||||||
}
|
}
|
||||||
|
|
||||||
$nRow.attr("id", aData["tr_id"])
|
$nRow.attr("id", aData["tr_id"]).data("aData", aData).data("screen",
|
||||||
.data("aData", aData)
|
"playlist");
|
||||||
.data("screen", "playlist");
|
|
||||||
|
|
||||||
if (aData["bl_type"] !== undefined) {
|
if (aData["bl_type"] !== undefined) {
|
||||||
$nRow.attr("bl_type", aData["bl_type"]);
|
$nRow.attr("bl_type", aData["bl_type"]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.fnDrawCallback = function() {
|
mod.fnDrawCallback = function() {
|
||||||
|
|
||||||
mod.redrawChosen();
|
mod.redrawChosen();
|
||||||
mod.checkToolBarIcons();
|
mod.checkToolBarIcons();
|
||||||
|
|
||||||
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl, tr.lib-block').draggable({
|
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl, tr.lib-block')
|
||||||
helper: function(){
|
.draggable(
|
||||||
|
{
|
||||||
|
helper : function() {
|
||||||
|
|
||||||
var $el = $(this),
|
var $el = $(this), selected = mod
|
||||||
selected = mod.getChosenAudioFilesLength(),
|
.getChosenAudioFilesLength(), container, message, li = $("#side_playlist ul li:first"), width = li
|
||||||
container,
|
.width(), height = li.height();
|
||||||
message,
|
|
||||||
li = $("#side_playlist ul li:first"),
|
|
||||||
width = li.width(),
|
|
||||||
height = li.height();
|
|
||||||
|
|
||||||
//dragging an element that has an unselected checkbox.
|
// dragging an element that has an unselected
|
||||||
if (mod.isChosenItem($el) === false) {
|
// checkbox.
|
||||||
selected++;
|
if (mod.isChosenItem($el) === false) {
|
||||||
}
|
selected++;
|
||||||
|
}
|
||||||
|
|
||||||
if (selected === 1) {
|
if (selected === 1) {
|
||||||
message = "Adding 1 Item.";
|
message = "Adding 1 Item.";
|
||||||
}
|
} else {
|
||||||
else {
|
message = "Adding " + selected + " Items.";
|
||||||
message = "Adding "+selected+" Items.";
|
}
|
||||||
}
|
|
||||||
|
|
||||||
container = $('<div class="helper"/>')
|
container = $('<div class="helper"/>').append(
|
||||||
.append("<li/>")
|
"<li/>").find("li").addClass(
|
||||||
.find("li")
|
"ui-state-default").append("<div/>")
|
||||||
.addClass("ui-state-default")
|
.find("div").addClass(
|
||||||
.append("<div/>")
|
"list-item-container").append(
|
||||||
.find("div")
|
message).end().width(width)
|
||||||
.addClass("list-item-container")
|
.height(height).end();
|
||||||
.append(message)
|
|
||||||
.end()
|
|
||||||
.width(width)
|
|
||||||
.height(height)
|
|
||||||
.end();
|
|
||||||
|
|
||||||
return container;
|
return container;
|
||||||
},
|
},
|
||||||
cursor: 'pointer',
|
cursor : 'pointer',
|
||||||
connectToSortable: '#spl_sortable'
|
connectToSortable : '#spl_sortable'
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.dblClickAdd = function(data, type) {
|
mod.dblClickAdd = function(data, type) {
|
||||||
var i,
|
var i, aMediaIds = [];
|
||||||
aMediaIds = [];
|
|
||||||
|
|
||||||
//process selected files/playlists.
|
// process selected files/playlists.
|
||||||
aMediaIds.push(new Array(data.id, data.ftype));
|
aMediaIds.push(new Array(data.id, data.ftype));
|
||||||
|
|
||||||
//check if a playlist/block is open before adding items
|
// check if a playlist/block is open before adding items
|
||||||
if ($('input[id="obj_type"]').val() == 'playlist' || $('input[id="obj_type"]').val() == 'block') {
|
if ($('input[id="obj_type"]').val() == 'playlist'
|
||||||
|
|| $('input[id="obj_type"]').val() == 'block') {
|
||||||
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
|
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.setupLibraryToolbar = function() {
|
mod.setupLibraryToolbar = function() {
|
||||||
var $toolbar = $(".lib-content .fg-toolbar:first");
|
var $toolbar = $(".lib-content .fg-toolbar:first");
|
||||||
|
|
||||||
$toolbar
|
mod.createToolbarButtons();
|
||||||
.append("<ul />")
|
|
||||||
.find('ul')
|
|
||||||
.append('<li class="ui-state-default lib-button-select" title="Select"><span class="ui-icon ui-icon-document-b"></span></li>')
|
|
||||||
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="Add selected library items to the current playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
|
|
||||||
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="Delete selected library items"><span class="ui-icon ui-icon-trash"></span></li>');
|
|
||||||
|
|
||||||
//add to playlist button
|
$toolbar.append($menu);
|
||||||
$toolbar.find('.lib-button-add')
|
|
||||||
.click(function() {
|
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('lib-button-add') === true) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var aData = AIRTIME.library.getSelectedData(),
|
// add to playlist button
|
||||||
i,
|
$toolbar
|
||||||
temp,
|
.find('.icon-plus').parent()
|
||||||
length,
|
.click(function() {
|
||||||
aMediaIds = [];
|
|
||||||
|
|
||||||
//process selected files/playlists.
|
if (AIRTIME.button.isDisabled('icon-plus') === true) {
|
||||||
for (i = 0, length = aData.length; i < length; i++) {
|
return;
|
||||||
temp = aData[i];
|
}
|
||||||
if (temp.ftype === "audioclip" || temp.ftype === "block" ||
|
|
||||||
(temp.ftype === "stream" && $("#obj_type").val() === "playlist")) {
|
|
||||||
aMediaIds.push(new Array (temp.id, temp.ftype));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (aMediaIds.length > 0) {
|
|
||||||
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
|
|
||||||
} else {
|
|
||||||
if ($('#obj_type').val() == 'block') {
|
|
||||||
alert('You can only add tracks to smart blocks.');
|
|
||||||
} else if ($('#obj_type').val() == 'playlist') {
|
|
||||||
alert('You can only add tracks, smart blocks, and webstreams to playlists.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//delete from library.
|
var aData = AIRTIME.library.getSelectedData(), i, temp, length, aMediaIds = [];
|
||||||
$toolbar.find('.lib-button-delete')
|
|
||||||
.click(function() {
|
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('lib-button-delete') === true) {
|
// process selected files/playlists.
|
||||||
return;
|
for (i = 0, length = aData.length; i < length; i++) {
|
||||||
}
|
temp = aData[i];
|
||||||
|
if (temp.ftype === "audioclip"
|
||||||
|
|| temp.ftype === "block"
|
||||||
|
|| (temp.ftype === "stream" && $(
|
||||||
|
"#obj_type").val() === "playlist")) {
|
||||||
|
aMediaIds.push(new Array(temp.id,
|
||||||
|
temp.ftype));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (aMediaIds.length > 0) {
|
||||||
|
AIRTIME.playlist.fnAddItems(aMediaIds,
|
||||||
|
undefined, 'after');
|
||||||
|
} else {
|
||||||
|
if ($('#obj_type').val() == 'block') {
|
||||||
|
alert('You can only add tracks to smart blocks.');
|
||||||
|
} else if ($('#obj_type').val() == 'playlist') {
|
||||||
|
alert('You can only add tracks, smart blocks, and webstreams to playlists.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
AIRTIME.library.fnDeleteSelectedItems();
|
// delete from library.
|
||||||
});
|
$toolbar.find('.icon-trash').parent().click(function() {
|
||||||
|
|
||||||
mod.createToolbarDropDown();
|
if (AIRTIME.button.isDisabled('icon-trash') === true) {
|
||||||
};
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
return AIRTIME;
|
AIRTIME.library.fnDeleteSelectedItems();
|
||||||
|
});
|
||||||
|
|
||||||
|
mod.createToolbarDropDown();
|
||||||
|
};
|
||||||
|
|
||||||
|
return AIRTIME;
|
||||||
|
|
||||||
}(AIRTIME || {}));
|
}(AIRTIME || {}));
|
||||||
|
|
|
||||||
|
|
@ -1,182 +1,173 @@
|
||||||
var AIRTIME = (function(AIRTIME){
|
var AIRTIME = (function(AIRTIME) {
|
||||||
var mod;
|
var mod;
|
||||||
|
|
||||||
if (AIRTIME.library === undefined) {
|
if (AIRTIME.library === undefined) {
|
||||||
AIRTIME.library = {};
|
AIRTIME.library = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
mod = AIRTIME.library;
|
mod = AIRTIME.library;
|
||||||
|
|
||||||
mod.checkAddButton = function() {
|
mod.checkAddButton = function() {
|
||||||
var selected = mod.getChosenItemsLength(),
|
var selected = mod.getChosenItemsLength(), $cursor = $('tr.cursor-selected-row'), check = false;
|
||||||
$cursor = $('tr.cursor-selected-row'),
|
|
||||||
check = false;
|
|
||||||
|
|
||||||
//make sure library items are selected and a cursor is selected.
|
// make sure library items are selected and a cursor is selected.
|
||||||
if (selected !== 0 && $cursor.length !== 0) {
|
if (selected !== 0 && $cursor.length !== 0) {
|
||||||
check = true;
|
check = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (check === true) {
|
if (check === true) {
|
||||||
AIRTIME.button.enableButton("lib-button-add");
|
AIRTIME.button.enableButton("icon-plus", true);
|
||||||
}
|
} else {
|
||||||
else {
|
AIRTIME.button.disableButton("icon-plus", true);
|
||||||
AIRTIME.button.disableButton("lib-button-add");
|
}
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
|
mod.fnRowCallback = function(nRow, aData, iDisplayIndex, iDisplayIndexFull) {
|
||||||
var $nRow = $(nRow);
|
var $nRow = $(nRow);
|
||||||
|
|
||||||
if (aData.ftype === "audioclip") {
|
if (aData.ftype === "audioclip") {
|
||||||
$nRow.addClass("lib-audio");
|
$nRow.addClass("lib-audio");
|
||||||
} else if (aData.ftype === "stream"){
|
} else if (aData.ftype === "stream") {
|
||||||
$nRow.addClass("lib-stream");
|
$nRow.addClass("lib-stream");
|
||||||
} else {
|
} else {
|
||||||
$nRow.addClass("lib-pl");
|
$nRow.addClass("lib-pl");
|
||||||
}
|
}
|
||||||
|
|
||||||
$nRow.attr("id", aData["tr_id"])
|
$nRow.attr("id", aData["tr_id"]).data("aData", aData).data("screen",
|
||||||
.data("aData", aData)
|
"timeline");
|
||||||
.data("screen", "timeline");
|
};
|
||||||
};
|
|
||||||
|
|
||||||
mod.fnDrawCallback = function fnLibDrawCallback() {
|
mod.fnDrawCallback = function fnLibDrawCallback() {
|
||||||
|
|
||||||
mod.redrawChosen();
|
mod.redrawChosen();
|
||||||
mod.checkToolBarIcons();
|
mod.checkToolBarIcons();
|
||||||
|
|
||||||
$('#library_display tr.lib-audio, tr.lib-pl, tr.lib-stream').draggable({
|
$('#library_display tr.lib-audio, tr.lib-pl, tr.lib-stream')
|
||||||
helper: function(){
|
.draggable(
|
||||||
|
{
|
||||||
|
helper : function() {
|
||||||
|
|
||||||
var $el = $(this),
|
var $el = $(this), selected = mod
|
||||||
selected = mod.getChosenItemsLength(),
|
.getChosenItemsLength(), container, thead = $("#show_builder_table thead"), colspan = thead
|
||||||
container,
|
.find("th").length, width = thead.find(
|
||||||
thead = $("#show_builder_table thead"),
|
"tr:first").width(), message;
|
||||||
colspan = thead.find("th").length,
|
|
||||||
width = thead.find("tr:first").width(),
|
|
||||||
message;
|
|
||||||
|
|
||||||
//dragging an element that has an unselected checkbox.
|
// dragging an element that has an unselected
|
||||||
if (mod.isChosenItem($el) === false) {
|
// checkbox.
|
||||||
selected++;
|
if (mod.isChosenItem($el) === false) {
|
||||||
}
|
selected++;
|
||||||
|
}
|
||||||
|
|
||||||
if (selected === 1) {
|
if (selected === 1) {
|
||||||
message = "Adding 1 Item.";
|
message = "Adding 1 Item.";
|
||||||
}
|
} else {
|
||||||
else {
|
message = "Adding " + selected + " Items.";
|
||||||
message = "Adding "+selected+" Items.";
|
}
|
||||||
}
|
|
||||||
|
|
||||||
container = $('<div/>').attr('id', 'draggingContainer')
|
container = $('<div/>').attr('id',
|
||||||
.append('<tr/>')
|
'draggingContainer').append('<tr/>')
|
||||||
.find("tr")
|
.find("tr").append('<td/>').find("td")
|
||||||
.append('<td/>')
|
.attr("colspan", colspan).width(width)
|
||||||
.find("td")
|
.addClass("ui-state-highlight").append(
|
||||||
.attr("colspan", colspan)
|
message).end().end();
|
||||||
.width(width)
|
|
||||||
.addClass("ui-state-highlight")
|
|
||||||
.append(message)
|
|
||||||
.end()
|
|
||||||
.end();
|
|
||||||
|
|
||||||
return container;
|
return container;
|
||||||
},
|
},
|
||||||
cursor: 'pointer',
|
cursor : 'pointer',
|
||||||
connectToSortable: '#show_builder_table'
|
connectToSortable : '#show_builder_table'
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.dblClickAdd = function(data, type) {
|
mod.dblClickAdd = function(data, type) {
|
||||||
var i,
|
var i, length, temp, aMediaIds = [], aSchedIds = [], aData = [];
|
||||||
length,
|
|
||||||
temp,
|
|
||||||
aMediaIds = [],
|
|
||||||
aSchedIds = [],
|
|
||||||
aData = [];
|
|
||||||
|
|
||||||
//process selected files/playlists.
|
// process selected files/playlists.
|
||||||
aMediaIds.push({"id": data.id, "type": type});
|
aMediaIds.push( {
|
||||||
|
"id" : data.id,
|
||||||
|
"type" : type
|
||||||
|
});
|
||||||
|
|
||||||
$("#show_builder_table tr.cursor-selected-row").each(function(i, el){
|
$("#show_builder_table tr.cursor-selected-row").each(function(i, el) {
|
||||||
aData.push($(el).prev().data("aData"));
|
aData.push($(el).prev().data("aData"));
|
||||||
});
|
});
|
||||||
|
|
||||||
//process selected schedule rows to add media after.
|
// process selected schedule rows to add media after.
|
||||||
for (i=0, length = aData.length; i < length; i++) {
|
for (i = 0, length = aData.length; i < length; i++) {
|
||||||
temp = aData[i];
|
temp = aData[i];
|
||||||
aSchedIds.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp});
|
aSchedIds.push( {
|
||||||
|
"id" : temp.id,
|
||||||
|
"instance" : temp.instance,
|
||||||
|
"timestamp" : temp.timestamp
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(aSchedIds.length == 0){
|
if (aSchedIds.length == 0) {
|
||||||
alert("Please select a cursor position on timeline.");
|
alert("Please select a cursor position on timeline.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
console.log(aMediaIds);
|
console.log(aMediaIds);
|
||||||
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
|
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.setupLibraryToolbar = function() {
|
mod.setupLibraryToolbar = function() {
|
||||||
var $toolbar = $(".lib-content .fg-toolbar:first");
|
var $toolbar = $(".lib-content .fg-toolbar:first");
|
||||||
|
|
||||||
$toolbar
|
mod.createToolbarButtons();
|
||||||
.append("<ul />")
|
|
||||||
.find('ul')
|
|
||||||
.append('<li class="ui-state-default lib-button-select" title="Select"><span class="ui-icon ui-icon-document-b"></span></li>')
|
|
||||||
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="Add library items after selected cursors in the timeline"><span class="ui-icon ui-icon-plusthick"></span></li>')
|
|
||||||
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="Delete selected library items"><span class="ui-icon ui-icon-trash"></span></li>');
|
|
||||||
|
|
||||||
//add to timeline button
|
$toolbar.append($menu);
|
||||||
$toolbar.find('.lib-button-add')
|
// add to timeline button
|
||||||
.click(function() {
|
$toolbar
|
||||||
|
.find('.icon-plus').parent()
|
||||||
|
.click(
|
||||||
|
function() {
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('lib-button-add') === true) {
|
if (AIRTIME.button.isDisabled('icon-plus') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var selected = AIRTIME.library.getSelectedData(),
|
var selected = AIRTIME.library.getSelectedData(), data, i, length, temp, aMediaIds = [], aSchedIds = [], aData = [];
|
||||||
data,
|
|
||||||
i,
|
|
||||||
length,
|
|
||||||
temp,
|
|
||||||
aMediaIds = [],
|
|
||||||
aSchedIds = [],
|
|
||||||
aData = [];
|
|
||||||
|
|
||||||
//process selected files/playlists.
|
// process selected files/playlists.
|
||||||
for (i = 0, length = selected.length; i < length; i++) {
|
for (i = 0, length = selected.length; i < length; i++) {
|
||||||
data = selected[i];
|
data = selected[i];
|
||||||
aMediaIds.push({"id": data.id, "type": data.ftype});
|
aMediaIds.push( {
|
||||||
}
|
"id" : data.id,
|
||||||
|
"type" : data.ftype
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
$("#show_builder_table tr.cursor-selected-row").each(function(i, el){
|
$("#show_builder_table tr.cursor-selected-row")
|
||||||
aData.push($(el).prev().data("aData"));
|
.each(function(i, el) {
|
||||||
});
|
aData.push($(el).prev().data("aData"));
|
||||||
|
});
|
||||||
|
|
||||||
//process selected schedule rows to add media after.
|
// process selected schedule rows to add media
|
||||||
for (i=0, length = aData.length; i < length; i++) {
|
// after.
|
||||||
temp = aData[i];
|
for (i = 0, length = aData.length; i < length; i++) {
|
||||||
aSchedIds.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp});
|
temp = aData[i];
|
||||||
}
|
aSchedIds.push( {
|
||||||
|
"id" : temp.id,
|
||||||
|
"instance" : temp.instance,
|
||||||
|
"timestamp" : temp.timestamp
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
|
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
|
||||||
});
|
});
|
||||||
|
|
||||||
//delete from library.
|
// delete from library.
|
||||||
$toolbar.find('.lib-button-delete')
|
$toolbar.find('.icon-trash').parent().click(function() {
|
||||||
.click(function() {
|
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('lib-button-delete') === true) {
|
if (AIRTIME.button.isDisabled('icon-trash') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AIRTIME.library.fnDeleteSelectedItems();
|
AIRTIME.library.fnDeleteSelectedItems();
|
||||||
});
|
});
|
||||||
|
|
||||||
mod.createToolbarDropDown();
|
mod.createToolbarDropDown();
|
||||||
};
|
};
|
||||||
|
|
||||||
return AIRTIME;
|
return AIRTIME;
|
||||||
|
|
||||||
}(AIRTIME || {}));
|
}(AIRTIME || {}));
|
||||||
|
|
|
||||||
|
|
@ -96,18 +96,35 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
return count;
|
return count;
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.createToolbarDropDown = function() {
|
mod.createToolbarButtons = function() {
|
||||||
|
$menu = $("<div class='btn-toolbar' />");
|
||||||
|
$menu
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
|
||||||
|
"Select <span class='caret'></span>" +
|
||||||
|
"</button>" +
|
||||||
|
"<ul class='dropdown-menu'>" +
|
||||||
|
"<li id='sb-select-page'><a href='#'>Select this page</a></li>" +
|
||||||
|
"<li id='sb-dselect-page'><a href='#'>Deselect this page</a></li>" +
|
||||||
|
"<li id='sb-dselect-all'><a href='#'>Deselect all</a></li>" +
|
||||||
|
"</ul>" +
|
||||||
|
"</div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button class='btn btn-small'>" +
|
||||||
|
"<i class='icon-white icon-plus'></i> Add to current playlist" +
|
||||||
|
"</button>" +
|
||||||
|
"</div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button class='btn btn-small' id='sb-trash'>" +
|
||||||
|
"<i class='icon-white icon-trash'></i>" +
|
||||||
|
"</button>" +
|
||||||
|
"</div>");
|
||||||
|
}
|
||||||
|
|
||||||
$.contextMenu({
|
mod.createToolbarDropDown = function() {
|
||||||
selector: '#library_content .ui-icon-document-b',
|
$('#sb-select-page').click(function(){mod.selectCurrentPage();});
|
||||||
trigger: "left",
|
$('#sb-dselect-page').click(function(){mod.deselectCurrentPage();});
|
||||||
ignoreRightClick: true,
|
$('#sb-dselect-all').click(function(){mod.selectNone();});
|
||||||
items: {
|
|
||||||
"sp": {name: "Select This Page", callback: mod.selectCurrentPage},
|
|
||||||
"dp": {name: "Deselect This Page", callback: mod.deselectCurrentPage},
|
|
||||||
"sn": {name: "Deselect All", callback: mod.selectNone}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mod.checkDeleteButton = function() {
|
mod.checkDeleteButton = function() {
|
||||||
|
|
@ -119,10 +136,10 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (check === true) {
|
if (check === true) {
|
||||||
AIRTIME.button.enableButton("lib-button-delete");
|
AIRTIME.button.enableButton("btn-group #sb-trash", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("lib-button-delete");
|
AIRTIME.button.disableButton("btn-group #sb-trash", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -307,6 +307,7 @@ var AIRTIME = (function(AIRTIME){
|
||||||
setCueEvents();
|
setCueEvents();
|
||||||
setFadeEvents();
|
setFadeEvents();
|
||||||
setModified(json.modified);
|
setModified(json.modified);
|
||||||
|
AIRTIME.playlist.validatePlaylistElements();
|
||||||
redrawLib();
|
redrawLib();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -410,8 +411,6 @@ var AIRTIME = (function(AIRTIME){
|
||||||
$pl.delegate(".spl_cue",
|
$pl.delegate(".spl_cue",
|
||||||
{"click": openCueEditor});
|
{"click": openCueEditor});
|
||||||
|
|
||||||
mod.validatePlaylistElements();
|
|
||||||
|
|
||||||
$pl.delegate(".spl_block_expand",
|
$pl.delegate(".spl_block_expand",
|
||||||
{"click": function(ev){
|
{"click": function(ev){
|
||||||
var id = parseInt($(this).attr("id").split("_").pop(), 10);
|
var id = parseInt($(this).attr("id").split("_").pop(), 10);
|
||||||
|
|
@ -773,6 +772,7 @@ var AIRTIME = (function(AIRTIME){
|
||||||
}());
|
}());
|
||||||
|
|
||||||
$pl.find("#spl_sortable").sortable(sortableConf);
|
$pl.find("#spl_sortable").sortable(sortableConf);
|
||||||
|
AIRTIME.playlist.validatePlaylistElements();
|
||||||
}
|
}
|
||||||
|
|
||||||
mod.fnNew = function() {
|
mod.fnNew = function() {
|
||||||
|
|
|
||||||
|
|
@ -66,10 +66,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
var $selectable = $sbTable.find("tbody").find("input:checkbox");
|
var $selectable = $sbTable.find("tbody").find("input:checkbox");
|
||||||
|
|
||||||
if ($selectable.length !== 0) {
|
if ($selectable.length !== 0) {
|
||||||
AIRTIME.button.enableButton("sb-button-select");
|
AIRTIME.button.enableButton("btn-group #timeline-select", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("sb-button-select");
|
AIRTIME.button.disableButton("btn-group #timeline-select", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -77,10 +77,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
var $over = $sbTable.find(".sb-over.sb-allowed");
|
var $over = $sbTable.find(".sb-over.sb-allowed");
|
||||||
|
|
||||||
if ($over.length !== 0) {
|
if ($over.length !== 0) {
|
||||||
AIRTIME.button.enableButton("sb-button-trim");
|
AIRTIME.button.enableButton("icon-cut", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("sb-button-trim");
|
AIRTIME.button.disableButton("icon-cut", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -88,10 +88,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
|
var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
|
||||||
|
|
||||||
if ($selected.length !== 0) {
|
if ($selected.length !== 0) {
|
||||||
AIRTIME.button.enableButton("sb-button-delete");
|
AIRTIME.button.enableButton("icon-trash", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("sb-button-delete");
|
AIRTIME.button.disableButton("icon-trash", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -99,10 +99,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
var $current = $sbTable.find("."+NOW_PLAYING_CLASS);
|
var $current = $sbTable.find("."+NOW_PLAYING_CLASS);
|
||||||
|
|
||||||
if ($current.length !== 0) {
|
if ($current.length !== 0) {
|
||||||
AIRTIME.button.enableButton("sb-button-current");
|
AIRTIME.button.enableButton("icon-step-forward", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("sb-button-current");
|
AIRTIME.button.disableButton("icon-step-forward", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -113,10 +113,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
userType = localStorage.getItem('user-type');
|
userType = localStorage.getItem('user-type');
|
||||||
|
|
||||||
if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
|
if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
|
||||||
AIRTIME.button.enableButton("sb-button-cancel");
|
AIRTIME.button.enableButton("icon-ban-circle", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
AIRTIME.button.disableButton("sb-button-cancel");
|
AIRTIME.button.disableButton("icon-ban-circle", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -333,15 +333,15 @@ var AIRTIME = (function(AIRTIME){
|
||||||
/*
|
/*
|
||||||
* Icon hover states in the toolbar.
|
* Icon hover states in the toolbar.
|
||||||
*/
|
*/
|
||||||
$sbContent.on("mouseenter", ".fg-toolbar ul li", function(ev) {
|
$sbContent.on("mouseenter", "#timeline-select .dropdown-toggle", function(ev) {
|
||||||
$el = $(this);
|
$el = $(this);
|
||||||
|
|
||||||
if (!$el.hasClass("ui-state-disabled")) {
|
if (!$el.hasClass("ui-state-disabled")) {
|
||||||
$el.addClass("ui-state-hover");
|
$el.addClass("ui-state-hover");
|
||||||
$("#show_builder .ui-icon-document-b").contextMenu(true);
|
$("#timeline-select .caret").contextMenu(true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#show_builder .ui-icon-document-b").contextMenu(false);
|
$("#timeline-select .caret").contextMenu(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
|
$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
|
||||||
|
|
@ -959,36 +959,43 @@ var AIRTIME = (function(AIRTIME){
|
||||||
//start setup of the builder toolbar.
|
//start setup of the builder toolbar.
|
||||||
$toolbar = $(".sb-content .fg-toolbar");
|
$toolbar = $(".sb-content .fg-toolbar");
|
||||||
|
|
||||||
$ul = $("<ul/>");
|
$menu = $("<div class='btn-toolbar'/>");
|
||||||
$ul.append('<li class="ui-state-default sb-button-select" title="Select"><span class="ui-icon ui-icon-document-b"></span></li>')
|
$menu.append("<div class='btn-group'>" +
|
||||||
.append('<li class="ui-state-default ui-state-disabled sb-button-trim" title="Remove all overbooked tracks"><span class="ui-icon ui-icon-scissors"></span></li>')
|
"<button class='btn btn-small dropdown-toggle' id='timeline-select' data-toggle='dropdown'>" +
|
||||||
.append('<li class="ui-state-default ui-state-disabled sb-button-delete" title="Remove selected scheduled items"><span class="ui-icon ui-icon-trash"></span></li>');
|
"Select <span class='caret'></span>" +
|
||||||
$toolbar.append($ul);
|
"</button>" +
|
||||||
|
"<ul class='dropdown-menu'>" +
|
||||||
|
"<li id='timeline-sa'><a href='#'>Select all</a></li>" +
|
||||||
|
"<li id='timeline-sn'><a href='#'>Select none</a></li>" +
|
||||||
|
"</ul>" +
|
||||||
|
"</div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button title='Remove overbooked tracks' class='ui-state-disabled btn btn-small'>" +
|
||||||
|
"<i class='icon-white icon-cut'></i></button></div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button title='Remove selected scheduled items' class='ui-state-disabled btn btn-small'>" +
|
||||||
|
"<i class='icon-white icon-trash'></i></button></div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button title='Jump to the current playing track' class='ui-state-disabled btn btn-small'>" +
|
||||||
|
"<i class='icon-white icon-step-forward'></i></button></div>")
|
||||||
|
.append("<div class='btn-group'>" +
|
||||||
|
"<button title='Cancel current show' class='ui-state-disabled btn btn-small btn-danger'>" +
|
||||||
|
"<i class='icon-white icon-ban-circle'></i></button></div>");
|
||||||
|
|
||||||
$ul = $("<ul/>");
|
$toolbar.append($menu);
|
||||||
$ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>')
|
$menu = undefined;
|
||||||
.append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>');
|
|
||||||
$toolbar.append($ul);
|
|
||||||
$ul = undefined;
|
|
||||||
|
|
||||||
$.contextMenu({
|
$('#timeline-sa').click(function(){mod.selectAll();});
|
||||||
selector: '#show_builder .ui-icon-document-b',
|
$('#timeline-sn').click(function(){mod.selectNone();});
|
||||||
trigger: "left",
|
|
||||||
ignoreRightClick: true,
|
|
||||||
items: {
|
|
||||||
"sa": {name: "Select All", callback: mod.selectAll},
|
|
||||||
"sn": {name: "Select None", callback: mod.selectNone}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//jump to current
|
//cancel current show
|
||||||
$toolbar.find('.sb-button-cancel')
|
$toolbar.find('.icon-ban-circle')
|
||||||
.click(function() {
|
.click(function() {
|
||||||
var $tr,
|
var $tr,
|
||||||
data,
|
data,
|
||||||
msg = 'Cancel Current Show?';
|
msg = 'Cancel Current Show?';
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('sb-button-cancel') === true) {
|
if (AIRTIME.button.isDisabled('icon-ban-circle') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1016,10 +1023,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
});
|
});
|
||||||
|
|
||||||
//jump to current
|
//jump to current
|
||||||
$toolbar.find('.sb-button-current')
|
$toolbar.find('.icon-step-forward')
|
||||||
.click(function() {
|
.click(function() {
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('sb-button-current') === true) {
|
if (AIRTIME.button.isDisabled('icon-step-forward') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1033,10 +1040,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
});
|
});
|
||||||
|
|
||||||
//delete overbooked tracks.
|
//delete overbooked tracks.
|
||||||
$toolbar.find('.sb-button-trim')
|
$toolbar.find('.icon-cut')
|
||||||
.click(function() {
|
.click(function() {
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('sb-button-trim') === true) {
|
if (AIRTIME.button.isDisabled('icon-cut') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1053,10 +1060,10 @@ var AIRTIME = (function(AIRTIME){
|
||||||
});
|
});
|
||||||
|
|
||||||
//delete selected tracks
|
//delete selected tracks
|
||||||
$toolbar.find('.sb-button-delete')
|
$toolbar.find('.icon-trash')
|
||||||
.click(function() {
|
.click(function() {
|
||||||
|
|
||||||
if (AIRTIME.button.isDisabled('sb-button-delete') === true) {
|
if (AIRTIME.button.isDisabled('icon-trash') === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ AIRTIME = (function(AIRTIME) {
|
||||||
timeStartId = "#sb_time_start",
|
timeStartId = "#sb_time_start",
|
||||||
dateEndId = "#sb_date_end",
|
dateEndId = "#sb_date_end",
|
||||||
timeEndId = "#sb_time_end",
|
timeEndId = "#sb_time_end",
|
||||||
$toggleLib = $('<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files."><span class="ui-icon ui-icon-arrowthick-1-nw"></span></div>'),
|
$toggleLib = $("<a id='sb_edit' class='btn btn-small' href='#' title='Open library to schedule files'>Schedule files</a>"),
|
||||||
$libClose = $('<a />', {
|
$libClose = $('<a />', {
|
||||||
"class": "close-round",
|
"class": "close-round",
|
||||||
"href": "#",
|
"href": "#",
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
Before you overwrite dataTables.ColVis.js, note that we have changed a few lines
|
||||||
|
in this file.
|
||||||
|
|
||||||
|
The following function has been modified:
|
||||||
|
|
||||||
|
_fnDomBaseButton
|
||||||
|
|
||||||
|
The new _fnDomBaseButton looks like this:
|
||||||
|
|
||||||
|
"_fnDomBaseButton": function ( text )
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
nButton = document.createElement('button'),
|
||||||
|
nSpan = document.createElement('span'),
|
||||||
|
sEvent = this.s.activate=="mouseover" ? "mouseover" : "click";
|
||||||
|
|
||||||
|
//nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
|
||||||
|
//"ColVis_Button TableTools_Button ui-button ui-state-default";
|
||||||
|
nButton.className = "btn-toolbar btn btn-small dropdown-toggle ColVis_MasterButton";
|
||||||
|
|
||||||
|
nButton.appendChild( nSpan );
|
||||||
|
$(nButton).append("<span class='caret'></span>");
|
||||||
|
nSpan.innerHTML = text;
|
||||||
|
|
||||||
|
$(nButton).bind( 'click', function (e) {
|
||||||
|
that._fnCollectionShow();
|
||||||
|
e.preventDefault();
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nButton;
|
||||||
|
},
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,995 @@
|
||||||
|
/*
|
||||||
|
* File: ColVis.js
|
||||||
|
* Version: 1.0.7
|
||||||
|
* CVS: $Id$
|
||||||
|
* Description: Controls for column visiblity in DataTables
|
||||||
|
* Author: Allan Jardine (www.sprymedia.co.uk)
|
||||||
|
* Created: Wed Sep 15 18:23:29 BST 2010
|
||||||
|
* Modified: $Date$ by $Author$
|
||||||
|
* Language: Javascript
|
||||||
|
* License: GPL v2 or BSD 3 point style
|
||||||
|
* Project: Just a little bit of fun :-)
|
||||||
|
* Contact: www.sprymedia.co.uk/contact
|
||||||
|
*
|
||||||
|
* Copyright 2010-2011 Allan Jardine, all rights reserved.
|
||||||
|
*
|
||||||
|
* This source file is free software, under either the GPL v2 license or a
|
||||||
|
* BSD style license, available at:
|
||||||
|
* http://datatables.net/license_gpl2
|
||||||
|
* http://datatables.net/license_bsd
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function($) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ColVis provides column visiblity control for DataTables
|
||||||
|
* @class ColVis
|
||||||
|
* @constructor
|
||||||
|
* @param {object} DataTables settings object
|
||||||
|
*/
|
||||||
|
ColVis = function( oDTSettings, oInit )
|
||||||
|
{
|
||||||
|
/* Santiy check that we are a new instance */
|
||||||
|
if ( !this.CLASS || this.CLASS != "ColVis" )
|
||||||
|
{
|
||||||
|
alert( "Warning: ColVis must be initialised with the keyword 'new'" );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oInit == 'undefined' )
|
||||||
|
{
|
||||||
|
oInit = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Public class variables
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @namespace Settings object which contains customisable information for ColVis instance
|
||||||
|
*/
|
||||||
|
this.s = {
|
||||||
|
/**
|
||||||
|
* DataTables settings object
|
||||||
|
* @property dt
|
||||||
|
* @type Object
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"dt": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Customisation object
|
||||||
|
* @property oInit
|
||||||
|
* @type Object
|
||||||
|
* @default passed in
|
||||||
|
*/
|
||||||
|
"oInit": oInit,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callback function to tell the user when the state has changed
|
||||||
|
* @property fnStateChange
|
||||||
|
* @type function
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"fnStateChange": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mode of activation. Can be 'click' or 'mouseover'
|
||||||
|
* @property activate
|
||||||
|
* @type String
|
||||||
|
* @default click
|
||||||
|
*/
|
||||||
|
"activate": "click",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Position of the collection menu when shown - align "left" or "right"
|
||||||
|
* @property sAlign
|
||||||
|
* @type String
|
||||||
|
* @default right
|
||||||
|
*/
|
||||||
|
"sAlign": "left",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Text used for the button
|
||||||
|
* @property buttonText
|
||||||
|
* @type String
|
||||||
|
* @default Show / hide columns
|
||||||
|
*/
|
||||||
|
"buttonText": "Show / hide columns",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Flag to say if the collection is hidden
|
||||||
|
* @property hidden
|
||||||
|
* @type boolean
|
||||||
|
* @default true
|
||||||
|
*/
|
||||||
|
"hidden": true,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List of columns (integers) which should be excluded from the list
|
||||||
|
* @property aiExclude
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
"aiExclude": [],
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store the original viisbility settings so they could be restored
|
||||||
|
* @property abOriginal
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
"abOriginal": [],
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show Show-All button
|
||||||
|
* @property bShowAll
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
"bShowAll": false,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show All button text
|
||||||
|
* @property sShowAll
|
||||||
|
* @type String
|
||||||
|
* @default Restore original
|
||||||
|
*/
|
||||||
|
"sShowAll": "Show All",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show restore button
|
||||||
|
* @property bRestore
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
"bRestore": false,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restore button text
|
||||||
|
* @property sRestore
|
||||||
|
* @type String
|
||||||
|
* @default Restore original
|
||||||
|
*/
|
||||||
|
"sRestore": "Restore original",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overlay animation duration in mS
|
||||||
|
* @property iOverlayFade
|
||||||
|
* @type Integer
|
||||||
|
* @default 500
|
||||||
|
*/
|
||||||
|
"iOverlayFade": 500,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Label callback for column names. Takes three parameters: 1. the column index, 2. the column
|
||||||
|
* title detected by DataTables and 3. the TH node for the column
|
||||||
|
* @property fnLabel
|
||||||
|
* @type Function
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"fnLabel": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicate if ColVis should automatically calculate the size of buttons or not. The default
|
||||||
|
* is for it to do so. Set to "css" to disable the automatic sizing
|
||||||
|
* @property sSize
|
||||||
|
* @type String
|
||||||
|
* @default auto
|
||||||
|
*/
|
||||||
|
"sSize": "auto",
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicate if the column list should be positioned by Javascript, visually below the button
|
||||||
|
* or allow CSS to do the positioning
|
||||||
|
* @property bCssPosition
|
||||||
|
* @type boolean
|
||||||
|
* @default false
|
||||||
|
*/
|
||||||
|
"bCssPosition": false
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @namespace Common and useful DOM elements for the class instance
|
||||||
|
*/
|
||||||
|
this.dom = {
|
||||||
|
/**
|
||||||
|
* Wrapper for the button - given back to DataTables as the node to insert
|
||||||
|
* @property wrapper
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"wrapper": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Activation button
|
||||||
|
* @property button
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"button": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Collection list node
|
||||||
|
* @property collection
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"collection": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Background node used for shading the display and event capturing
|
||||||
|
* @property background
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"background": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Element to position over the activation button to catch mouse events when using mouseover
|
||||||
|
* @property catcher
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"catcher": null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List of button elements
|
||||||
|
* @property buttons
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
"buttons": [],
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restore button
|
||||||
|
* @property restore
|
||||||
|
* @type Node
|
||||||
|
* @default null
|
||||||
|
*/
|
||||||
|
"restore": null
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Store global reference */
|
||||||
|
ColVis.aInstances.push( this );
|
||||||
|
|
||||||
|
/* Constructor logic */
|
||||||
|
this.s.dt = oDTSettings;
|
||||||
|
this._fnConstruct();
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ColVis.prototype = {
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Public methods
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rebuild the list of buttons for this instance (i.e. if there is a column header update)
|
||||||
|
* @method fnRebuild
|
||||||
|
* @returns void
|
||||||
|
*/
|
||||||
|
"fnRebuild": function ()
|
||||||
|
{
|
||||||
|
/* Remove the old buttons */
|
||||||
|
for ( var i=this.dom.buttons.length-1 ; i>=0 ; i-- )
|
||||||
|
{
|
||||||
|
if ( this.dom.buttons[i] !== null )
|
||||||
|
{
|
||||||
|
this.dom.collection.removeChild( this.dom.buttons[i] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.dom.buttons.splice( 0, this.dom.buttons.length );
|
||||||
|
|
||||||
|
if ( this.dom.restore )
|
||||||
|
{
|
||||||
|
this.dom.restore.parentNode( this.dom.restore );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Re-add them (this is not the optimal way of doing this, it is fast and effective) */
|
||||||
|
this._fnAddButtons();
|
||||||
|
|
||||||
|
/* Update the checkboxes */
|
||||||
|
this._fnDrawCallback();
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Private methods (they are of course public in JS, but recommended as private)
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor logic
|
||||||
|
* @method _fnConstruct
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnConstruct": function ()
|
||||||
|
{
|
||||||
|
this._fnApplyCustomisation();
|
||||||
|
|
||||||
|
var that = this;
|
||||||
|
this.dom.wrapper = document.createElement('div');
|
||||||
|
this.dom.wrapper.className = "ColVis TableTools";
|
||||||
|
|
||||||
|
this.dom.button = this._fnDomBaseButton( this.s.buttonText );
|
||||||
|
this.dom.button.className += " ColVis_MasterButton";
|
||||||
|
this.dom.wrapper.appendChild( this.dom.button );
|
||||||
|
|
||||||
|
this.dom.catcher = this._fnDomCatcher();
|
||||||
|
this.dom.collection = this._fnDomCollection();
|
||||||
|
this.dom.background = this._fnDomBackground();
|
||||||
|
|
||||||
|
this._fnAddButtons();
|
||||||
|
|
||||||
|
/* Store the original visbility information */
|
||||||
|
for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
this.s.abOriginal.push( this.s.dt.aoColumns[i].bVisible );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Update on each draw */
|
||||||
|
this.s.dt.aoDrawCallback.push( {
|
||||||
|
"fn": function () {
|
||||||
|
that._fnDrawCallback.call( that );
|
||||||
|
},
|
||||||
|
"sName": "ColVis"
|
||||||
|
} );
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply any customisation to the settings from the DataTables initialisation
|
||||||
|
* @method _fnApplyCustomisation
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnApplyCustomisation": function ()
|
||||||
|
{
|
||||||
|
var oConfig = this.s.oInit;
|
||||||
|
|
||||||
|
if ( typeof oConfig.activate != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.activate = oConfig.activate;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.buttonText != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.buttonText = oConfig.buttonText;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.aiExclude != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.aiExclude = oConfig.aiExclude;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.bRestore != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.bRestore = oConfig.bRestore;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.sRestore != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.sRestore = oConfig.sRestore;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.bShowAll != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.bShowAll = oConfig.bShowAll;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.sShowAll != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.sShowAll = oConfig.sShowAll;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.sAlign != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.sAlign = oConfig.sAlign;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.fnStateChange != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.fnStateChange = oConfig.fnStateChange;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.iOverlayFade != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.iOverlayFade = oConfig.iOverlayFade;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.fnLabel != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.fnLabel = oConfig.fnLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.sSize != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.sSize = oConfig.sSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( typeof oConfig.bCssPosition != 'undefined' )
|
||||||
|
{
|
||||||
|
this.s.bCssPosition = oConfig.bCssPosition;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On each table draw, check the visiblity checkboxes as needed. This allows any process to
|
||||||
|
* update the table's column visiblity and ColVis will still be accurate.
|
||||||
|
* @method _fnDrawCallback
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDrawCallback": function ()
|
||||||
|
{
|
||||||
|
var aoColumns = this.s.dt.aoColumns;
|
||||||
|
|
||||||
|
for ( var i=0, iLen=aoColumns.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( this.dom.buttons[i] !== null )
|
||||||
|
{
|
||||||
|
if ( aoColumns[i].bVisible )
|
||||||
|
{
|
||||||
|
$('input', this.dom.buttons[i]).attr('checked','checked');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$('input', this.dom.buttons[i]).removeAttr('checked');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loop through the columns in the table and as a new button for each one.
|
||||||
|
* @method _fnAddButtons
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnAddButtons": function ()
|
||||||
|
{
|
||||||
|
var
|
||||||
|
nButton,
|
||||||
|
sExclude = ","+this.s.aiExclude.join(',')+",";
|
||||||
|
|
||||||
|
for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( sExclude.indexOf( ","+i+"," ) == -1 )
|
||||||
|
{
|
||||||
|
nButton = this._fnDomColumnButton( i );
|
||||||
|
this.dom.buttons.push( nButton );
|
||||||
|
this.dom.collection.appendChild( nButton );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.dom.buttons.push( null );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( this.s.bRestore )
|
||||||
|
{
|
||||||
|
nButton = this._fnDomRestoreButton();
|
||||||
|
nButton.className += " ColVis_Restore";
|
||||||
|
this.dom.buttons.push( nButton );
|
||||||
|
this.dom.collection.appendChild( nButton );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( this.s.bShowAll )
|
||||||
|
{
|
||||||
|
nButton = this._fnDomShowAllButton();
|
||||||
|
nButton.className += " ColVis_ShowAll";
|
||||||
|
this.dom.buttons.push( nButton );
|
||||||
|
this.dom.collection.appendChild( nButton );
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a button which allows a "restore" action
|
||||||
|
* @method _fnDomRestoreButton
|
||||||
|
* @returns {Node} Created button
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomRestoreButton": function ()
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
nButton = document.createElement('button'),
|
||||||
|
nSpan = document.createElement('span');
|
||||||
|
|
||||||
|
nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
|
||||||
|
"ColVis_Button TableTools_Button ui-button ui-state-default";
|
||||||
|
nButton.appendChild( nSpan );
|
||||||
|
$(nSpan).html( '<span class="ColVis_title">'+this.s.sRestore+'</span>' );
|
||||||
|
|
||||||
|
$(nButton).click( function (e) {
|
||||||
|
for ( var i=0, iLen=that.s.abOriginal.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
that.s.dt.oInstance.fnSetColumnVis( i, that.s.abOriginal[i], false );
|
||||||
|
}
|
||||||
|
that._fnAdjustOpenRows();
|
||||||
|
that.s.dt.oInstance.fnDraw( false );
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nButton;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a button which allows a "show all" action
|
||||||
|
* @method _fnDomShowAllButton
|
||||||
|
* @returns {Node} Created button
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomShowAllButton": function ()
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
nButton = document.createElement('button'),
|
||||||
|
nSpan = document.createElement('span');
|
||||||
|
|
||||||
|
nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
|
||||||
|
"ColVis_Button TableTools_Button ui-button ui-state-default";
|
||||||
|
nButton.appendChild( nSpan );
|
||||||
|
$(nSpan).html( '<span class="ColVis_title">'+this.s.sShowAll+'</span>' );
|
||||||
|
|
||||||
|
$(nButton).click( function (e) {
|
||||||
|
for ( var i=0, iLen=that.s.abOriginal.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if (that.s.aiExclude.indexOf(i) === -1)
|
||||||
|
{
|
||||||
|
that.s.dt.oInstance.fnSetColumnVis( i, true, false );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
that._fnAdjustOpenRows();
|
||||||
|
that.s.dt.oInstance.fnDraw( false );
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nButton;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the DOM for a show / hide button
|
||||||
|
* @method _fnDomColumnButton
|
||||||
|
* @param {int} i Column in question
|
||||||
|
* @returns {Node} Created button
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomColumnButton": function ( i )
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
oColumn = this.s.dt.aoColumns[i],
|
||||||
|
nButton = document.createElement('button'),
|
||||||
|
nSpan = document.createElement('span'),
|
||||||
|
dt = this.s.dt;
|
||||||
|
|
||||||
|
nButton.className = !dt.bJUI ? "ColVis_Button TableTools_Button" :
|
||||||
|
"ColVis_Button TableTools_Button ui-button ui-state-default";
|
||||||
|
nButton.appendChild( nSpan );
|
||||||
|
var sTitle = this.s.fnLabel===null ? oColumn.sTitle : this.s.fnLabel( i, oColumn.sTitle, oColumn.nTh );
|
||||||
|
$(nSpan).html(
|
||||||
|
'<span class="ColVis_radio"><input type="checkbox"/></span>'+
|
||||||
|
'<span class="ColVis_title">'+sTitle+'</span>' );
|
||||||
|
|
||||||
|
$(nButton).click( function (e) {
|
||||||
|
var showHide = !$('input', this).is(":checked");
|
||||||
|
if ( e.target.nodeName.toLowerCase() == "input" )
|
||||||
|
{
|
||||||
|
showHide = $('input', this).is(":checked");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Need to consider the case where the initialiser created more than one table - change the
|
||||||
|
* API index that DataTables is using
|
||||||
|
*/
|
||||||
|
var oldIndex = $.fn.dataTableExt.iApiIndex;
|
||||||
|
$.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
|
||||||
|
|
||||||
|
// Optimisation for server-side processing when scrolling - don't do a full redraw
|
||||||
|
if ( dt.oFeatures.bServerSide && (dt.oScroll.sX !== "" || dt.oScroll.sY !== "" ) )
|
||||||
|
{
|
||||||
|
that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
|
||||||
|
that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );
|
||||||
|
that._fnDrawCallback();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
that.s.dt.oInstance.fnSetColumnVis( i, showHide );
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */
|
||||||
|
|
||||||
|
if ( that.s.fnStateChange !== null )
|
||||||
|
{
|
||||||
|
that.s.fnStateChange.call( that, i, showHide );
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nButton;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the position in the DataTables instance array of the table for this instance of ColVis
|
||||||
|
* @method _fnDataTablesApiIndex
|
||||||
|
* @returns {int} Index
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDataTablesApiIndex": function ()
|
||||||
|
{
|
||||||
|
for ( var i=0, iLen=this.s.dt.oInstance.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( this.s.dt.oInstance[i] == this.s.dt.nTable )
|
||||||
|
{
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the DOM needed for the button and apply some base properties. All buttons start here
|
||||||
|
* @method _fnDomBaseButton
|
||||||
|
* @param {String} text Button text
|
||||||
|
* @returns {Node} DIV element for the button
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomBaseButton": function ( text )
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
nButton = document.createElement('button'),
|
||||||
|
nSpan = document.createElement('span'),
|
||||||
|
sEvent = this.s.activate=="mouseover" ? "mouseover" : "click";
|
||||||
|
|
||||||
|
nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
|
||||||
|
"ColVis_Button TableTools_Button ui-button ui-state-default";
|
||||||
|
nButton.appendChild( nSpan );
|
||||||
|
nSpan.innerHTML = text;
|
||||||
|
|
||||||
|
$(nButton).bind( sEvent, function (e) {
|
||||||
|
that._fnCollectionShow();
|
||||||
|
e.preventDefault();
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nButton;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the element used to contain list the columns (it is shown and hidden as needed)
|
||||||
|
* @method _fnDomCollection
|
||||||
|
* @returns {Node} div container for the collection
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomCollection": function ()
|
||||||
|
{
|
||||||
|
var that = this;
|
||||||
|
var nHidden = document.createElement('div');
|
||||||
|
nHidden.style.display = "none";
|
||||||
|
nHidden.className = !this.s.dt.bJUI ? "ColVis_collection TableTools_collection" :
|
||||||
|
"ColVis_collection TableTools_collection ui-buttonset ui-buttonset-multi";
|
||||||
|
|
||||||
|
if ( !this.s.bCssPosition )
|
||||||
|
{
|
||||||
|
nHidden.style.position = "absolute";
|
||||||
|
}
|
||||||
|
$(nHidden).css('opacity', 0);
|
||||||
|
|
||||||
|
return nHidden;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An element to be placed on top of the activate button to catch events
|
||||||
|
* @method _fnDomCatcher
|
||||||
|
* @returns {Node} div container for the collection
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomCatcher": function ()
|
||||||
|
{
|
||||||
|
var
|
||||||
|
that = this,
|
||||||
|
nCatcher = document.createElement('div');
|
||||||
|
nCatcher.className = "ColVis_catcher TableTools_catcher";
|
||||||
|
|
||||||
|
$(nCatcher).click( function () {
|
||||||
|
that._fnCollectionHide.call( that, null, null );
|
||||||
|
} );
|
||||||
|
|
||||||
|
return nCatcher;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the element used to shade the background, and capture hide events (it is shown and
|
||||||
|
* hidden as needed)
|
||||||
|
* @method _fnDomBackground
|
||||||
|
* @returns {Node} div container for the background
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnDomBackground": function ()
|
||||||
|
{
|
||||||
|
var that = this;
|
||||||
|
|
||||||
|
var nBackground = document.createElement('div');
|
||||||
|
nBackground.style.position = "absolute";
|
||||||
|
nBackground.style.left = "0px";
|
||||||
|
nBackground.style.top = "0px";
|
||||||
|
nBackground.className = "ColVis_collectionBackground TableTools_collectionBackground";
|
||||||
|
$(nBackground).css('opacity', 0);
|
||||||
|
|
||||||
|
$(nBackground).click( function () {
|
||||||
|
that._fnCollectionHide.call( that, null, null );
|
||||||
|
} );
|
||||||
|
|
||||||
|
/* When considering a mouse over action for the activation, we also consider a mouse out
|
||||||
|
* which is the same as a mouse over the background - without all the messing around of
|
||||||
|
* bubbling events. Use the catcher element to avoid messing around with bubbling
|
||||||
|
*/
|
||||||
|
if ( this.s.activate == "mouseover" )
|
||||||
|
{
|
||||||
|
$(nBackground).mouseover( function () {
|
||||||
|
that.s.overcollection = false;
|
||||||
|
that._fnCollectionHide.call( that, null, null );
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
return nBackground;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the show / hide list and the background
|
||||||
|
* @method _fnCollectionShow
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnCollectionShow": function ()
|
||||||
|
{
|
||||||
|
var that = this, i, iLen;
|
||||||
|
var oPos = $(this.dom.button).offset();
|
||||||
|
var nHidden = this.dom.collection;
|
||||||
|
var nBackground = this.dom.background;
|
||||||
|
var iDivX = parseInt(oPos.left, 10);
|
||||||
|
var iDivY = parseInt(oPos.top + $(this.dom.button).outerHeight(), 10);
|
||||||
|
|
||||||
|
if ( !this.s.bCssPosition )
|
||||||
|
{
|
||||||
|
nHidden.style.top = iDivY+"px";
|
||||||
|
nHidden.style.left = iDivX+"px";
|
||||||
|
}
|
||||||
|
nHidden.style.display = "block";
|
||||||
|
$(nHidden).css('opacity',0);
|
||||||
|
|
||||||
|
var iWinHeight = $(window).height(), iDocHeight = $(document).height(),
|
||||||
|
iWinWidth = $(window).width(), iDocWidth = $(document).width();
|
||||||
|
|
||||||
|
nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px";
|
||||||
|
nBackground.style.width = ((iWinWidth<iDocWidth)? iWinWidth : iDocWidth) +"px";
|
||||||
|
|
||||||
|
var oStyle = this.dom.catcher.style;
|
||||||
|
oStyle.height = $(this.dom.button).outerHeight()+"px";
|
||||||
|
oStyle.width = $(this.dom.button).outerWidth()+"px";
|
||||||
|
oStyle.top = oPos.top+"px";
|
||||||
|
oStyle.left = iDivX+"px";
|
||||||
|
|
||||||
|
document.body.appendChild( nBackground );
|
||||||
|
document.body.appendChild( nHidden );
|
||||||
|
document.body.appendChild( this.dom.catcher );
|
||||||
|
|
||||||
|
/* Resize the buttons */
|
||||||
|
if ( this.s.sSize == "auto" )
|
||||||
|
{
|
||||||
|
var aiSizes = [];
|
||||||
|
this.dom.collection.style.width = "auto";
|
||||||
|
for ( i=0, iLen=this.dom.buttons.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( this.dom.buttons[i] !== null )
|
||||||
|
{
|
||||||
|
this.dom.buttons[i].style.width = "auto";
|
||||||
|
aiSizes.push( $(this.dom.buttons[i]).outerWidth() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
iMax = Math.max.apply(window, aiSizes);
|
||||||
|
for ( i=0, iLen=this.dom.buttons.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( this.dom.buttons[i] !== null )
|
||||||
|
{
|
||||||
|
this.dom.buttons[i].style.width = iMax+"px";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.dom.collection.style.width = iMax+"px";
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Visual corrections to try and keep the collection visible */
|
||||||
|
if ( !this.s.bCssPosition )
|
||||||
|
{
|
||||||
|
nHidden.style.left = this.s.sAlign=="left" ?
|
||||||
|
iDivX+"px" : (iDivX-$(nHidden).outerWidth()+$(this.dom.button).outerWidth())+"px";
|
||||||
|
|
||||||
|
var iDivWidth = $(nHidden).outerWidth();
|
||||||
|
var iDivHeight = $(nHidden).outerHeight();
|
||||||
|
|
||||||
|
if ( iDivX + iDivWidth > iDocWidth )
|
||||||
|
{
|
||||||
|
nHidden.style.left = (iDocWidth-iDivWidth)+"px";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This results in a very small delay for the end user but it allows the animation to be
|
||||||
|
* much smoother. If you don't want the animation, then the setTimeout can be removed
|
||||||
|
*/
|
||||||
|
setTimeout( function () {
|
||||||
|
$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
|
||||||
|
$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
|
||||||
|
/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
|
||||||
|
* reflected. As such, we need to do it here, once it is visible. Unbelievable.
|
||||||
|
*/
|
||||||
|
if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
|
||||||
|
{
|
||||||
|
that._fnDrawCallback();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, 10 );
|
||||||
|
|
||||||
|
this.s.hidden = false;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hide the show / hide list and the background
|
||||||
|
* @method _fnCollectionHide
|
||||||
|
* @returns void
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
"_fnCollectionHide": function ( )
|
||||||
|
{
|
||||||
|
var that = this;
|
||||||
|
|
||||||
|
if ( !this.s.hidden && this.dom.collection !== null )
|
||||||
|
{
|
||||||
|
this.s.hidden = true;
|
||||||
|
|
||||||
|
$(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
|
||||||
|
this.style.display = "none";
|
||||||
|
} );
|
||||||
|
|
||||||
|
$(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
|
||||||
|
document.body.removeChild( that.dom.background );
|
||||||
|
document.body.removeChild( that.dom.catcher );
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Alter the colspan on any fnOpen rows
|
||||||
|
*/
|
||||||
|
"_fnAdjustOpenRows": function ()
|
||||||
|
{
|
||||||
|
var aoOpen = this.s.dt.aoOpenRows;
|
||||||
|
var iVisible = this.s.dt.oApi._fnVisbleColumns( this.s.dt );
|
||||||
|
|
||||||
|
for ( var i=0, iLen=aoOpen.length ; i<iLen ; i++ ) {
|
||||||
|
aoOpen[i].nTr.getElementsByTagName('td')[0].colSpan = iVisible;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Static object methods
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rebuild the collection for a given table, or all tables if no parameter given
|
||||||
|
* @method ColVis.fnRebuild
|
||||||
|
* @static
|
||||||
|
* @param object oTable DataTable instance to consider - optional
|
||||||
|
* @returns void
|
||||||
|
*/
|
||||||
|
ColVis.fnRebuild = function ( oTable )
|
||||||
|
{
|
||||||
|
var nTable = null;
|
||||||
|
if ( typeof oTable != 'undefined' )
|
||||||
|
{
|
||||||
|
nTable = oTable.fnSettings().nTable;
|
||||||
|
}
|
||||||
|
|
||||||
|
for ( var i=0, iLen=ColVis.aInstances.length ; i<iLen ; i++ )
|
||||||
|
{
|
||||||
|
if ( typeof oTable == 'undefined' || nTable == ColVis.aInstances[i].s.dt.nTable )
|
||||||
|
{
|
||||||
|
ColVis.aInstances[i].fnRebuild();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Static object propterties
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Collection of all ColVis instances
|
||||||
|
* @property ColVis.aInstances
|
||||||
|
* @static
|
||||||
|
* @type Array
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
ColVis.aInstances = [];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Constants
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Name of this class
|
||||||
|
* @constant CLASS
|
||||||
|
* @type String
|
||||||
|
* @default ColVis
|
||||||
|
*/
|
||||||
|
ColVis.prototype.CLASS = "ColVis";
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ColVis version
|
||||||
|
* @constant VERSION
|
||||||
|
* @type String
|
||||||
|
* @default See code
|
||||||
|
*/
|
||||||
|
ColVis.VERSION = "1.0.7";
|
||||||
|
ColVis.prototype.VERSION = ColVis.VERSION;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* Initialisation
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Register a new feature with DataTables
|
||||||
|
*/
|
||||||
|
if ( typeof $.fn.dataTable == "function" &&
|
||||||
|
typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
|
||||||
|
$.fn.dataTableExt.fnVersionCheck('1.7.0') )
|
||||||
|
{
|
||||||
|
$.fn.dataTableExt.aoFeatures.push( {
|
||||||
|
"fnInit": function( oDTSettings ) {
|
||||||
|
var init = (typeof oDTSettings.oInit.oColVis == 'undefined') ?
|
||||||
|
{} : oDTSettings.oInit.oColVis;
|
||||||
|
var oColvis = new ColVis( oDTSettings, init );
|
||||||
|
return oColvis.dom.wrapper;
|
||||||
|
},
|
||||||
|
"cFeature": "C",
|
||||||
|
"sFeature": "ColVis"
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert( "Warning: ColVis requires DataTables 1.7 or greater - www.datatables.net/download");
|
||||||
|
}
|
||||||
|
|
||||||
|
})(jQuery);
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import mutagen
|
import mutagen
|
||||||
import math
|
|
||||||
import os
|
import os
|
||||||
import copy
|
import copy
|
||||||
import wave
|
|
||||||
import contextlib
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from mutagen.easymp4 import EasyMP4KeyError
|
from mutagen.easymp4 import EasyMP4KeyError
|
||||||
|
|
||||||
from media.monitor.exceptions import BadSongFile
|
from media.monitor.exceptions import BadSongFile
|
||||||
from media.monitor.log import Loggable
|
from media.monitor.log import Loggable
|
||||||
|
from media.monitor.pure import format_length
|
||||||
import media.monitor.pure as mmp
|
import media.monitor.pure as mmp
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
@ -96,24 +94,6 @@ truncate_table = {
|
||||||
'MDATA_KEY_COPYRIGHT' : 512,
|
'MDATA_KEY_COPYRIGHT' : 512,
|
||||||
}
|
}
|
||||||
|
|
||||||
def format_length(mutagen_length):
|
|
||||||
"""
|
|
||||||
Convert mutagen length to airtime length
|
|
||||||
"""
|
|
||||||
t = float(mutagen_length)
|
|
||||||
h = int(math.floor(t / 3600))
|
|
||||||
t = t % 3600
|
|
||||||
m = int(math.floor(t / 60))
|
|
||||||
s = t % 60
|
|
||||||
# will be ss.uuu
|
|
||||||
s = str(s)
|
|
||||||
seconds = s.split(".")
|
|
||||||
s = seconds[0]
|
|
||||||
# have a maximum of 6 subseconds.
|
|
||||||
if len(seconds[1]) >= 6: ss = seconds[1][0:6]
|
|
||||||
else: ss = seconds[1][0:]
|
|
||||||
return "%s:%s:%s.%s" % (h, m, s, ss)
|
|
||||||
|
|
||||||
def truncate_to_length(item, length):
|
def truncate_to_length(item, length):
|
||||||
if isinstance(item, int): item = str(item)
|
if isinstance(item, int): item = str(item)
|
||||||
if isinstance(item, basestring):
|
if isinstance(item, basestring):
|
||||||
|
|
@ -202,6 +182,11 @@ class Metadata(Loggable):
|
||||||
self.__metadata = Metadata.airtime_dict(full_mutagen)
|
self.__metadata = Metadata.airtime_dict(full_mutagen)
|
||||||
# Now we extra the special values that are calculated from the mutagen
|
# Now we extra the special values that are calculated from the mutagen
|
||||||
# object itself:
|
# object itself:
|
||||||
|
|
||||||
|
# Hickity Hackity for .wav files. Properly do this later
|
||||||
|
if mmp.extension(fpath) == 'wav':
|
||||||
|
full_mutagen.set_length(mmp.read_wave_duration(fpath))
|
||||||
|
|
||||||
for special_key,f in airtime_special.iteritems():
|
for special_key,f in airtime_special.iteritems():
|
||||||
try:
|
try:
|
||||||
new_val = f(full_mutagen)
|
new_val = f(full_mutagen)
|
||||||
|
|
@ -211,15 +196,6 @@ class Metadata(Loggable):
|
||||||
self.logger.info("Could not get special key %s for %s" %
|
self.logger.info("Could not get special key %s for %s" %
|
||||||
(special_key, fpath))
|
(special_key, fpath))
|
||||||
self.logger.info(str(e))
|
self.logger.info(str(e))
|
||||||
|
|
||||||
# Hickity Hackity for .wav files. Properly do this later
|
|
||||||
if mmp.extension(fpath) == 'wav':
|
|
||||||
with contextlib.closing(wave.open(fpath,'r')) as f:
|
|
||||||
frames = f.getnframes()
|
|
||||||
rate = f.getframerate()
|
|
||||||
duration = frames/float(rate)
|
|
||||||
full_mutagen.set_length(duration)
|
|
||||||
|
|
||||||
# Finally, we "normalize" all the metadata here:
|
# Finally, we "normalize" all the metadata here:
|
||||||
self.__metadata = mmp.normalized_metadata(self.__metadata, fpath)
|
self.__metadata = mmp.normalized_metadata(self.__metadata, fpath)
|
||||||
# Now we must load the md5:
|
# Now we must load the md5:
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ from media.monitor.exceptions import BadSongFile
|
||||||
from media.monitor.events import OrganizeFile
|
from media.monitor.events import OrganizeFile
|
||||||
from pydispatch import dispatcher
|
from pydispatch import dispatcher
|
||||||
from os.path import dirname
|
from os.path import dirname
|
||||||
|
import os.path
|
||||||
|
|
||||||
class Organizer(ReportHandler,Loggable):
|
class Organizer(ReportHandler,Loggable):
|
||||||
"""
|
"""
|
||||||
|
|
@ -55,8 +56,13 @@ class Organizer(ReportHandler,Loggable):
|
||||||
# Do we need to "massage" the path using mmp.organized_path?
|
# Do we need to "massage" the path using mmp.organized_path?
|
||||||
target_path = self.recorded_path if event.metadata.is_recorded() \
|
target_path = self.recorded_path if event.metadata.is_recorded() \
|
||||||
else self.target_path
|
else self.target_path
|
||||||
new_path = mmp.organized_path(event.path, target_path,
|
# nasty hack do this properly
|
||||||
event.metadata.extract())
|
owner_id = mmp.owner_id(event.path)
|
||||||
|
if owner_id != -1:
|
||||||
|
target_path = os.path.join(target_path, unicode(owner_id))
|
||||||
|
|
||||||
|
mdata = event.metadata.extract()
|
||||||
|
new_path = mmp.organized_path(event.path, target_path, mdata)
|
||||||
|
|
||||||
# See hack in mmp.magic_move
|
# See hack in mmp.magic_move
|
||||||
def new_dir_watch(d):
|
def new_dir_watch(d):
|
||||||
|
|
@ -68,7 +74,12 @@ class Organizer(ReportHandler,Loggable):
|
||||||
mmp.magic_move(event.path, new_path,
|
mmp.magic_move(event.path, new_path,
|
||||||
after_dir_make=new_dir_watch(dirname(new_path)))
|
after_dir_make=new_dir_watch(dirname(new_path)))
|
||||||
|
|
||||||
owners.add_file_owner(new_path, mmp.owner_id(event.path) )
|
# The reason we need to go around saving the owner in this ass
|
||||||
|
# backwards way is bewcause we are unable to encode the owner id
|
||||||
|
# into the file itself so that the StoreWatchListener listener can
|
||||||
|
# detect it from the file
|
||||||
|
owners.add_file_owner(new_path, owner_id )
|
||||||
|
|
||||||
self.logger.info('Organized: "%s" into "%s"' %
|
self.logger.info('Organized: "%s" into "%s"' %
|
||||||
(event.path, new_path))
|
(event.path, new_path))
|
||||||
except BadSongFile as e:
|
except BadSongFile as e:
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@ import copy
|
||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
import math
|
import math
|
||||||
|
import wave
|
||||||
|
import contextlib
|
||||||
import shutil
|
import shutil
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
|
@ -97,6 +99,13 @@ def is_airtime_recorded(md):
|
||||||
if not 'MDATA_KEY_CREATOR' in md: return False
|
if not 'MDATA_KEY_CREATOR' in md: return False
|
||||||
return md['MDATA_KEY_CREATOR'] == u'Airtime Show Recorder'
|
return md['MDATA_KEY_CREATOR'] == u'Airtime Show Recorder'
|
||||||
|
|
||||||
|
def read_wave_duration(path):
|
||||||
|
with contextlib.closing(wave.open(path,'r')) as f:
|
||||||
|
frames = f.getnframes()
|
||||||
|
rate = f.getframerate()
|
||||||
|
duration = frames/float(rate)
|
||||||
|
return duration
|
||||||
|
|
||||||
def clean_empty_dirs(path):
|
def clean_empty_dirs(path):
|
||||||
"""
|
"""
|
||||||
walks path and deletes every empty directory it finds
|
walks path and deletes every empty directory it finds
|
||||||
|
|
@ -246,8 +255,8 @@ def normalized_metadata(md, original_path):
|
||||||
format_rules = {
|
format_rules = {
|
||||||
'MDATA_KEY_TRACKNUMBER' : parse_int,
|
'MDATA_KEY_TRACKNUMBER' : parse_int,
|
||||||
'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x),
|
'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x),
|
||||||
#'MDATA_KEY_MIME' : lambda x: x.replace('-','/'),
|
|
||||||
'MDATA_KEY_BPM' : lambda x: x[0:8],
|
'MDATA_KEY_BPM' : lambda x: x[0:8],
|
||||||
|
'MDATA_KEY_MIME' : lambda x: x.replace('audio/vorbis','audio/ogg'),
|
||||||
}
|
}
|
||||||
|
|
||||||
new_md = remove_whitespace(new_md) # remove whitespace fields
|
new_md = remove_whitespace(new_md) # remove whitespace fields
|
||||||
|
|
@ -263,16 +272,10 @@ def normalized_metadata(md, original_path):
|
||||||
if new_md['MDATA_KEY_BPM'] is None:
|
if new_md['MDATA_KEY_BPM'] is None:
|
||||||
del new_md['MDATA_KEY_BPM']
|
del new_md['MDATA_KEY_BPM']
|
||||||
|
|
||||||
if is_airtime_recorded(new_md):
|
if not is_airtime_recorded(new_md):
|
||||||
#hour,minute,second,name = new_md['MDATA_KEY_TITLE'].split("-",3)
|
|
||||||
#new_md['MDATA_KEY_TITLE'] = u'%s-%s-%s:%s:%s' % \
|
|
||||||
#(name, new_md['MDATA_KEY_YEAR'], hour, minute, second)
|
|
||||||
# We changed show recorder to output correct metadata for recorded
|
|
||||||
# shows
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
# Read title from filename if it does not exist
|
# Read title from filename if it does not exist
|
||||||
default_title = no_extension_basename(original_path)
|
default_title = no_extension_basename(original_path)
|
||||||
|
default_title = re.sub(r'__\d+\.',u'.', default_title)
|
||||||
if re.match(".+-%s-.+$" % unicode_unknown, default_title):
|
if re.match(".+-%s-.+$" % unicode_unknown, default_title):
|
||||||
default_title = u''
|
default_title = u''
|
||||||
new_md = default_to(dictionary=new_md, keys=['MDATA_KEY_TITLE'],
|
new_md = default_to(dictionary=new_md, keys=['MDATA_KEY_TITLE'],
|
||||||
|
|
@ -306,6 +309,7 @@ def organized_path(old_path, root_path, orig_md):
|
||||||
|
|
||||||
# MDATA_KEY_BITRATE is in bytes/second i.e. (256000) we want to turn this
|
# MDATA_KEY_BITRATE is in bytes/second i.e. (256000) we want to turn this
|
||||||
# into 254kbps
|
# into 254kbps
|
||||||
|
|
||||||
# Some metadata elements cannot be empty, hence we default them to some
|
# Some metadata elements cannot be empty, hence we default them to some
|
||||||
# value just so that we can create a correct path
|
# value just so that we can create a correct path
|
||||||
normal_md = default_to_f(orig_md, path_md, unicode_unknown, default_f)
|
normal_md = default_to_f(orig_md, path_md, unicode_unknown, default_f)
|
||||||
|
|
@ -341,6 +345,8 @@ def organized_path(old_path, root_path, orig_md):
|
||||||
filepath = os.path.join(path, fname)
|
filepath = os.path.join(path, fname)
|
||||||
return filepath
|
return filepath
|
||||||
|
|
||||||
|
# TODO : Get rid of this function and every one of its uses. We no longer use
|
||||||
|
# the md5 signature of a song for anything
|
||||||
def file_md5(path,max_length=100):
|
def file_md5(path,max_length=100):
|
||||||
"""
|
"""
|
||||||
Get md5 of file path (if it exists). Use only max_length characters to save
|
Get md5 of file path (if it exists). Use only max_length characters to save
|
||||||
|
|
@ -353,7 +359,7 @@ def file_md5(path,max_length=100):
|
||||||
# whatever it was able to read which is acceptable behaviour
|
# whatever it was able to read which is acceptable behaviour
|
||||||
m.update(f.read(max_length))
|
m.update(f.read(max_length))
|
||||||
return m.hexdigest()
|
return m.hexdigest()
|
||||||
else: raise ValueError("'%s' must exist to find its md5")
|
else: raise ValueError("'%s' must exist to find its md5" % path)
|
||||||
|
|
||||||
def encode_to(obj, encoding='utf-8'):
|
def encode_to(obj, encoding='utf-8'):
|
||||||
# TODO : add documentation + unit tests for this function
|
# TODO : add documentation + unit tests for this function
|
||||||
|
|
@ -473,12 +479,12 @@ def file_playable(pathname):
|
||||||
"""
|
"""
|
||||||
Returns True if 'pathname' is playable by liquidsoap. False otherwise.
|
Returns True if 'pathname' is playable by liquidsoap. False otherwise.
|
||||||
"""
|
"""
|
||||||
#when there is an single apostrophe inside of a string quoted by
|
# when there is an single apostrophe inside of a string quoted by
|
||||||
#apostrophes, we can only escape it by replace that apostrophe with '\''.
|
# apostrophes, we can only escape it by replace that apostrophe with
|
||||||
#This breaks the string into two, and inserts an escaped single quote in
|
# '\''. This breaks the string into two, and inserts an escaped
|
||||||
#between them. We run the command as pypo because otherwise the target file
|
# single quote in between them. We run the command as pypo because
|
||||||
#is opened with write permissions, and this causes an inotify ON_CLOSE_WRITE
|
# otherwise the target file is opened with write permissions, and
|
||||||
#event to be fired :/
|
# this causes an inotify ON_CLOSE_WRITE event to be fired :/
|
||||||
command = ("airtime-liquidsoap -c 'output.dummy" + \
|
command = ("airtime-liquidsoap -c 'output.dummy" + \
|
||||||
"(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1") % \
|
"(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1") % \
|
||||||
pathname.replace("'", "'\\''")
|
pathname.replace("'", "'\\''")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue