From a20dc7dc96b531f49412aa96dbb3c1326def28cc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 17:09:12 -0400 Subject: [PATCH 1/4] 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 2/4] 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 From 8787a721958b29c1aeedc3a967dceebe8ec7a5a4 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 18 Sep 2012 17:21:57 -0400 Subject: [PATCH 3/4] -ensure stream metadata formatting is correct --- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 17aadbb8e..4e9167638 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -19,7 +19,7 @@ end def append_title(m) = log("Using stream_format #{!stream_metadata_type}") if !stream_metadata_type == 1 then - [("title", "#{!show_name} - #{m['artist']}")] + [("title", "#{!show_name} - #{m['artist']} - #{m['title']}")] elsif !stream_metadata_type == 2 then [("title", "#{!station_name} - #{!show_name}")] else From 6420e6a8302fb0cc369752c7d7396bc4aaf0ee28 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 18 Sep 2012 17:22:14 -0400 Subject: [PATCH 4/4] remove trailing whitespace --- .../controllers/UserController.php | 9 +- .../pypo/liquidsoap_scripts/ls_script.liq | 86 +++++++++---------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index 40415b760..cf9d58b02 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -45,18 +45,21 @@ class UserController extends Zend_Controller_Action if ($form->isValid($request->getPost())) { $formdata = $form->getValues(); - if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1 && $formdata['login'] == 'admin' && $formdata['user_id'] != 0) { + if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1 + && $formdata['login'] == 'admin' + && $formdata['user_id'] != 0) { $this->view->successMessage = "
Specific action is not allowed in demo version!
"; } elseif ($form->validateLogin($formdata)) { $user = new Application_Model_User($formdata['user_id']); $user->setFirstName($formdata['first_name']); $user->setLastName($formdata['last_name']); $user->setLogin($formdata['login']); - // We don't allow 6 x's as passwords are not allowed. + // We don't allow 6 x's as a password. // The reason is because we that as a password placeholder // on the client side. - if ($formdata['password'] != "xxxxxx") + if ($formdata['password'] != "xxxxxx") { $user->setPassword($formdata['password']); + } $user->setType($formdata['type']); $user->setEmail($formdata['email']); $user->setCellPhone($formdata['cell_phone']); diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index 649943a19..fbb8e9870 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -50,33 +50,33 @@ queue = crossfade(queue) output.dummy(fallible=true, queue) -stream_queue = switch(id="stream_queue_switch", track_sensitive=false, - transitions=[transition, transition], - [({!webstream_enabled},web_stream), +stream_queue = switch(id="stream_queue_switch", track_sensitive=false, + transitions=[transition, transition], + [({!webstream_enabled},web_stream), ({true}, queue)]) ignore(output.dummy(stream_queue, fallible=true)) -server.register(namespace="vars", - "pypo_data", +server.register(namespace="vars", + "pypo_data", fun (s) -> begin log("vars.pypo_data") pypo_data := s "Done" end) -server.register(namespace="vars", - "stream_metadata_type", +server.register(namespace="vars", + "stream_metadata_type", fun (s) -> begin log("vars.stream_metadata_type") stream_metadata_type := int_of_string(s) s end) -server.register(namespace="vars", - "show_name", +server.register(namespace="vars", + "show_name", fun (s) -> begin log("vars.show_name") show_name := s s end) -server.register(namespace="vars", - "station_name", +server.register(namespace="vars", + "station_name", fun (s) -> begin log("vars.station_name") station_name := s s end) -server.register(namespace="vars", - "bootup_time", +server.register(namespace="vars", + "bootup_time", fun (s) -> begin log("vars.bootup_time") time := s s end) -server.register(namespace="streams", - "connection_status", +server.register(namespace="streams", + "connection_status", fun (s) -> begin log("streams.connection_status") "1:#{!s1_connected},2:#{!s2_connected},3:#{!s3_connected}" end) -server.register(namespace="vars", - "default_dj_fade", +server.register(namespace="vars", + "default_dj_fade", fun (s) -> begin log("vars.default_dj_fade") default_dj_fade := float_of_string(s) s end) server.register(namespace="dynamic_source", @@ -117,7 +117,7 @@ ignore(output.dummy(default, fallible=true)) master_dj_enabled = ref false live_dj_enabled = ref false -scheduled_play_enabled = ref false +scheduled_play_enabled = ref false def make_master_dj_available() master_dj_enabled := true @@ -153,7 +153,7 @@ def live_dj_connect(header) = update_source_status("live_dj", true) end -def live_dj_disconnect() = +def live_dj_disconnect() = update_source_status("live_dj", false) end @@ -161,7 +161,7 @@ def master_dj_connect(header) = update_source_status("master_dj", true) end -def master_dj_disconnect() = +def master_dj_disconnect() = update_source_status("master_dj", false) end @@ -172,7 +172,7 @@ def check_master_dj_client(user,password) = ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --master #{user} #{password}") #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ... ret = list.hd(ret) - + #return true to let the client transmit data, or false to tell harbor to decline ret == "True" end @@ -188,10 +188,10 @@ end def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point, dj_harbor_input_port, dj_harbor_input_mount_point, s) = if master_harbor_input_port != 0 and master_harbor_input_mount_point != "" and dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then - master_dj = mksafe(audio_to_stereo(input.harbor(id="master_harbor", master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client, + master_dj = mksafe(audio_to_stereo(input.harbor(id="master_harbor", master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client, max=40., on_connect=master_dj_connect, on_disconnect=master_dj_disconnect))) dj_live = mksafe(audio_to_stereo(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, - max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect))) + max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect))) master_dj = rewrite_metadata([("artist","Airtime"), ("title", "Master Dj")],master_dj) dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live) @@ -207,9 +207,9 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point, switch(id="master_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!master_dj_enabled},master_dj), ({true}, s)]) elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then dj_live = mksafe(audio_to_stereo(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, - max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect))) - - dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live) + max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect))) + + dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live) ignore(output.dummy(dj_live, fallible=true)) switch(id="live_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!live_dj_enabled},dj_live), ({true}, s)]) @@ -218,8 +218,8 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point, end end -s = switch(id="default_switch", track_sensitive=false, - transitions=[transition_default, transition], +s = switch(id="default_switch", track_sensitive=false, + transitions=[transition_default, transition], [({!scheduled_play_enabled}, stream_queue),({true},default)]) s = append_dj_inputs(master_live_stream_port, master_live_stream_mp, dj_live_stream_port, dj_live_stream_mp, s) @@ -261,48 +261,48 @@ server.register(namespace="streams", if output_sound_device then success = ref false - + log(output_sound_device_type) - + %ifdef output.alsa if output_sound_device_type == "ALSA" then ignore(output.alsa(s)) success := true end %endif - + %ifdef output.ao if output_sound_device_type == "AO" then ignore(output.ao(s)) success := true end %endif - + %ifdef output.oss if output_sound_device_type == "OSS" then ignore(output.oss(s)) success := true end %endif - + %ifdef output.portaudio if output_sound_device_type == "Portaudio" then ignore(output.portaudio(s)) success := true end %endif - + %ifdef output.pulseaudio if output_sound_device_type == "Pulseaudio" then ignore(output.pulseaudio(s)) success := true end %endif - + if (!success == false) then ignore(output.prefered(s)) end - + end if s1_enable == true then @@ -312,8 +312,8 @@ if s1_enable == true then s1_namespace := s1_mount end server.register(namespace=!s1_namespace, "connected", fun (s) -> begin log("#{!s1_namespace}.connected") !s1_connected end) - output_to(s1_output, s1_type, s1_bitrate, s1_host, s1_port, s1_pass, - s1_mount, s1_url, s1_description, s1_genre, s1_user, s, "1", + output_to(s1_output, s1_type, s1_bitrate, s1_host, s1_port, s1_pass, + s1_mount, s1_url, s1_description, s1_genre, s1_user, s, "1", s1_connected, s1_name, s1_channels) end @@ -324,10 +324,10 @@ if s2_enable == true then s2_namespace := s2_mount end server.register(namespace=!s2_namespace, "connected", fun (s) -> begin log("#{!s2_namespace}.connected") !s2_connected end) - output_to(s2_output, s2_type, s2_bitrate, s2_host, s2_port, s2_pass, - s2_mount, s2_url, s2_description, s2_genre, s2_user, s, "2", + output_to(s2_output, s2_type, s2_bitrate, s2_host, s2_port, s2_pass, + s2_mount, s2_url, s2_description, s2_genre, s2_user, s, "2", s2_connected, s2_name, s2_channels) - + end if s3_enable == true then @@ -337,8 +337,8 @@ if s3_enable == true then s3_namespace := s3_mount end server.register(namespace=!s3_namespace, "connected", fun (s) -> begin log("#{!s3_namespace}.connected") !s3_connected end) - output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass, - s3_mount, s3_url, s3_name, s3_genre, s3_user, s, "3", + output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass, + s3_mount, s3_url, s3_name, s3_genre, s3_user, s, "3", s3_connected, s3_description, s3_channels) end