cc-4232: changed bit formatter to give empty string when bitrate is set to 0

airtime_mvc/application/models/formatters/BitrateFormatter.php

@@ -19,6 +19,10 @@ class BitrateFormatter {
     {
         $Kbps = bcdiv($this->_bitrate, 1000, 0);
 
-        return "{$Kbps} Kbps";
+        if($Kbps == 0) {
+            return "";
+        } else {
+            return "{$Kbps} Kbps";
+        }
     }
-}
+}

python_apps/media-monitor2/media/monitor/metadata.py

@@ -51,7 +51,7 @@ airtime_special = {
     "MDATA_KEY_DURATION" :
         lambda m: format_length(getattr(m.info, u'length', 0.0)),
     "MDATA_KEY_BITRATE" :
-        lambda m: getattr(m.info, "bitrate", 0),
+        lambda m: getattr(m.info, "bitrate", ''),
     "MDATA_KEY_SAMPLERATE" :
         lambda m: getattr(m.info, u'sample_rate', 0),
     "MDATA_KEY_MIME" :

python_apps/media-monitor2/media/monitor/pure.py

@@ -209,12 +209,12 @@ def parse_int(s):
     >>> parse_int("123saf")
     123
     >>> parse_int("asdf")
-    0
+    ''
     """
     if s.isdigit(): return s
     else:
-        try   : return reduce(op.add, takewhile(lambda x: x.isdigit(), s))
-        except: return 0
+        try   : return str(reduce(op.add, takewhile(lambda x: x.isdigit(), s)))
+        except: return ''
 
 def normalized_metadata(md, original_path):
     """
@@ -241,10 +241,10 @@ def normalized_metadata(md, original_path):
     # could possibly lead to subtle bugs down the road. Plus the following
     # approach gives us the flexibility to use different defaults for different
     # attributes
+    new_md = remove_whitespace(new_md)
     new_md = apply_rules_dict(new_md, format_rules)
     new_md = default_to(dictionary=new_md, keys=['MDATA_KEY_TITLE'],
             default=no_extension_basename(original_path))
-    new_md = remove_whitespace(new_md)
     new_md = default_to(dictionary=new_md, keys=path_md,
             default=u'')
     new_md = default_to(dictionary=new_md, keys=['MDATA_KEY_FTYPE'],

python_apps/media-monitor2/tests/test_pure.py

@@ -67,4 +67,9 @@ class TestMMP(unittest.TestCase):
         self.assertTrue( mmp.sub_path(d1, f1) )
         self.assertTrue( mmp.sub_path(d2, f1) )
 
+    def test_parse_int(self):
+        self.assertEqual( mmp.parse_int("123"), "123" )
+        self.assertEqual( mmp.parse_int("123asf"), "123" )
+        self.assertEqual( mmp.parse_int("asdf"), "" )
+
 if __name__ == '__main__': unittest.main()