From 22453f382054a078b5d38f1b91e268ffe5531a58 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 12 Jun 2012 11:31:10 -0400
Subject: [PATCH] CC-3968: Cannot preview file as * .MP3

-fixed
---
 airtime_mvc/application/controllers/ApiController.php  |  2 +-
 .../application/controllers/AudiopreviewController.php |  8 ++++----
 .../public/js/airtime/audiopreview/preview_jplayer.js  | 10 ++++------
 .../airtimefilemonitor/mediamonitorcommon.py           |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 7a800f4e7..1e9ea7313 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -148,7 +148,7 @@ class ApiController extends Zend_Controller_Action
                         //user clicks play button for track and downloads it.
                         header('Content-Disposition: inline; filename="'.$file_base_name.'"');
                     }
-                    if ($ext === 'mp3'){
+                    if (strtolower($ext) === 'mp3'){
                         $this->smartReadFile($filepath, 'audio/mpeg');
                     } else {
                         $this->smartReadFile($filepath, 'audio/'.$ext);
diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index 4aaf07ee5..df31d8cd0 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -106,9 +106,9 @@ class AudiopreviewController extends Zend_Controller_Action
                               'element_position' => isset($track['position'])?$track['position']:"",
                             );
             $fileExtension = pathinfo($track['CcFiles']['filepath'], PATHINFO_EXTENSION);
-            if ($fileExtension === 'mp3'){
+            if (strtolower($fileExtension) === 'mp3'){
                 $elementMap['element_mp3'] = $track['CcFiles']['gunid'].'.'.$fileExtension;
-            } else if( $fileExtension === 'ogg') {
+            } else if(strtolower($fileExtension) === 'ogg') {
                 $elementMap['element_oga'] = $track['CcFiles']['gunid'].'.'.$fileExtension;
             } else {
                 //the media was neither mp3 or ogg
@@ -181,9 +181,9 @@ class AudiopreviewController extends Zend_Controller_Action
             );
            
             $fileExtension = pathinfo($track['filepath'], PATHINFO_EXTENSION);
-            if ($fileExtension === 'mp3'){
+            if (strtolower($fileExtension) === 'mp3'){
                 $elementMap['element_mp3'] = $track['gunid'].'.'.$fileExtension;
-            } else if( $fileExtension === 'ogg') {
+            } else if(strtolower($fileExtension) === 'ogg') {
                 $elementMap['element_oga'] = $track['gunid'].'.'.$fileExtension;
             } else {
                 //the media was neither mp3 or ogg
diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
index caf5ab963..149cd82ce 100644
--- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
+++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
@@ -166,25 +166,23 @@ function play(p_playlistIndex){
  */
 function playOne(p_audioFileID) {
     var playlist = new Array();
-    var fileExtensioin = p_audioFileID.split('.').pop();
-    console.log(p_audioFileID);
-    if (fileExtensioin === 'mp3') {
+    var fileExtension = p_audioFileID.split('.').pop();
+    if (fileExtension.toLowerCase() === 'mp3') {
         media = {title: $('.audioFileTitle').text() !== 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() !== 'null' ?$('.audioFileArtist').text():"",
             mp3:"/api/get-media/file/"+p_audioFileID
         };
-    }else if (fileExtensioin === 'ogg' ) {
+    }else if (fileExtension.toLowerCase() === 'ogg' ) {
         media = {title: $('.audioFileTitle').text() != 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() != 'null' ?$('.audioFileArtist').text():"",
             oga:"/api/get-media/file/"+p_audioFileID
         };
     }
     _playlist_jplayer.option("autoPlay", true);
-    console.log(media);
     playlist[0] = media;
     //_playlist_jplayer.setPlaylist(playlist); --if I use this the player will call _init on the setPlaylist and on the ready
     _playlist_jplayer._initPlaylist(playlist);
     _playlist_jplayer.play(0);
     
     window.resizeTo(490, 167);
-}
\ No newline at end of file
+}
diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index 9cbefd28f..9ca0fcf88 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -212,7 +212,7 @@ class MediaMonitorCommon:
 
         try:
             #will be in the format .ext
-            file_ext = os.path.splitext(original_path)[1]
+            file_ext = os.path.splitext(original_path)[1].lower()
             path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE', 'MDATA_KEY_TRACKNUMBER', 'MDATA_KEY_BITRATE']
 
             md = {}