From 6981a5cb4954369182eb640b28cd9b7736df1481 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 8 Aug 2012 10:31:05 -0400
Subject: [PATCH] cc-4105: added truncation of BPM to prevent crashes

---
 airtime_mvc/application/controllers/ApiController.php | 2 ++
 python_apps/api_clients/api_client.cfg                | 2 --
 python_apps/media-monitor2/media/monitor/pure.py      | 3 ++-
 python_apps/media-monitor2/tests/live_client.cfg      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 923b83ab0..5ccbfba4a 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -614,6 +614,8 @@ class ApiController extends Zend_Controller_Action
             }
         }
 
+        Logging::log( $md );
+
         // update import timestamp
         Application_Model_Preference::SetImportTimestamp();
         if ($mode == "create") {
diff --git a/python_apps/api_clients/api_client.cfg b/python_apps/api_clients/api_client.cfg
index 5645f8cc3..83ebb9210 100644
--- a/python_apps/api_clients/api_client.cfg
+++ b/python_apps/api_clients/api_client.cfg
@@ -70,8 +70,6 @@ upload_file_url = 'upload-file/format/json/api_key/%%api_key%%'
 
 # URL to commit multiple updates from media monitor at the same time
 
-reload_metadata_group = 'reload-metadata-group/format/json/api_key/%%api_key%%'
-
 #number of retries to upload file if connection problem
 upload_retries = 3
 
diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py
index d224c791d..b38b69d0b 100644
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@@ -182,7 +182,8 @@ def normalized_metadata(md, original_path):
         'MDATA_KEY_BITRATE' : lambda x: str(int(x) / 1000) + "kbps",
         # note: you don't actually need the lambda here. It's only used for clarity
         '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],
     }
     path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE',
                'MDATA_KEY_TRACKNUMBER', 'MDATA_KEY_BITRATE']
diff --git a/python_apps/media-monitor2/tests/live_client.cfg b/python_apps/media-monitor2/tests/live_client.cfg
index 468be306c..b97bad543 100644
--- a/python_apps/media-monitor2/tests/live_client.cfg
+++ b/python_apps/media-monitor2/tests/live_client.cfg
@@ -15,7 +15,7 @@ check_filesystem_events = 5 #how long to queue up events performed on the files
 check_airtime_events = 30 #how long to queue metadata input from airtime.
 
 touch_interval = 5
-chunking_number = 1
+chunking_number = 450
 request_max_wait = 3.0
 rmq_event_wait = 0.5
 logpath = '/home/rudi/throwaway/mm2.log'