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

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

Browse source
This commit is contained in:
James 2011-06-24 15:51:57 -04:00
commit e84f80a7f9
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
View file

@ -102,6 +102,8 @@ class AirtimeMetadata:
def get_md_from_file(self, filepath): def get_md_from_file(self, filepath):
self.logger.info("getting info from filepath %s", filepath)
md = {} md = {}
md5 = self.get_md5(filepath) md5 = self.get_md5(filepath)
md['MDATA_KEY_MD5'] = md5 md['MDATA_KEY_MD5'] = md5

10
python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
View file

@ -74,7 +74,15 @@ class AirtimeNotifier(Notifier):
mm.wm.rm_watch(wd, rec=True) mm.wm.rm_watch(wd, rec=True)
mm.set_needed_file_permissions(new_storage_directory, True) mm.set_needed_file_permissions(new_storage_directory, True)
mm.move_file(storage_directory, new_storage_directory)
#move everything in old stor directory to the new stor directory.
old_storage_contents = os.listdir(storage_directory)
for item in old_storage_contents:
fp = "%s/%s" % (storage_directory, item)
nfp = "%s/%s" % (new_storage_directory, item)
self.logger.info("Moving %s to %s", fp, nfp)
mm.move_file(fp, nfp)
self.config.storage_directory = new_storage_directory self.config.storage_directory = new_storage_directory
mm.watch_directory(new_storage_directory) mm.watch_directory(new_storage_directory)

6
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View file

@ -167,12 +167,12 @@ class AirtimeProcessEvent(ProcessEvent):
else: else:
md[m] = orig_md[m] md[m] = orig_md[m]
if 'MDATA_KEY_TRACKNUMBER' in orig_md:
#make sure all track numbers are at least 2 digits long in the filepath. #make sure all track numbers are at least 2 digits long in the filepath.
if len(str(md['MDATA_KEY_TRACKNUMBER'])) == 1: md['MDATA_KEY_TRACKNUMBER'] = "%02d" % (int(md['MDATA_KEY_TRACKNUMBER']))
md['MDATA_KEY_TRACKNUMBER'] = "0"+str(md['MDATA_KEY_TRACKNUMBER'])
#format bitrate as 128kbps #format bitrate as 128kbps
md['MDATA_KEY_BITRATE'] = str(md['MDATA_KEY_BITRATE'])[0:3]+"kbps" md['MDATA_KEY_BITRATE'] = str(md['MDATA_KEY_BITRATE']/1000)+"kbps"
filepath = None filepath = None
#file is recorded by Airtime #file is recorded by Airtime