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

CC-3878: Recorded media file's track number is changed after restarting media-monitor 

- fixed
This commit is contained in:
James 2012-06-06 14:18:54 -04:00
parent f57d316b6c
commit 0ca45e343b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View File

@ -493,7 +493,7 @@ class ApiController extends Zend_Controller_Action
//$file->setMetadataValue('MDATA_KEY_TITLE', $tmpTitle); //$file->setMetadataValue('MDATA_KEY_TITLE', $tmpTitle);
$file->setMetadataValue('MDATA_KEY_CREATOR', "Airtime Show Recorder"); $file->setMetadataValue('MDATA_KEY_CREATOR', "Airtime Show Recorder");
$file->setMetadataValue('MDATA_KEY_TRACKNUMBER', null); $file->setMetadataValue('MDATA_KEY_TRACKNUMBER', $show_instance_id);
if (!$showCanceled && Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud()) if (!$showCanceled && Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud())
{ {

14
python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
View File

@ -159,7 +159,7 @@ class AirtimeNotifier(Notifier):
return return
md.update(mutagen) md.update(mutagen)
if event['is_recorded_show']: if 'is_recorded_show' in event and event['is_recorded_show']:
self.api_client.update_media_metadata(md, mode, True) self.api_client.update_media_metadata(md, mode, True)
else: else:
self.api_client.update_media_metadata(md, mode) self.api_client.update_media_metadata(md, mode)
@ -169,12 +169,16 @@ class AirtimeNotifier(Notifier):
if mutagen is None: if mutagen is None:
return return
md.update(mutagen) md.update(mutagen)
self.api_client.update_media_metadata(md, mode) if 'is_recorded_show' in event and event['is_recorded_show']:
self.api_client.update_media_metadata(md, mode, True)
else:
self.api_client.update_media_metadata(md, mode)
elif (mode == self.config.MODE_MOVED): elif (mode == self.config.MODE_MOVED):
md['MDATA_KEY_MD5'] = self.md_manager.get_md5(filepath) md['MDATA_KEY_MD5'] = self.md_manager.get_md5(filepath)
self.api_client.update_media_metadata(md, mode) if 'is_recorded_show' in event and event['is_recorded_show']:
self.api_client.update_media_metadata(md, mode, True)
else:
self.api_client.update_media_metadata(md, mode)
elif (mode == self.config.MODE_DELETE): elif (mode == self.config.MODE_DELETE):
self.api_client.update_media_metadata(md, mode) self.api_client.update_media_metadata(md, mode)

3
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View File

@ -180,7 +180,8 @@ class AirtimeProcessEvent(ProcessEvent):
if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory): if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory):
self.logger.info("Modified: %s", pathname) self.logger.info("Modified: %s", pathname)
if self.mmc.is_audio_file(name): if self.mmc.is_audio_file(name):
self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY}) is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory)
self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY, 'is_recorded_show': is_recorded})
# if change is detected on /etc/mtab, we check what mount(file system) was added/removed # if change is detected on /etc/mtab, we check what mount(file system) was added/removed
# and act accordingly # and act accordingly