Merge branch 'saas' into saas-store-file-size-and-hash-in-db

VERSION

@@ -1,2 +0,0 @@
-PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.5.3

airtime_mvc/application/common/FileDataHelper.php

@@ -17,6 +17,12 @@ class FileDataHelper {
             // If the track number isn't numeric, this will return 0
             $data["year"] = intval($data["year"]);
         }
+        if (array_key_exists("bpm", $data)) {
+            //Some BPM tags are silly and include the word "BPM". Let's strip that...
+            $data["year"] = str_ireplace("BPM", "", $data["year"]);
+            // This will convert floats to ints too.
+            $data["year"] = intval($data["year"]);
+        }
     }
 
 }

airtime_mvc/application/configs/conf.php

@@ -8,14 +8,17 @@
 
 class Config {
     private static $CC_CONFIG = null;
+    private static $rootDir;
     public static function loadConfig() {
+
+        self::$rootDir = __DIR__."/../..";
         $CC_CONFIG = array(
                 /* ================================================ storage configuration */
         
                 'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
                 'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
         
-                "rootDir" => __DIR__."/../.."
+                "rootDir" => self::$rootDir
         );
         
         //In the unit testing environment, we always want to use our local airtime.conf in airtime_mvc/application/test:
@@ -89,7 +92,8 @@ class Config {
     public static function setAirtimeVersion() {
         $airtime_version = Application_Model_Preference::GetAirtimeVersion();
         $uniqueid = Application_Model_Preference::GetUniqueId();
-        self::$CC_CONFIG['airtime_version'] = md5($airtime_version.$uniqueid);
+        $buildVersion = file_get_contents(self::$rootDir."/../VERSION");
+        self::$CC_CONFIG['airtime_version'] = md5($airtime_version.$buildVersion);
     }
     
     public static function getConfig() {

airtime_mvc/application/controllers/AudiopreviewController.php

@@ -204,10 +204,14 @@ class AudiopreviewController extends Zend_Controller_Action
                 $elementMap['element_mp3'] = $track['item_id'];
             } elseif (strtolower($mime) === 'audio/ogg') {
                 $elementMap['element_oga'] = $track['item_id'];
+            } elseif (strtolower($mime) === 'audio/vorbis') {
+                $elementMap['element_oga'] = $track['item_id'];
             } elseif (strtolower($mime) === 'audio/mp4') {
                 $elementMap['element_m4a'] = $track['item_id'];
             } elseif (strtolower($mime) === 'audio/wav') {
                 $elementMap['element_wav'] = $track['item_id'];
+            } elseif (strtolower($mime) === 'audio/x-wav') {
+                $elementMap['element_wav'] = $track['item_id'];
             } elseif (strtolower($mime) === 'audio/x-flac') {
                 $elementMap['element_flac'] = $track['item_id'];
             } else {
@@ -289,10 +293,14 @@ class AudiopreviewController extends Zend_Controller_Action
                     $elementMap['element_mp3'] = $track['item_id'];
                 } elseif (strtolower($mime) === 'audio/ogg') {
                     $elementMap['element_oga'] = $track['item_id'];
+                } elseif (strtolower($mime) === 'audio/vorbis') {
+                    $elementMap['element_oga'] = $track['item_id'];
                 } elseif (strtolower($mime) === 'audio/mp4') {
                     $elementMap['element_m4a'] = $track['item_id'];
                 } elseif (strtolower($mime) === 'audio/wav') {
                     $elementMap['element_wav'] = $track['item_id'];
+                } elseif (strtolower($mime) === 'audio/x-wav') {
+                    $elementMap['element_wav'] = $track['item_id'];
                 } elseif (strtolower($mime) === 'audio/x-flac') {
                     $elementMap['element_flac'] = $track['item_id'];
                 } else {

build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+composer install
+
+git rev-parse HEAD > VERSION
+

python_apps/airtime_analyzer/tests/analyzer_pipeline_tests.py

@@ -1,4 +1,5 @@
 from nose.tools import *
+from ConfigParser import SafeConfigParser
 import os
 import shutil
 import multiprocessing
@@ -21,8 +22,11 @@ def teardown():
 def test_basic():
     filename = os.path.basename(DEFAULT_AUDIO_FILE)
     q = multiprocessing.Queue()
-    cloud_storage_config_path = '/etc/airtime-saas/production/cloud_storage.conf'
+    #cloud_storage_config_path = '/etc/airtime-saas/production/cloud_storage.conf'
-    cloud_storage_config = config_file.read_config_file(cloud_storage_config_path)
+    #cloud_storage_config = config_file.read_config_file(cloud_storage_config_path)
+    cloud_storage_config = SafeConfigParser()
+    cloud_storage_config.add_section("current_backend")
+    cloud_storage_config.set("current_backend", "storage_backend", "file")
     file_prefix = u''
     #This actually imports the file into the "./Test Artist" directory.
     AnalyzerPipeline.run_analysis(q, DEFAULT_AUDIO_FILE, u'.', filename, file_prefix, cloud_storage_config)