From e5f2e8d0446a3106adf8c9723a881d8f3f1a9d7f Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Thu, 14 Apr 2011 16:03:23 -0400
Subject: [PATCH 1/4] CC-2169 : All logging should go to /var/log

moving pypo/recorder logs to folder /var/log/airtime
---
 python_apps/pypo/install/pypo-daemontools-logger.sh         | 2 +-
 python_apps/pypo/install/pypo-install.py                    | 6 +++---
 python_apps/pypo/install/pypo-uninstall.py                  | 2 +-
 .../show-recorder/install/recorder-daemontools-logger.sh    | 2 +-
 python_apps/show-recorder/install/recorder-install.py       | 6 +++---
 python_apps/show-recorder/install/recorder-uninstall.py     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python_apps/pypo/install/pypo-daemontools-logger.sh b/python_apps/pypo/install/pypo-daemontools-logger.sh
index 9673575db..249bfd78b 100755
--- a/python_apps/pypo/install/pypo-daemontools-logger.sh
+++ b/python_apps/pypo/install/pypo-daemontools-logger.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec setuidgid pypo multilog t ./main
+exec setuidgid pypo multilog t /var/log/airtime/pypo/main
diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py
index 1171dfe23..5a49f3205 100755
--- a/python_apps/pypo/install/pypo-install.py
+++ b/python_apps/pypo/install/pypo-install.py
@@ -72,9 +72,9 @@ try:
   create_user("pypo")
 
   print "Creating log directories"
-  create_path("/var/log/pypo")
-  os.system("chmod -R 755 /var/log/pypo")
-  os.system("chown -R pypo:pypo /var/log/pypo")
+  create_path("/var/log/airtime/pypo")
+  os.system("chmod -R 755 /var/log/airtime/pypo")
+  os.system("chown -R pypo:pypo /var/log/airtime/pypo")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
index cd22e9c4c..36ffd2370 100755
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ b/python_apps/pypo/install/pypo-uninstall.py
@@ -32,7 +32,7 @@ try:
     os.system("python %s/pypo-stop.py" % get_current_script_dir())
     
     print "Removing log directories"
-    remove_path("/var/log/pypo")
+    remove_path("/var/log/airtime/pypo")
     
     print "Removing pypo files"
     remove_path(BASE_PATH)
diff --git a/python_apps/show-recorder/install/recorder-daemontools-logger.sh b/python_apps/show-recorder/install/recorder-daemontools-logger.sh
index 9673575db..7d53b9653 100644
--- a/python_apps/show-recorder/install/recorder-daemontools-logger.sh
+++ b/python_apps/show-recorder/install/recorder-daemontools-logger.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec setuidgid pypo multilog t ./main
+exec setuidgid pypo multilog t /var/log/airtime/recorder/main
diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py
index 1b8186391..a3f2da526 100644
--- a/python_apps/show-recorder/install/recorder-install.py
+++ b/python_apps/show-recorder/install/recorder-install.py
@@ -80,9 +80,9 @@ try:
   os.system("chown -R pypo:pypo /home/pypo/Music")
 
   print "Creating log directories"
-  create_path("/var/log/recorder")
-  os.system("chmod -R 755 /var/log/recorder")
-  os.system("chown -R pypo:pypo /var/log/recorder")
+  create_path("/var/log/airtime/recorder")
+  os.system("chmod -R 755 /var/log/airtime/recorder")
+  os.system("chown -R pypo:pypo /var/log/airtime/recorder")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py
index f8ab96432..5040ca8bd 100644
--- a/python_apps/show-recorder/install/recorder-uninstall.py
+++ b/python_apps/show-recorder/install/recorder-uninstall.py
@@ -32,7 +32,7 @@ try:
     os.system("python %s/recorder-stop.py" % get_current_script_dir())
     
     print "Removing log directories"
-    remove_path("/var/log/recorder")
+    remove_path("/var/log/airtime/recorder")
     
     print "Removing recorder files"
     remove_path(BASE_PATH)

From 379e70ff237757fabae8e19000722b706d22085d Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Thu, 14 Apr 2011 17:16:50 -0400
Subject: [PATCH 2/4] CC-2169 : All logging should go to /var/log

