Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest

Browse source 
* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
This commit is contained in:
Duncan Sommerville 2015-10-29 17:53:45 -04:00
parent c92eceb60d
commit e3feb17f0c
12 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -374,10 +374,10 @@ var AIRTIME = (function(AIRTIME) {
//buildEditMetadataDialog(json);
});
} else if (data.ftype === "playlist" || data.ftype === "block") {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl + 'playlist/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl + 'playlist/edit');
AIRTIME.playlist.validatePlaylistElements();
} else if (data.ftype === "stream") {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl + 'webstream/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl + 'webstream/edit');
}
});
});

4
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1080,12 +1080,12 @@ var AIRTIME = (function(AIRTIME) {
};
} else if (data.ftype === "playlist" || data.ftype === "block") {
callback = function() {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl+'playlist/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl+'playlist/edit');
AIRTIME.playlist.validatePlaylistElements();
};
} else if (data.ftype === "stream") {
callback = function() {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl + 'webstream/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl + 'webstream/edit');
}
} else {
throw new Exception($.i18n._("Unknown type: ") + data.ftype);

2
airtime_mvc/public/js/airtime/library/podcast.js
View file

@ -137,7 +137,7 @@ var AIRTIME = (function (AIRTIME) {
* Called when editing one or more podcasts.
*
* @param data JSON data returned from the server.
* Contains stringified podcast object JSON and tab
* Contains a JSON encoded podcast object and tab
* content HTML and has the following form:
* {
* podcast: '{

2
airtime_mvc/public/js/airtime/library/publish.js
View file

@ -119,7 +119,7 @@ var AIRTIME = (function (AIRTIME) {
jQuery.get(dialogUrl, { csrf_token: jQuery("#csrf").val() })
.success(function(html) {
var tab = AIRTIME.tabs.openTab(html, mediaId, null);
var tab = AIRTIME.tabs.openTab(html, PUBLISH_APP_NAME+"_"+mediaId, null);
_bootstrapAngularApp(mediaId, tab);
});

3
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -1117,14 +1117,13 @@ var AIRTIME = (function(AIRTIME){
AIRTIME.tabs.openTab(json.html, uid, AIRTIME.playlist._initFileMdEvents);
};
mod.fnEdit = function(id, type, url) {
mod.fnEdit = function(id, uid, url) {
//openPlaylistPanel();
stopAudioPreview();
$.post(url,
{format: "json", id: id, type: type},
function(json) {
var uid = AIRTIME.library.MediaTypeFullToStringEnum.type+"_"+id;
AIRTIME.tabs.openTab(json.html, uid, AIRTIME.playlist._initPlaylistTabEvents);
redrawLib();
});