From 8eda4a7035088a83161ed37bc9d3fd488cd003f3 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 10:34:15 -0400
Subject: [PATCH 01/10] Subtle bug fixed in smartPrepareAndExecute.
---
airtime_mvc/application/common/Database.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/airtime_mvc/application/common/Database.php b/airtime_mvc/application/common/Database.php
index a90227ff6..2c61bc589 100644
--- a/airtime_mvc/application/common/Database.php
+++ b/airtime_mvc/application/common/Database.php
@@ -46,7 +46,7 @@ class Application_Common_Database
$new_params[$k] = $new_params[$v];
} else {
foreach ( range(1,$matches_count) as $i ) {
- preg_replace( "/$k(\D)/", "$k.$i${1}", $sql, 1);
+ preg_replace( "/$k(\D)/", "$k$i${1}", $sql, 1);
$new_params[ $k.$i ] = $v;
}
}
From 52882ef9384bb69d06c626526f757ef1b3905f91 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 10:35:13 -0400
Subject: [PATCH 02/10] Added mp4 removed aac.
---
airtime_mvc/public/js/airtime/library/plupload.js | 2 +-
python_apps/media-monitor2/media/monitor/pure.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js
index 28190f3ef..a68196d0e 100644
--- a/airtime_mvc/public/js/airtime/library/plupload.js
+++ b/airtime_mvc/public/js/airtime/library/plupload.js
@@ -9,7 +9,7 @@ $(document).ready(function() {
unique_names : 'true',
multiple_queues : 'true',
filters : [
- {title: "Audio Files", extensions: "ogg,mp3,oga,flac,aac,wav,m4a"}
+ {title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4"}
]
});
diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py
index 103902001..5a0cf9b90 100644
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@@ -20,8 +20,8 @@ from configobj import ConfigObj
from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir
#supported_extensions = [u"mp3", u"ogg", u"oga"]
-supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"wav",
- u'm4a']
+supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"wav",
+ u'm4a', u'mp4']
unicode_unknown = u'unknown'
From 55993352bfa0d8e36f721e9dc4ee8dc192b8b502 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 10:35:24 -0400
Subject: [PATCH 03/10] Removed unused variables.
---
airtime_mvc/application/controllers/LoginController.php | 2 +-
airtime_mvc/application/controllers/ScheduleController.php | 1 -
airtime_mvc/application/forms/SmartBlockCriteria.php | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index a47a5c420..e3eeccca4 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -178,7 +178,7 @@ class LoginController extends Zend_Controller_Action
$authAdapter->setIdentity($user->getDbLogin())
->setCredential($form->password->getValue());
- $result = $zend_auth->authenticate($authAdapter);
+ $zend_auth->authenticate($authAdapter);
//all info about this user from the login table omit only the password
$userInfo = $authAdapter->getResultRowObject(null, 'password');
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 0c843786e..cbfee9dc2 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -392,7 +392,6 @@ class ScheduleController extends Zend_Controller_Action
{
$showInstanceId = $this->sched_sess->showInstanceId;
$group_id = $this->_getParam('groupId');
- $search = $this->_getParam('search', null);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 8518cc1e9..e8cff6815 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -446,7 +446,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
foreach ($data['criteria'] as $rowKey=>$row) {
foreach ($row as $key=>$d) {
$element = $this->getElement("sp_criteria_field_".$rowKey."_".$key);
- $error = array();
// check for not selected select box
if ($d['sp_criteria_field'] == "0" || $d['sp_criteria_modifier'] == "0") {
$element->addError("You must select Criteria and Modifier");
From dced49c4253e54bc8cf49bdbf6be5805db8030f7 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 10:52:58 -0400
Subject: [PATCH 04/10] Removed unused variable
---
.../application/controllers/PlaylistController.php | 12 ++++++------
.../application/controllers/ScheduleController.php | 3 ---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 42c6a2442..9a8e304fc 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -203,18 +203,18 @@ class PlaylistController extends Zend_Controller_Action
public function deleteAction()
{
- $ids = $this->_getParam('ids');
- $ids = (!is_array($ids)) ? array($ids) : $ids;
+ $ids = $this->_getParam('ids');
+ $ids = (!is_array($ids)) ? array($ids) : $ids;
$type = $this->_getParam('type');
- $obj = null;
+ $obj = null;
- $objInfo = Application_Model_Library::getObjInfo($type);
+ $objInfo = Application_Model_Library::getObjInfo($type);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
- $user = new Application_Model_User($userInfo->id);
- $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
+ $obj_sess = new Zend_Session_Namespace(
+ UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
try {
Logging::info("Currently active {$type} {$obj_sess->id}");
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index cbfee9dc2..8d9382717 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -529,9 +529,6 @@ class ScheduleController extends Zend_Controller_Action
$isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
$showInstanceId = $this->_getParam('id');
- // $type is used to determine if this edit is for the specific instance or for all
- // repeating shows. It's value is either "instance","rebroadcast", or "all"
- $type = $this->_getParam('type');
$this->view->action = "edit-show";
try {
From d409af28760820711fb09c57d70e32bac72bb9fe Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 11:07:29 -0400
Subject: [PATCH 05/10] shortened logging
---
.../application/controllers/PlaylistController.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 9a8e304fc..7b6b0294f 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -34,7 +34,7 @@ class PlaylistController extends Zend_Controller_Action
$obj = null;
$objInfo = Application_Model_Library::getObjInfo($p_type);
- $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
+ $obj_sess = new Zend_Session_Namespace( UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
if (isset($obj_sess->id)) {
$obj = new $objInfo['className']($obj_sess->id);
@@ -63,7 +63,8 @@ class PlaylistController extends Zend_Controller_Action
unset($this->view->obj);
}
- private function createFullResponse($obj = null, $isJson = false, $formIsValid = false)
+ private function createFullResponse($obj = null, $isJson = false,
+ $formIsValid = false)
{
$isBlock = false;
$viewPath = 'playlist/playlist.phtml';
@@ -141,10 +142,7 @@ class PlaylistController extends Zend_Controller_Action
private function playlistUnknownError($e)
{
$this->view->error = "Something went wrong.";
-
- Logging::info("{$e->getFile()}");
- Logging::info("{$e->getLine()}");
- Logging::info("{$e->getMessage()}");
+ Logging::info($e->getMessage());
}
private function wrongTypeToBlock($obj)
From a779142a08e13d9906be254c4fbecaaac1462f62 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 13 Sep 2012 11:12:39 -0400
Subject: [PATCH 06/10] -fix commenting error
---
airtime_mvc/application/controllers/ApiController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 897b437e1..57348e005 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -564,7 +564,7 @@ class ApiController extends Zend_Controller_Action
// to some unique id.
$request = $this->getRequest();
$responses = array();
- //$params = $request->getParams();
+ $params = $request->getParams();
$valid_modes = array('delete_dir', 'delete', 'moved', 'modify', 'create');
foreach ($params as $k => $raw_json) {
// Valid requests must start with mdXXX where XXX represents at
From 903c7ef5800371d2bb15d2570d1daa7204725a4f Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 13 Sep 2012 11:16:42 -0400
Subject: [PATCH 07/10] CC-4420: airtime-import is broken
- fixed
---
utils/airtime-import/airtime-import.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py
index ee1fb6cdf..5f1d305ca 100644
--- a/utils/airtime-import/airtime-import.py
+++ b/utils/airtime-import/airtime-import.py
@@ -29,7 +29,7 @@ except Exception, e:
print('Error loading config file: %s', e)
sys.exit()
-api_client = apc.api_client_factory(config)
+api_client = apc.AirtimeApiClient(config)
#helper functions
# copy or move files
From b28116f6229e823d5f8357abd271d42229df2655 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 11:34:00 -0400
Subject: [PATCH 08/10] removed empty space
---
airtime_mvc/application/controllers/UserController.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 01f6bf704..d098bfbc8 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -103,9 +103,7 @@ class UserController extends Zend_Controller_Action
{
// action body
$delId = $this->_getParam('id');
-
$valid_actions = array("delete_cascade", "reassign_to");
-
$files_action = $this->_getParam('deleted_files');
# TODO : remove this. we only use default for now not to break the UI.
From a832ad61dc9d5308feff39f3903b4db608bacad8 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 11:38:40 -0400
Subject: [PATCH 09/10] Fixed bug where path would not be normpathed
---
python_apps/media-monitor2/media/monitor/airtime.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py
index 411db2358..23980929e 100644
--- a/python_apps/media-monitor2/media/monitor/airtime.py
+++ b/python_apps/media-monitor2/media/monitor/airtime.py
@@ -128,6 +128,7 @@ class AirtimeMessageReceiver(Loggable):
% md_path, e)
def new_watch(self, msg, restart=False):
+ msg['directory'] = normpath(msg['directory'])
self.logger.info("Creating watch for directory: '%s'" %
msg['directory'])
if not os.path.exists(msg['directory']):
@@ -145,6 +146,7 @@ class AirtimeMessageReceiver(Loggable):
self.manager.add_watch_directory(msg['directory'])
def remove_watch(self, msg):
+ msg['directory'] = normpath(msg['directory'])
self.logger.info("Removing watch from directory: '%s'" %
msg['directory'])
self.manager.remove_watch_directory(msg['directory'])
From 3fb7526fbb3143baf2d3fb9cd21a10a1b8cb227b Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 13 Sep 2012 12:15:51 -0400
Subject: [PATCH 10/10] Shortened logging
---
airtime_mvc/application/controllers/LibraryController.php | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 9ae0a7873..291078323 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -99,10 +99,7 @@ class LibraryController extends Zend_Controller_Action
protected function playlistUnknownError($e)
{
$this->view->error = "Something went wrong.";
-
- Logging::info("{$e->getFile()}");
- Logging::info("{$e->getLine()}");
- Logging::info("{$e->getMessage()}");
+ Logging::info($e->getMessage());
}
protected function createFullResponse($obj = null, $isJson = false)