Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-08-20 10:55:13 -04:00
commit 9f903833d7
2 changed files with 41 additions and 2 deletions

View file

@ -270,8 +270,10 @@ def organized_path(old_path, root_path, orig_md):
ext = extension(old_path) ext = extension(old_path)
# The blocks for each if statement look awfully similar. Perhaps there is a # The blocks for each if statement look awfully similar. Perhaps there is a
# way to simplify this code # way to simplify this code
normal_md = default_to_f(orig_md, path_md, unicode_unknown, def default_f(dictionary, key):
lambda dictionary, key: len(dictionary[key]) == 0) if key in dictionary: return len(dictionary[key]) == 0
else: return True
normal_md = default_to_f(orig_md, path_md, unicode_unknown, default_f)
if is_airtime_recorded(normal_md): if is_airtime_recorded(normal_md):
fname = u'%s-%s-%s.%s' % ( normal_md['MDATA_KEY_YEAR'], fname = u'%s-%s-%s.%s' % ( normal_md['MDATA_KEY_YEAR'],
normal_md['MDATA_KEY_TITLE'], normal_md['MDATA_KEY_TITLE'],

View file

@ -0,0 +1,37 @@
import os
from configobj import ConfigObj
import traceback
upgrades_config = {
'/etc/airtime/media-monitor.cfg' :
{
'check_filesystem_events' : 5,
'check_airtime_events' : 30,
'touch_interval' : 5,
'chunking_number' : 450,
'request_max_wait' : 3.0,
'rmq_event_wait' : 0.1,
'logpath' : '/var/log/airtime/media-monitor/media-monitor.log',
'index_path' : '/var/tmp/airtime/media-monitor/last_index',
},
'/etc/airtime/api_client.cfg' :
{
'reload_metadata_group' :
'reload-metadata-group/format/json/api_key/%%api_key%%',
}
}
def upgrade(upgrade_data):
for f, values in upgrade_data:
if not os.path.exists(f):
print("Cannot upgrade '%s'. Skipping this file" % f)
continue
try:
cfg = ConfigObj(f)
for k,v in values:
if k not in cfg: cfg[k] = v
except Exception:
print("Error upgrading")
print( traceback.format_exc() )
if __name__ == "__main__": upgrade(upgrades_config)