From a479a11c8f86a6b9a6058d1cb78901fb5f4db38b Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 7 Sep 2012 18:23:14 -0400 Subject: [PATCH] Removed crazy handling of flac. --- airtime_mvc/application/models/StoredFile.php | 4 +++- python_apps/media-monitor2/media/monitor/pure.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 9e6463ed9..312208af8 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -413,8 +413,10 @@ class Application_Model_StoredFile return "ogg"; } elseif ($mime == "audio/mp3" || $mime == "audio/mpeg") { return "mp3"; - } elseif ($mime == "audio/x/flac") { + } elseif ($mime == "audio/x-flac") { return "flac"; + } else { + throw new Exception("Unknown $mime"); } } diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 3116fa3fd..9fe1b41df 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -244,7 +244,7 @@ def normalized_metadata(md, original_path): format_rules = { 'MDATA_KEY_TRACKNUMBER' : parse_int, 'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x), - 'MDATA_KEY_MIME' : lambda x: x.replace('-','/'), + #'MDATA_KEY_MIME' : lambda x: x.replace('-','/'), 'MDATA_KEY_BPM' : lambda x: x[0:8], }