Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

airtime_mvc/application/models/MusicDir.php

@@ -82,17 +82,9 @@ class Application_Model_MusicDir {
         $show_instances = $con->query($sql)->fetchAll();
         
         // get all the files on this dir
-        $sql = "SELECT f.id FROM cc_music_dirs as md "
-            ." LEFT JOIN cc_files as f on f.directory = md.id WHERE md.id = $music_dir_id";
-        $files = $con->query($sql)->fetchAll();
-        
-        // set file_exist flag to false
-        foreach ($files as $file_row) {
-            $temp_file = Application_Model_StoredFile::Recall($file_row['id']);
-            if($temp_file != null){
-                $temp_file->setFileExistsFlag(false);
-            }
-        }
+        $sql = "UPDATE cc_files SET file_exists = 'f' WHERE id IN (SELECT f.id FROM cc_music_dirs as md "
+            ." LEFT JOIN cc_files as f on f.directory = md.id WHERE md.id = $music_dir_id)";
+        $affected = $con->exec($sql);
         
         // set RemovedFlag to true
         if ($userAddedWatchedDir) {
@@ -399,14 +391,16 @@ class Application_Model_MusicDir {
      *  otherwise, it will set "Exists" flag to true
     **/ 
     public static function removeWatchedDir($p_dir, $userAddedWatchedDir=true){
+        
+        //make sure that $p_dir has a trailing "/" 
         $real_path = Application_Common_OsPath::normpath($p_dir)."/";
         if($real_path != "/"){
             $p_dir = $real_path;
         }
         $dir = Application_Model_MusicDir::getDirByPath($p_dir);
-        if($dir == NULL){
-            return array("code"=>1,"error"=>"'$p_dir' doesn't exist in the watched list.");
-        }else{
+        if (is_null($dir)) {
+            return array("code"=>1, "error"=>"'$p_dir' doesn't exist in the watched list.");
+        } else {
             $dir->remove($userAddedWatchedDir);
             $data = array();
             $data["directory"] = $p_dir;

airtime_mvc/application/models/Preference.php

@@ -618,7 +618,7 @@ class Application_Model_Preference
         if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development" && function_exists('exec')){
             $version = exec("git rev-parse --short HEAD 2>/dev/null", $out, $return_code);
             if ($return_code == 0){
-                return self::GetValue("system_version")."+".$version;
+                return self::GetValue("system_version")."+".$version.":".time();
             }
         }
         return self::GetValue("system_version");

airtime_mvc/application/models/StoredFile.php

@@ -890,8 +890,7 @@ Logging::log("getting media! - 2");
                 exec($command, $output, $rv);
                 if ($rv != 0 || (!empty($output) && $output[0] == 'TagLib: MPEG::Properties::read() -- Could not find a valid last MPEG frame in the stream.')) {
                     $result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
-                }
-                else {
+                } else {
                     //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation
                     $r = @rename($audio_file, $audio_stor);
 

install_minimal/upgrades/airtime-2.1.3/DbUpgrade.php

@@ -0,0 +1,24 @@
+<?php
+
+/* All functions other than start() should be marked as
+ * private.
+ */
+class AirtimeDatabaseUpgrade{
+
+    public static function start($p_dbValues){
+        echo "* Updating Database".PHP_EOL;
+        self::task0($p_dbValues);
+        echo " * Complete".PHP_EOL;
+    }
+
+    private static function task0($p_dbValues){
+        
+        $username = $p_dbValues['database']['dbuser'];
+        $password = $p_dbValues['database']['dbpass'];
+        $host = $p_dbValues['database']['host'];
+        $database = $p_dbValues['database']['dbname'];
+        $dir = __DIR__;
+        
+        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
+    }
+}

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

@@ -0,0 +1,8 @@
+<?php
+
+require_once 'DbUpgrade.php';
+
+$filename = "/etc/airtime/airtime.conf";
+$values = parse_ini_file($filename, true);
+
+AirtimeDatabaseUpgrade::start($values);

install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql

@@ -0,0 +1,4 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.3');
+
+UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL;