Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer

airtime_mvc/application/controllers/UpgradeController.php

@@ -130,12 +130,12 @@ class UpgradeController extends Zend_Controller_Action
             ->findOne();
         $airtime_version = $pref->getValStr();
 
-        if ($airtime_version != '2.5.2') {
+        if (!in_array($airtime_version, array('2.5.1', '2.5.2'))) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.2 to upgrade.");
+                ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.1 or 2.5.2 to upgrade.");
             return false;
         }
         return true;
     }
-}
+}

python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py

@@ -1,6 +1,7 @@
 import time
 import datetime
 import mutagen
+import logging
 from analyzer import Analyzer
 
 class MetadataAnalyzer(Analyzer):
@@ -92,6 +93,7 @@ class MetadataAnalyzer(Analyzer):
             'genre':        'genre',
             'isrc':         'isrc',
             'label':        'label',
+            'organization': 'label',
             #'length':       'length',
             'language':     'language',
             'last_modified':'last_modified',