From 09b117999e5f1c99ea46efc0174dc74061cb7e17 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 15:28:38 -0400 Subject: [PATCH 01/11] CC-4475: Register form button doesn't have any styling -fixed --- airtime_mvc/public/js/airtime/nowplaying/register.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js index 3d13367f1..0b5b04249 100644 --- a/airtime_mvc/public/js/airtime/nowplaying/register.js +++ b/airtime_mvc/public/js/airtime/nowplaying/register.js @@ -15,9 +15,10 @@ $(document).ready(function(){ close: doNotShowPopup, buttons: [ { - id: "remind_me", - text: "Remind me in 1 week", - click: function() { + id: "remind_me", + text: "Remind me in 1 week", + "class": "btn", + click: function() { var url = '/Usersettings/remindme'; $.ajax({ url: url, @@ -29,6 +30,7 @@ $(document).ready(function(){ { id: "remind_never", text: "Remind me never", + "class": "btn", click: function() { var url ='/Usersettings/remindme-never'; $.ajax({ @@ -41,6 +43,7 @@ $(document).ready(function(){ { id: "help_airtime", text: "Yes, help Airtime", + "class": "btn", click: function() { $("#register-form").submit(); } From eecc90547dd8722d437856f75b83262153668d4f Mon Sep 17 00:00:00 2001 From: James Date: Tue, 18 Sep 2012 15:47:37 -0400 Subject: [PATCH 02/11] CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show) - fixed --- .../application/controllers/ScheduleController.php | 2 ++ airtime_mvc/application/models/Scheduler.php | 2 +- airtime_mvc/application/models/ShowInstance.php | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index e061d3d5d..adf84380e 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -783,6 +783,8 @@ class ScheduleController extends Zend_Controller_Action $data['add_show_instance_id']); if ($success) { + $scheduler = new Application_Model_Scheduler(); + $scheduler->removeGaps($data['add_show_instance_id']); $this->view->addNewShow = true; $this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); } else { diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 95454eeb4..664c40504 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -331,7 +331,7 @@ class Application_Model_Scheduler * This function squeezes all items of a show together so that * there are no gaps between them. */ - private function removeGaps($showInstance, $exclude=null) + public function removeGaps($showInstance, $exclude=null) { Logging::info("removing gaps from show instance #".$showInstance); diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index f782ae076..b08a0e37c 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -187,12 +187,12 @@ SQL; if ($diff != 0) { $sql = << $diff, ':diff2' => $diff, ':instanceId' => $instance_id ), 'execute'); @@ -345,7 +345,7 @@ SQL; //$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'"; $sql = "SELECT timestamp :ends + interval :deltaDays + interval :deltaTime"; - $now_ends = Application_Common_Database::prepareAndExecute($sql, + $now_ends = Application_Common_Database::prepareAndExecute($sql, array(':ends' => $ends, ':deltaDays' => "$deltaDay days", ':deltaTime' => "{$hours}:{$mins}"), 'column' @@ -765,7 +765,7 @@ WHERE si.ends < :timeNow::TIMESTAMP AND si.modified_instance = 'f' ORDER BY si.ends DESC LIMIT 1; SQL; - $id = Application_Common_Database( $sql, array( + $id = Application_Common_Database( $sql, array( ':timeNow' => $p_timeNow ), 'column' ); return ($id ? new Application_Model_ShowInstance($id) : null ); @@ -818,7 +818,7 @@ SELECT count(*) AS cnt FROM cc_show_instances WHERE ends < :day SQL; - return Application_Common_Database::prepareAndExecute( $sql, + return Application_Common_Database::prepareAndExecute( $sql, array( ':day' => $day ), 'column' ); } From 8cae11d588ceeee4041623006d881750584ac3f5 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 15:52:11 -0400 Subject: [PATCH 03/11] CC-4478: Library: audio preview check should be skipped if file does not exist -fixed --- airtime_mvc/public/js/airtime/library/spl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 3ee9a22ef..79c761efd 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -366,7 +366,7 @@ var AIRTIME = (function(AIRTIME){ //and verify whether they can be previewed by the browser or not. If not //then the playlist element is greyed out mod.validatePlaylistElements = function(){ - $.each($(".big_play"), function(index, value){ + $.each($(".big_play ui-icon-play"), function(index, value){ if ($(value).attr('blockId') === undefined) { var mime = $(value).attr("data-mime-type"); if (isAudioSupported(mime)) { From 7a958ec8b681ccec3767e27c4eb2811efa6ae8bf Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 15:52:16 -0400 Subject: [PATCH 04/11] formatting --- airtime_mvc/application/models/User.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 326e04940..63b82820a 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -1,9 +1,9 @@ Date: Tue, 18 Sep 2012 16:10:55 -0400 Subject: [PATCH 05/11] added comments --- python_apps/media-monitor2/media/monitor/pure.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 910ff2c2e..b6f3897ff 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -257,6 +257,8 @@ def normalized_metadata(md, original_path): 'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x), 'MDATA_KEY_BPM' : lambda x: x[0:8], 'MDATA_KEY_MIME' : lambda x: x.replace('audio/vorbis','audio/ogg'), + # Whenever 0 is reported we change it to empty + #'MDATA_KEY_BITRATE' : lambda x: '' if str(x) == '0' else x } new_md = remove_whitespace(new_md) # remove whitespace fields From d55915d6492d1d10d17341f1096120d054ad8fac Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 16:40:23 -0400 Subject: [PATCH 06/11] naming convention fix --- .../application/models/formatters/BitrateFormatter.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/formatters/BitrateFormatter.php b/airtime_mvc/application/models/formatters/BitrateFormatter.php index 58bd56c64..f1455ca74 100644 --- a/airtime_mvc/application/models/formatters/BitrateFormatter.php +++ b/airtime_mvc/application/models/formatters/BitrateFormatter.php @@ -17,12 +17,12 @@ class BitrateFormatter public function format() { - $Kbps = bcdiv($this->_bitrate, 1000, 0); + $kbps = bcdiv($this->_bitrate, 1000, 0); - if ($Kbps == 0) { + if ($kbps == 0) { return ""; } else { - return "{$Kbps} Kbps"; + return "$kbps Kbps"; } } } From 54ab58a9c7524cd0d92c841339a230afe4b852af Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 16:49:45 -0400 Subject: [PATCH 07/11] CC-4465: Calendar: Remove warning icon on empty shows if show is in the past -removed (commented out) code for this ticket -postponing for now --- .../public/js/airtime/schedule/full-calendar-functions.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 5e95a31c8..d31e34476 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -255,8 +255,8 @@ function eventRender(event, element, view) { } //add scheduled show content empty icon - addIcon = checkEmptyShowStatus(event); - if (!addIcon) { + //addIcon = checkEmptyShowStatus(event); + //if (!addIcon) { if (view.name === 'agendaDay' || view.name === 'agendaWeek') { if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) { if (event.soundcloud_id === -1) { @@ -282,7 +282,7 @@ function eventRender(event, element, view) { } } } - } + //} //rebroadcast icon if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) { @@ -518,6 +518,7 @@ function addQtipToSCIcons(ele){ * This gets checked when we are deciding if the show-empty icon should be added * at the beginning of an event render callback. */ +/* function checkEmptyShowStatus(e) { var currDate = new Date(); var endTime; @@ -541,6 +542,7 @@ function checkEmptyShowStatus(e) { return showOver; } } +*/ //Alert the error and reload the page //this function is used to resolve concurrency issue From 8433ec5445d8af9235735a29d58c5e53daaf8b8d Mon Sep 17 00:00:00 2001 From: James Date: Tue, 18 Sep 2012 16:50:42 -0400 Subject: [PATCH 08/11] CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in - fixed --- airtime_mvc/application/models/Block.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 0c349d9f4..fa305a90a 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1291,6 +1291,10 @@ SQL; } else { $qry->add($spCriteria, $spCriteriaValue, $spCriteriaModifier); } + + if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) { + $qry->addOr($spCriteria, null, Criteria::ISNULL); + } } catch (Exception $e) { Logging::info($e); } From b77429164bb2aaa4e46b374e0682ef3d9b67c677 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 16:55:46 -0400 Subject: [PATCH 09/11] CC-4465: Calendar: Remove warning icon on empty shows if show is in the past -removed setInterval function --- .../public/js/airtime/schedule/full-calendar-functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index d31e34476..7ecd6d15d 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -554,7 +554,7 @@ function alertShowErrorAndReload(){ $(document).ready(function(){ setInterval( "checkSCUploadStatus()", 5000 ); setInterval( "getCurrentShow()", 5000 ); - setInterval( "checkEmptyShowStatus()", 5000 ); + //setInterval( "checkEmptyShowStatus()", 5000 ); }); var view_name; From a20dc7dc96b531f49412aa96dbb3c1326def28cc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 17:09:12 -0400 Subject: [PATCH 10/11] cc-4493: Cleaned up handling of metadata specific to filetypes. --- python_apps/media-monitor2/media/monitor/airtime.py | 5 ++--- .../media-monitor2/media/monitor/exceptions.py | 10 ++++++++++ .../media-monitor2/media/monitor/metadata.py | 13 +++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py index 23980929e..b920ecd65 100644 --- a/python_apps/media-monitor2/media/monitor/airtime.py +++ b/python_apps/media-monitor2/media/monitor/airtime.py @@ -2,13 +2,12 @@ from kombu.messaging import Exchange, Queue, Consumer from kombu.connection import BrokerConnection from os.path import normpath -from mutagen.easymp4 import EasyMP4KeyError import json import os import copy -from media.monitor.exceptions import BadSongFile +from media.monitor.exceptions import BadSongFile, InvalidMetadataElement from media.monitor.metadata import Metadata from media.monitor.log import Loggable from media.monitor.syncdb import AirtimeDB @@ -118,7 +117,7 @@ class AirtimeMessageReceiver(Loggable): try: Metadata.write_unsafe(path=md_path, md=msg) except BadSongFile as e: self.logger.info("Cannot find metadata file: '%s'" % e.path) - except EasyMP4KeyError as e: + except InvalidMetadataElement as e: self.logger.info("Metadata instance not supported for this file '%s'" \ % e.path) self.logger.info(str(e)) diff --git a/python_apps/media-monitor2/media/monitor/exceptions.py b/python_apps/media-monitor2/media/monitor/exceptions.py index c6b3ec445..b7b834920 100644 --- a/python_apps/media-monitor2/media/monitor/exceptions.py +++ b/python_apps/media-monitor2/media/monitor/exceptions.py @@ -48,3 +48,13 @@ class NoDirectoryInAirtime(Exception): def __str__(self): return "Directory '%s' does not exist in Airtime.\n \ However: %s do exist." % (self.path, self.does_exist) + +class InvalidMetadataElement(Exception): + def __init__(self, parent, key, path): + self.parent = parent + self.key = key + self.path = path + def __str__(self): + return "InvalidMetadataElement: (key,path) = (%s,%s)" \ + % (self.key, self.path) + diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py index 8a56d51e1..5b62a204d 100644 --- a/python_apps/media-monitor2/media/monitor/metadata.py +++ b/python_apps/media-monitor2/media/monitor/metadata.py @@ -3,9 +3,9 @@ import mutagen import os import copy from collections import namedtuple -from mutagen.easymp4 import EasyMP4KeyError +from mutagen.easymp4 import EasyMP4KeyError, EasyID3KeyError -from media.monitor.exceptions import BadSongFile +from media.monitor.exceptions import BadSongFile, InvalidMetadataElement from media.monitor.log import Loggable from media.monitor.pure import format_length import media.monitor.pure as mmp @@ -150,17 +150,18 @@ class Metadata(Loggable): """ if not os.path.exists(path): raise BadSongFile(path) song_file = mutagen.File(path, easy=True) - ex = None + exceptions = [] # for bad keys for airtime_k, airtime_v in md.iteritems(): if airtime_k in airtime2mutagen: # The unicode cast here is mostly for integers that need to be # strings try: song_file[ airtime2mutagen[airtime_k] ] = unicode(airtime_v) - except EasyMP4KeyError as e: - ex = e + except (EasyMP4KeyError, EasyID3KeyError) as e: + exceptions.append(InvalidMetadataElement(e, airtime_k, + path)) + for e in exceptions: raise e song_file.save() - if ex: raise ex def __init__(self, fpath): # Forcing the unicode through From 083bee38fdda4b6c6be4f5fdb45c8d46780674e5 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 17:14:25 -0400 Subject: [PATCH 11/11] cc-4483: Fixed import --- python_apps/media-monitor2/media/monitor/metadata.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py index 5b62a204d..ad24d23b9 100644 --- a/python_apps/media-monitor2/media/monitor/metadata.py +++ b/python_apps/media-monitor2/media/monitor/metadata.py @@ -2,8 +2,9 @@ import mutagen import os import copy -from collections import namedtuple -from mutagen.easymp4 import EasyMP4KeyError, EasyID3KeyError +from collections import namedtuple +from mutagen.easymp4 import EasyMP4KeyError +from mutagen.easyid3 import EasyID3KeyError from media.monitor.exceptions import BadSongFile, InvalidMetadataElement from media.monitor.log import Loggable