Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
denise 2013-05-09 08:56:03 -04:00
parent 43738b3298 d06b2f3f94
commit 309156afd5
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/library/plupload.js
View File

@ -10,7 +10,7 @@ $(document).ready(function() {
unique_names : 'true', unique_names : 'true',
multiple_queues : 'true', multiple_queues : 'true',
filters : [ filters : [
{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4"} {title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
] ]
}); });

14
install_minimal/airtime-install
View File

@ -27,8 +27,13 @@ rabbitmq_install () {
RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf) RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf)
EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor" EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
rabbitmqctl delete_vhost $RABBITMQ_VHOST rabbitmqctl list_vhosts | grep $RABBITMQ_VHOST
rabbitmqctl delete_user $RABBITMQ_USER RESULT="$?"
if [ $RESULT = "0" ]; then
rabbitmqctl delete_vhost $RABBITMQ_VHOST
rabbitmqctl delete_user $RABBITMQ_USER
fi
rabbitmqctl add_vhost $RABBITMQ_VHOST rabbitmqctl add_vhost $RABBITMQ_VHOST
rabbitmqctl add_user $RABBITMQ_USER $RABBITMQ_PASSWORD rabbitmqctl add_user $RABBITMQ_USER $RABBITMQ_PASSWORD
@ -216,11 +221,12 @@ if [ "$DO_UPGRADE" -eq "0" ]; then
echo "There was an error during install. Exit code $result" echo "There was an error during install. Exit code $result"
exit 1 exit 1
fi fi
rabbitmq_install
fi fi
rabbitmq_install
set -e set -e
export airtime_service_start='t' export airtime_service_start='t'
$SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-copy-files.sh
$SCRIPTPATH/include/airtime-initialize.sh $@ $SCRIPTPATH/include/airtime-initialize.sh $@

1
python_apps/api_clients/api_client.py
View File

@ -145,7 +145,6 @@ class ApiRequest(object):
try: try:
if content_type == 'application/json': if content_type == 'application/json':
data = json.loads(response) data = json.loads(response)
self.logger.debug(data)
return data return data
else: else:
raise InvalidContentType() raise InvalidContentType()

2
python_apps/media-monitor2/media/monitor/pure.py
View File

@ -24,7 +24,7 @@ from configobj import ConfigObj
from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir
supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"wav", supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"wav",
u'm4a', u'mp4'] u'm4a', u'mp4', 'opus']
unicode_unknown = u'unknown' unicode_unknown = u'unknown'