Merge branch '1.9.1' into devel

Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

CREDITS

@@ -1,6 +1,10 @@
 =======
 CREDITS
 =======
+Version 1.9.5
+-------------
+Same as previous version.
+
 Version 1.9.4
 -------------
 Same as previous version.

airtime_mvc/application/models/MusicDir.php

@@ -281,7 +281,6 @@ class Application_Model_MusicDir {
     }
 
     public static function removeWatchedDir($p_dir){
-
         $real_path = realpath($p_dir)."/";
         if($real_path != "/"){
             $p_dir = $real_path;

changelog

@@ -1,3 +1,11 @@
+1.9.5 - Nov 2, 2011
+  *(CC-2743, CC-2769) Fixed problem where Media-Monitor would try to parse a file's metadata while the OS was still copying it
+  *(CC-2882) Fixed a bug where a couldn't unregister an old directory name from Airtime after it was renamed.
+  *(CC-2891) Fixed a bug with parsing Unicode metadata in audio files.
+  *(CC-2972) Fixed a bug where systems behind a firewall would have Airtime services communicating via its external IP.
+  *(CC-2975) Issue with older python-virtualenv identified. Airtime installer now requires virtualenv >= 1.4.9
+  *(CC-3012, CC-3013) Fixed an issue with Media-Monitor crashing when parsing certain audio tracks
+
 1.9.4 - Sept 13, 2011
   *Improvements
     -DEB packages now available for Ubuntu & Debian

install_full/ubuntu/airtime-full-install

@@ -22,18 +22,18 @@ echo "----------------------------------------------------"
 echo " 1. Install Packages"
 echo "----------------------------------------------------"
 
+apt-get update
+
 # Updated package list
 apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \
-php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \
-libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
-libesd0 icecast2 libportaudio2 libsamplerate0 rabbitmq-server patch \
+php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
+libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
+libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
 libvorbis-ocaml
 
-#possibly remove?
-#libvorbis-ocaml-dev
-#libcamomile-ocaml-dev
-
+#install packages with --force-yes option
+apt-get -y --force-yes install libmp3lame-dev lame icecast2
 
 if [ "$?" -ne "0" ]; then
    echo ""

install_minimal/include/airtime-upgrade.php

@@ -80,11 +80,13 @@ if (strcmp($version, "1.9.3") < 0){
 if (strcmp($version, "1.9.4") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
 }
+if (strcmp($version, "1.9.5") < 0){
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.5/airtime-upgrade.php");
+}
 if (strcmp($version, "2.0.0") < 0){
     system("php ".__DIR__."/../upgrades/airtime-2.0.0/airtime-upgrade.php");
 }
 
-
 //set the new version in the database.
 $sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'";
 $CC_DBC->query($sql);

install_minimal/upgrades/airtime-1.9.5/airtime-upgrade.php

@@ -0,0 +1,37 @@
+<?php
+require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
+class Airtime195Upgrade{
+
+    const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
+    const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
+    const CONF_PYPO_GRP = "pypo";
+    
+    
+    public static function BackupHtaccess($phpDir){
+        exec("mkdir -p /tmp");
+        exec("cp $phpDir/public/.htaccess /tmp");
+    }
+    
+    public static function RestoreHtaccess($phpDir){
+        exec("cp /tmp/.htaccess $phpDir/public/");
+        exec("rm -f /tmp/.htaccess");
+    }
+   
+    public static function InstallAirtimePhpServerCode($phpDir)
+    {
+        self::BackupHtaccess($phpDir);
+        
+        $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
+
+        echo "* Installing PHP code to ".$phpDir.PHP_EOL;
+        exec("rm -rf \"$phpDir\"");
+        exec("mkdir -p $phpDir");
+        exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir);
+        
+        self::RestoreHtaccess($phpDir);
+    }
+}
+
+$values = parse_ini_file(Airtime195Upgrade::CONF_FILE_AIRTIME, true);
+$phpDir = $values['general']['airtime_dir'];
+Airtime195Upgrade::InstallAirtimePhpServerCode($phpDir);

python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

@@ -29,7 +29,7 @@ class MediaMonitorCommon:
         
         # if file doesn't have any extension, info[-2] throws exception
         # Hence, checking length of info before we do anything
-        if(len(info) >= 3):
+        if(len(info) >= 2):
             if(info[-2] in self.supported_file_formats):
                 return True
             else:

python_apps/python-virtualenv/virtualenv-install.sh

@@ -19,12 +19,12 @@ EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
 if [ "$?" -eq "0" ]; then
 virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
 else
-# copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/
-# this is due to the bug in virtualenv 1.4.9
-if [ -d "$VIRTUAL_ENV_SHARE" ]; then
-    cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/
-fi
-virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
+    # copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/
+    # this is due to the bug in virtualenv 1.4.9
+    if [ -d "$VIRTUAL_ENV_SHARE" ]; then
+        cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/
+    fi
+    virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1
 fi
 
 echo -e "\n*** Installing Python Libraries ***"