Merge branch '2.2.x' into 2.2.x-saas

Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/forms/EmailServerPreferences.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/Preferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_email_server.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/menu.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml
2012-11-06 17:23:32 -05:00 · 2012-11-06 17:23:32 -05:00 · 272e428fa7
commit 272e428fa7
parent 38d28d3346 fd3305bc4c
19 changed files with 118 additions and 53 deletions
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@ -210,10 +210,23 @@ FROM cc_blockcontents AS pc
 LEFT JOIN cc_files AS f ON pc.file_id=f.id
 LEFT JOIN cc_block AS bl ON pc.block_id = bl.id
 WHERE pc.block_id = :block_id
-ORDER BY pc.position
+
 SQL;

-        $rows = Application_Common_Database::prepareAndExecute($sql, array(':block_id'=>$this->id));
+        if ($filterFiles) {
+            $sql .= <<<SQL
+            AND f.file_exists = :file_exists
+SQL;
+        }
+        $sql .= <<<SQL
+
+ORDER BY pc.position
+SQL;
+        $params = array(':block_id'=>$this->id);
+        if ($filterFiles) {
+            $params[':file_exists'] = $filterFiles;
+        }
+        $rows = Application_Common_Database::prepareAndExecute($sql, $params);

        $offset = 0;
        foreach ($rows as &$row) {
@ -310,6 +323,7 @@ SQL;
            $hour = "00";
            $mins = "00";
            if ($modifier == "minutes") {
+                $mins = $value;
                if ($value >59) {
                    $hour  = intval($value/60);
                    $mins = $value%60;
@ -1177,7 +1191,7 @@ SQL;
        $sizeOfInsert = count($insertList);
        
        // if block is not full and reapeat_track is check, fill up more
-        while (!$isBlockFull && $repeat == 1) {
+        while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) {
            $randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert));
            $insertList[] = $insertList[$randomEleKey];
            $totalTime += $insertList[$randomEleKey]['length'];
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@ -176,6 +176,14 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
            FROM cc_playlistcontents AS pc
            JOIN cc_files AS f ON pc.file_id=f.id
            WHERE pc.playlist_id = :playlist_id1
+SQL;
+
+        if ($filterFiles) {
+            $sql .= <<<SQL
+            AND f.file_exists = :file_exists
+SQL;
+        }
+        $sql .= <<<SQL
              AND TYPE = 0)
         UNION ALL
           (SELECT pc.id AS id,
@ -220,7 +228,13 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
   ORDER BY temp.position;
 SQL;

-        $rows = Application_Common_Database::prepareAndExecute($sql, array(':playlist_id1'=>$this->id, ':playlist_id2'=>$this->id, ':playlist_id3'=>$this->id));
+        $params = array(
+            ':playlist_id1'=>$this->id, ':playlist_id2'=>$this->id, ':playlist_id3'=>$this->id);
+        if ($filterFiles) {
+            $params[':file_exists'] = $filterFiles;
+        }
+
+        $rows = Application_Common_Database::prepareAndExecute($sql, $params);

        $offset = 0;
        foreach ($rows as &$row) {
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@ -193,7 +193,8 @@ class Application_Model_Scheduler
                        }
                    } else {
                        $dynamicFiles = $bl->getListOfFilesUnderLimit();
-                        foreach ($dynamicFiles as $fileId=>$f) {
+                        foreach ($dynamicFiles as $f) {
+                            $fileId = $f['id'];
                            $file = CcFilesQuery::create()->findPk($fileId);
                            if (isset($file) && $file->getDbFileExists()) {
                                $data["id"] = $file->getDbId();
@ -250,7 +251,8 @@ class Application_Model_Scheduler
                }
            } else {
                $dynamicFiles = $bl->getListOfFilesUnderLimit();
-                foreach ($dynamicFiles as $fileId=>$f) {
+                foreach ($dynamicFiles as $f) {
+                    $fileId = $f['id'];
                    $file = CcFilesQuery::create()->findPk($fileId);
                    if (isset($file) && $file->getDbFileExists()) {
                        $data["id"] = $file->getDbId();
@ -445,7 +447,6 @@ class Application_Model_Scheduler
                    } else {
                        $sched = new CcSchedule();
                    }
-                    Logging::info($file);
                    $sched->setDbStarts($nextStartDT)
                        ->setDbEnds($endTimeDT)
                        ->setDbCueIn($file['cuein'])
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@ -359,9 +359,26 @@ SQL;
            Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
        }

-        // set file_exists falg to false
+        // set file_exists flag to false
        $this->_file->setDbFileExists(false);
        $this->_file->save();
+        
+        // need to explicitly update any playlist's and block's length
+        // that contains the file getting deleted
+        $fileId = $this->_file->getDbId();
+        $plRows = CcPlaylistcontentsQuery::create()->filterByDbFileId()->find();
+        foreach ($plRows as $row) {
+            $pl = CcPlaylistQuery::create()->filterByDbId($row->getDbPlaylistId($fileId))->findOne();
+            $pl->setDbLength($pl->computeDbLength(Propel::getConnection(CcPlaylistPeer::DATABASE_NAME)));
+            $pl->save();
+        }
+        
+        $blRows = CcBlockcontentsQuery::create()->filterByDbFileId($fileId)->find();
+        foreach ($blRows as $row) {
+            $bl = CcBlockQuery::create()->filterByDbId($row->getDbBlockId())->findOne();
+            $bl->setDbLength($bl->computeDbLength(Propel::getConnection(CcBlockPeer::DATABASE_NAME)));
+            $bl->save();
+        }
    }

    /**
--- a/airtime_mvc/application/models/airtime/CcBlock.php
+++ b/airtime_mvc/application/models/airtime/CcBlock.php
@ -86,8 +86,14 @@ class CcBlock extends BaseCcBlock {
     */
    public function computeDbLength(PropelPDO $con)
    {
-        $stmt = $con->prepare('SELECT SUM(cliplength) FROM "cc_blockcontents" WHERE cc_blockcontents.BLOCK_ID = :p1');
-        $stmt->bindValue(':p1', $this->getDbId());
+        $sql = <<<SQL
+        SELECT SUM(cliplength) FROM cc_blockcontents as bc
+        JOIN cc_files as f ON bc.file_id = f.id
+        WHERE BLOCK_ID = :b1
+        AND f.file_exists = true
+SQL;
+        $stmt = $con->prepare($sql);
+        $stmt->bindValue(':b1', $this->getDbId());
        $stmt->execute();
        $length = $stmt->fetchColumn();

--- a/airtime_mvc/application/models/airtime/CcPlaylist.php
+++ b/airtime_mvc/application/models/airtime/CcPlaylist.php
@ -87,7 +87,13 @@ class CcPlaylist extends BaseCcPlaylist {
     */
    public function computeDbLength(PropelPDO $con)
    {
-        $stmt = $con->prepare('SELECT SUM(cliplength) FROM "cc_playlistcontents" WHERE cc_playlistcontents.PLAYLIST_ID = :p1');
+        $sql = <<<SQL
+        SELECT SUM(cliplength) FROM cc_playlistcontents as pc
+        JOIN cc_files as f ON pc.file_id = f.id
+        WHERE PLAYLIST_ID = :p1
+        AND f.file_exists = true
+SQL;
+        $stmt = $con->prepare($sql);
        $stmt->bindValue(':p1', $this->getDbId());
        $stmt->execute();
        $length = $stmt->fetchColumn();