From 05916a4d266136e05882da28a9b1bdf8990bd010 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 15:13:08 -0400 Subject: [PATCH 1/3] Code cleanup --- airtime_mvc/application/controllers/LibraryController.php | 4 ++-- airtime_mvc/application/models/Webstream.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index d160b600a..e05747200 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -90,9 +90,9 @@ class LibraryController extends Zend_Controller_Action protected function playlistNotFound($p_type) { - $this->view->error = "{$p_type} not found"; + $this->view->error = "$p_type not found"; - Logging::info("{$p_type} not found"); + Logging::info("$p_type not found"); Application_Model_Library::changePlaylist(null, $p_type); $this->createFullResponse(null); } diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php index 1c483e983..e3f08858a 100644 --- a/airtime_mvc/application/models/Webstream.php +++ b/airtime_mvc/application/models/Webstream.php @@ -78,11 +78,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable $username = $subjs->getDbLogin(); return array( - "name" => $this->webstream->getDbName(), - "length" => $this->webstream->getDbLength(), + "name" => $this->webstream->getDbName(), + "length" => $this->webstream->getDbLength(), "description" => $this->webstream->getDbDescription(), - "login"=> $username, - "url" => $this->webstream->getDbUrl(), + "login" => $username, + "url" => $this->webstream->getDbUrl(), ); } From ba08355c388ad9f3c7eadbb97c5d1419237d1e9d Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 16:16:52 -0400 Subject: [PATCH 2/3] quick fix --- airtime_mvc/application/controllers/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index 679a20b8e..1ee54fe39 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -109,7 +109,7 @@ class UserController extends Zend_Controller_Action # TODO : remove this. we only use default for now not to break the UI. if (!$files_action) { # set default action $files_action = "reassign_to"; - $valid_actions = + $delId = 1; } # only delete when valid action is selected for the owned files From b61abe24742a3f5121b800712d2efdfb5b5b1457 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 16:19:34 -0400 Subject: [PATCH 3/3] Hard coded mime for wav --- python_apps/media-monitor2/media/monitor/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py index c935e0667..0fc278e9e 100644 --- a/python_apps/media-monitor2/media/monitor/metadata.py +++ b/python_apps/media-monitor2/media/monitor/metadata.py @@ -51,7 +51,7 @@ class FakeMutagen(dict): FakeInfo = namedtuple('FakeInfo','length bitrate') def __init__(self,path): self.path = path - self.mime = [] + self.mime = ['audio/wav'] self.info = FakeMutagen.FakeInfo(0.0, '') dict.__init__(self) def set_length(self,l):