Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 340e5deb51c11c2dd3445cc1483b21c533d5bdef.
This commit is contained in:
Rudi Grinberg 2012-08-15 15:07:09 -04:00
parent a2dfcd6bc2
commit c58e2e7ff9
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python_apps/media-monitor2/media/monitor/pure.py
View file

@ -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'],