Merge branch '2.3.x' into devel

install_minimal/include/airtime-copy-files.sh

@@ -84,6 +84,7 @@ ln -sf /usr/lib/airtime/utils/airtime-check-system /usr/bin/airtime-check-system
 ln -sf /usr/lib/airtime/utils/airtime-log /usr/bin/airtime-log
 ln -sf /usr/lib/airtime/utils/airtime-test-soundcard /usr/bin/airtime-test-soundcard
 ln -sf /usr/lib/airtime/utils/airtime-test-stream /usr/bin/airtime-test-stream
+ln -sf /usr/lib/airtime/utils/airtime-silan /usr/bin/airtime-silan
 
 echo "* Creating /var/log/airtime"
 mkdir -p /var/log/airtime

utils/airtime-silan

@@ -0,0 +1,42 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+#   Copyright (c) 2011 Sourcefabric O.P.S.
+#
+#   This file is part of the Airtime project.
+#   http://airtime.sourcefabric.org/
+#
+#   Airtime is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   Airtime is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Airtime; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
+#  This script handles update cue-in/cue-out points for files that already exist
+#  in Airtime's library.
+#
+exec 2>&1
+airtime_silan_script="airtime-silan.py"
+api_client_path="/usr/lib/airtime/"
+
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
+. ${virtualenv_bin}activate
+
+export PYTHONPATH=${api_client_path}
+
+# Absolute path to this script
+SCRIPT=`readlink -f $0`
+# Absolute directory this script is in
+SCRIPTPATH=`dirname $SCRIPT`
+
+cd $SCRIPTPATH
+python ${airtime_silan_script}

utils/airtime-silan.py

@@ -1,11 +1,12 @@
-import logging
+from configobj import ConfigObj
 from api_clients import api_client as apc
+
+import logging
 import json
 import shutil
 import commands
 import os
 import sys
-from configobj import ConfigObj
 import subprocess
 import traceback
 
@@ -19,16 +20,16 @@ logging.disable(50)
 # add ch to logger
 logger.addHandler(ch)
 
-if (os.geteuid() != 0):
+if os.geteuid() != 0:
     print 'Must be a root user.'
-    sys.exit()
+    sys.exit(1)
 
 # loading config file
 try:
     config = ConfigObj('/etc/airtime/media-monitor.cfg')
 except Exception, e:
     print('Error loading config file: %s', e)
-    sys.exit()
+    sys.exit(1)
 
 api_client = apc.AirtimeApiClient(config)
 
@@ -51,14 +52,14 @@ try:
             try:
                 command = ['silan', '-f', 'JSON', full_path]
                 proc = subprocess.Popen(command, stdout=subprocess.PIPE)
-                out = proc.stdout.read()
+                out = proc.communicate()[0].strip('\r\n')
                 info = json.loads(out)
                 data = {}
                 data['cuein'] = str('{0:f}'.format(info['sound'][0][0]))
                 data['cueout'] = str('{0:f}'.format(info['sound'][-1][1]))
                 processed_data.append((f['id'], data))
                 total += 1
-                if (total % 5 == 0):
+                if total % 5 == 0:
                     print "Total %s / %s files has been processed.." % (total, total_files)
             except Exception, e:
                 print e
@@ -77,5 +78,3 @@ try:
 except Exception, e:
     print e
     print traceback.format_exc()
-
-#update_cue_values_by_silan

utils/airtime-silan/airtime-silan

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
-invokePwd=$PWD
-
-#airtime_silan_path="/usr/lib/airtime/utils/airtime-silan/"
-airtime_silan_path="/home/james/src/airtime/utils/airtime-silan/"
-airtime_silan_script="airtime-silan.py"
-
-api_client_path="/usr/lib/airtime/"
-cd ${airtime_silan_path}
-
-exec 2>&1
-
-export PYTHONPATH=${api_client_path}
-
-# Note the -u when calling python! we need it to get unbuffered binary stdout and stderr
-exec python -u ${airtime_silan_path}${airtime_silan_script} --dir "$invokePwd" "$@"
-
-# EOF