pypo-liquidsoap log now in its folder
---
 python_apps/pypo/install/pypo-install.py                    | 6 +++++-
 .../pypo/install/pypo-liquidsoap-daemontools-logger.sh      | 2 ++
 python_apps/pypo/install/pypo-uninstall.py                  | 1 +
 python_apps/pypo/scripts/liquidsoap.cfg                     | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh

diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py
index 5a49f3205..66d94fcc5 100755
--- a/python_apps/pypo/install/pypo-install.py
+++ b/python_apps/pypo/install/pypo-install.py
@@ -76,6 +76,10 @@ try:
   os.system("chmod -R 755 /var/log/airtime/pypo")
   os.system("chown -R pypo:pypo /var/log/airtime/pypo")
 
+  create_path("/var/log/airtime/pypo-liquidsoap")
+  os.system("chmod -R 755 /var/log/airtime/pypo-liquidsoap")
+  os.system("chown -R pypo:pypo /var/log/airtime/pypo-liquidsoap")
+
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
   create_path(BASE_PATH+"cache")
@@ -112,7 +116,7 @@ try:
   create_path("/etc/service/pypo-liquidsoap")  
   create_path("/etc/service/pypo-liquidsoap/log")  
   shutil.copy("%s/pypo-daemontools-liquidsoap.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/run")
-  shutil.copy("%s/pypo-daemontools-logger.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/log/run")
+  shutil.copy("%s/pypo-liquidsoap-daemontools-logger.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/log/run")
   os.system("chmod -R 755 /etc/service/pypo-liquidsoap")
   os.system("chown -R pypo:pypo /etc/service/pypo-liquidsoap")
 
diff --git a/python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh b/python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh
new file mode 100644
index 000000000..98ac88c3b
--- /dev/null
+++ b/python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec setuidgid pypo multilog t /var/log/airtime/pypo-liquidsoap/main
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
index 36ffd2370..004556bf0 100755
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ b/python_apps/pypo/install/pypo-uninstall.py
@@ -33,6 +33,7 @@ try:
     
     print "Removing log directories"
     remove_path("/var/log/airtime/pypo")
+    remove_path("/var/log/airtime/pypo-liquidsoap")
     
     print "Removing pypo files"
     remove_path(BASE_PATH)
diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/scripts/liquidsoap.cfg
index a7f310f1a..467ece4d1 100644
--- a/python_apps/pypo/scripts/liquidsoap.cfg
+++ b/python_apps/pypo/scripts/liquidsoap.cfg
@@ -7,7 +7,7 @@
 # general settings                        #
 ###########################################
 
-log_file = "/var/log/pypo/<script>.log"
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
 log_level = 3
 
 ###########################################

From d5b914fa84729189f4d4143db69fb06427d9cfeb Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Thu, 14 Apr 2011 17:57:08 -0400
Subject: [PATCH 3/4] CC-1805: Ability to edit a show -Fixed bug with scheduled
 data start time not shifting with show instance start time -What "tab" now
 automatically open when form appears.

---
 .../controllers/ScheduleController.php        |   5 +
 application/models/Shows.php                  | 102 ++++++++++++------
 .../schedule/full-calendar-functions.js       |  15 +--
 3 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php
index bbbf5e05f..2cb298e51 100644
--- a/application/controllers/ScheduleController.php
+++ b/application/controllers/ScheduleController.php
@@ -652,6 +652,11 @@ class ScheduleController extends Zend_Controller_Action
             $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
 		}
         else {
+            //the form still needs to be "update" since
+            //the validity test failed.
+            if ($data['add_show_id'] != -1){
+                $this->view->addNewShow = false;
+            }
 
             $this->view->form = $this->view->render('schedule/add-show-form.phtml');
         }
diff --git a/application/models/Shows.php b/application/models/Shows.php
index 9cf1123c0..dbaff08d3 100644
--- a/application/models/Shows.php
+++ b/application/models/Shows.php
@@ -536,24 +536,26 @@ class Show {
             //repeat option was toggled or show is recorded.
             $p_show->deleteAllInstances();
         }
