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

airtime_mvc/public/js/airtime/library/plupload.js

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

install_minimal/airtime-install

@@ -27,8 +27,13 @@ rabbitmq_install () {
     RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf)
     EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
 
-    rabbitmqctl delete_vhost $RABBITMQ_VHOST
-    rabbitmqctl delete_user $RABBITMQ_USER
+    rabbitmqctl list_vhosts | grep $RABBITMQ_VHOST
+    RESULT="$?"
+
+    if [ $RESULT = "0" ]; then
+        rabbitmqctl delete_vhost $RABBITMQ_VHOST
+        rabbitmqctl delete_user $RABBITMQ_USER
+    fi
 
     rabbitmqctl add_vhost $RABBITMQ_VHOST
     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"
         exit 1
     fi
-
-    rabbitmq_install
 fi
+
+rabbitmq_install
 set -e
 
+
 export airtime_service_start='t'
 $SCRIPTPATH/include/airtime-copy-files.sh
 $SCRIPTPATH/include/airtime-initialize.sh $@

python_apps/api_clients/api_client.py

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

python_apps/media-monitor2/media/monitor/pure.py

@@ -24,7 +24,7 @@ from configobj import ConfigObj
 from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir
 
 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'