-        if ($p_data['add_show_start_date'] != $p_show->getStartDate()
-            || $p_data['add_show_start_time'] != $p_show->getStartTime()){
-            //start date/time has changed
-            
-            $newDate = strtotime($p_data['add_show_start_date']);
-            $oldDate = strtotime($p_show->getStartDate());
-            if ($newDate > $oldDate){
-                $p_show->removeAllInstancesBeforeDate($p_data['add_show_start_date']);
-            }            
 
-            $p_show->updateStartDateTime($p_data, $p_endDate);
-        }
         if ($p_data['add_show_duration'] != $p_show->getDuration()){
             //duration has changed
             $p_show->updateDurationTime($p_data);
         }
     
         if ($p_data['add_show_repeats']){
+            if ($p_data['add_show_start_date'] != $p_show->getStartDate()
+                || $p_data['add_show_start_time'] != $p_show->getStartTime()){
+                //start date/time has changed
+                
+                $newDate = strtotime($p_data['add_show_start_date']);
+                $oldDate = strtotime($p_show->getStartDate());
+                if ($newDate > $oldDate){
+                    $p_show->removeAllInstancesBeforeDate($p_data['add_show_start_date']);
+                }            
+
+                $p_show->updateStartDateTime($p_data, $p_endDate);
+            }
+
             if ($repeatType != $p_show->getRepeatType()){
                 //repeat type changed.
                 $p_show->deleteAllInstances();
@@ -863,21 +865,26 @@ class Show {
             
             $show = new Show($show_id);
             if ($show->hasInstance()){
-                $showInstance = $show->getInstance();
+                $ccShowInstance = $show->getInstance();
+                $newInstance = false;
             } else {
-                $showInstance = new CcShowInstances();
+                $ccShowInstance = new CcShowInstances();
+                $newInstance = true;
             }
             
-            $showInstance->setDbShowId($show_id);
-            $showInstance->setDbStarts($start);
-            $showInstance->setDbEnds($end);
-            $showInstance->setDbRecord($record);
-            $showInstance->save();
-            //$show->addInstance($showInstance);
-        
+            $ccShowInstance->setDbShowId($show_id);
+            $ccShowInstance->setDbStarts($start);
+            $ccShowInstance->setDbEnds($end);
+            $ccShowInstance->setDbRecord($record);
+            $ccShowInstance->save();
 
-            $show_instance_id = $showInstance->getDbId();
+            $show_instance_id = $ccShowInstance->getDbId();
+            $showInstance = new ShowInstance($show_instance_id);
 
+            if (!$newInstance){
+                $showInstance->correctScheduleStartTimes();
+            }
+            
             $sql = "SELECT * FROM cc_show_rebroadcast WHERE show_id={$show_id}";
             $rebroadcasts = $CC_DBC->GetAll($sql);
 
@@ -929,19 +936,24 @@ class Show {
             $end = $CC_DBC->GetOne($sql);
            
             if ($show->hasInstanceOnDate($start)){
-                $showInstance = $show->getInstanceOnDate($start);
+                $ccShowInstance = $show->getInstanceOnDate($start);
+                $newInstance = false;
             } else {
-                $showInstance = new CcShowInstances();
+                $ccShowInstance = new CcShowInstances();
+                $newInstance = true;
             }
-            $showInstance->setDbShowId($show_id);
-            $showInstance->setDbStarts($start);
-            $showInstance->setDbEnds($end);
-            $showInstance->setDbRecord($record);
-            $showInstance->save();
-            //$show->addInstance($showInstance);
-        
+            $ccShowInstance->setDbShowId($show_id);
+            $ccShowInstance->setDbStarts($start);
+            $ccShowInstance->setDbEnds($end);
+            $ccShowInstance->setDbRecord($record);
+            $ccShowInstance->save();
 
-            $show_instance_id = $showInstance->getDbId();
+            $show_instance_id = $ccShowInstance->getDbId();
+            $showInstance = new ShowInstance($show_instance_id);
+
+            if (!$newInstance){
+                $showInstance->correctScheduleStartTimes();
+            }
 
             foreach($rebroadcasts as $rebroadcast) {
 
@@ -1305,6 +1317,34 @@ class ShowInstance {
         RabbitMq::PushSchedule();
     }
 
+    public function correctScheduleStartTimes(){
+        global $CC_DBC;
+        
+        $instance_id = $this->getShowInstanceId();
+        $sql = "SELECT starts from cc_schedule"
+            ." WHERE instance_id = $instance_id"
+            ." ORDER BY starts"
+            ." LIMIT 1";
+
+        $scheduleStarts = $CC_DBC->GetOne($sql);
+                
+        if (!is_null($scheduleStarts)){
+            $scheduleStartsEpoch = strtotime($scheduleStarts);
+            $showStartsEpoch = strtotime($this->getShowStart());
+
+            $diff = $showStartsEpoch - $scheduleStartsEpoch;
+
+            if ($diff != 0){
+                $sql = "UPDATE cc_schedule"
+                ." SET starts = starts + INTERVAL '$diff' second,"
+                ." ends = ends + INTERVAL '$diff' second"
+                ." WHERE instance_id = $instance_id";       
+
+                $CC_DBC->query($sql);
+            }
+        }
+    }
+
     public function moveShow($deltaDay, $deltaMin)
     {
         global $CC_DBC;
diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js
index 1bb3d50ea..5330bc693 100644
--- a/public/js/airtime/schedule/full-calendar-functions.js
+++ b/public/js/airtime/schedule/full-calendar-functions.js
@@ -10,12 +10,15 @@ function scheduleRefetchEvents() {
 
 function openAddShowForm() {
 
-     if(($("#add-show-form").length == 1) && ($("#add-show-form").css('display')=='none')) {
-        $("#add-show-form").show();
-        var y = $("#schedule_calendar").width();
-        var z = $("#schedule-add-show").width();
-        $("#schedule_calendar").width(y-z-50);
-        $("#schedule_calendar").fullCalendar('render');
+     if($("#add-show-form").length == 1) {
+        if( ($("#add-show-form").css('display')=='none')) {
+            $("#add-show-form").show();
+            var y = $("#schedule_calendar").width();
+            var z = $("#schedule-add-show").width();
+            $("#schedule_calendar").width(y-z-50);
+            $("#schedule_calendar").fullCalendar('render');
+        }
+        $("#schedule-show-what").show();
     }
 }
 

From d2239b827dc06c2d2ac8b2fb2336a1b08f822e4b Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Thu, 14 Apr 2011 18:03:24 -0400
Subject: [PATCH 4/4] CC-1805: Ability to edit a show -removed (now) redundant
 moveScheduledShowContent function

---
 application/models/Shows.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/application/models/Shows.php b/application/models/Shows.php
index dbaff08d3..ed3f076a2 100644
--- a/application/models/Shows.php
+++ b/application/models/Shows.php
@@ -1304,19 +1304,6 @@ class ShowInstance {
         $showInstance->updateDbTimeFilled($con);
     }
 
-    public function moveScheduledShowContent($deltaDay, $deltaHours, $deltaMin)
-    {
-        global $CC_DBC;
-
-        $sql = "UPDATE cc_schedule
-                   SET starts = (starts + interval '{$deltaDay} days' + interval '{$deltaHours}:{$deltaMin}'),
-                        ends = (ends + interval '{$deltaDay} days' + interval '{$deltaHours}:{$deltaMin}')
-                   WHERE instance_id = '{$this->_instanceId}'";
-
-        $CC_DBC->query($sql);
-        RabbitMq::PushSchedule();
-    }
-
     public function correctScheduleStartTimes(){
         global $CC_DBC;
         
@@ -1343,6 +1330,7 @@ class ShowInstance {
                 $CC_DBC->query($sql);
             }
         }
+        RabbitMq::PushSchedule();
     }
 
     public function moveShow($deltaDay, $deltaMin)
@@ -1387,9 +1375,9 @@ class ShowInstance {
             }
         }
 
-        $this->moveScheduledShowContent($deltaDay, $hours, $mins);
         $this->setShowStart($new_starts);
         $this->setShowEnd($new_ends);
+        $this->correctScheduleStartTimes();
         RabbitMq::PushSchedule();
     }