From d606b4b173d75ca50d9d3f586209a53a10f5f5b4 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 1 Aug 2011 12:22:20 +0200 Subject: [PATCH] CC-2612 : Upgrade: Push DB metadata into the file before upgrade --- .../airtimefilemonitor/mediamonitorcommon.py | 15 +++++++++++- .../airtime-1.9.0/media-monitor-upgrade.py | 23 +++++++++++++++---- .../airtimefilemonitor/mediamonitorcommon.py | 15 +++++++++++- python_apps/show-recorder/recorder.py | 2 +- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/mediamonitorcommon.py b/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/mediamonitorcommon.py index fa1fcbd8f..4a42095f1 100644 --- a/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/mediamonitorcommon.py +++ b/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/mediamonitorcommon.py @@ -189,10 +189,23 @@ class MediaMonitorCommon: filepath = None #file is recorded by Airtime #/srv/airtime/stor/recorded/year/month/year-month-day-time-showname-bitrate.ext - if(md['MDATA_KEY_CREATOR'] == "AIRTIMERECORDERSOURCEFABRIC".encode('utf-8')): + if(md['MDATA_KEY_CREATOR'] == "Airtime Show Recorder".encode('utf-8')): #yyyy-mm-dd-hh-MM-ss y = orig_md['MDATA_KEY_YEAR'].split("-") filepath = '%s/%s/%s/%s/%s-%s-%s%s' % (storage_directory, "recorded".encode('utf-8'), y[0], y[1], orig_md['MDATA_KEY_YEAR'], md['MDATA_KEY_TITLE'], md['MDATA_KEY_BITRATE'], file_ext) + + #"Show-Title-2011-03-28-17:15:00" + title = md['MDATA_KEY_TITLE'].split("-") + show_hour = title[0] + show_min = title[1] + show_sec = title[2] + show_name = title[3:] + + new_md = {} + new_md["MDATA_KEY_FILEPATH"] = original_path + new_md['MDATA_KEY_TITLE'] = '%s-%s-%s-%s-%s' % (show_name, orig_md['MDATA_KEY_YEAR'], show_hour, show_min, show_sec) + self.md_manager.save_md_to_file(new_md) + elif(md['MDATA_KEY_TRACKNUMBER'] == u'unknown'.encode('utf-8')): filepath = '%s/%s/%s/%s/%s-%s%s' % (storage_directory, "imported".encode('utf-8'), md['MDATA_KEY_CREATOR'], md['MDATA_KEY_SOURCE'], md['MDATA_KEY_TITLE'], md['MDATA_KEY_BITRATE'], file_ext) else: diff --git a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py index 13242e4d2..6db6f933d 100644 --- a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py +++ b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py @@ -46,12 +46,17 @@ except Exception, e: mmc.set_needed_file_permissions(stor_dir, True) mmc.set_needed_file_permissions(organize_dir, True) +#read list of all files in stor location.....and one-by-one pass this through to +#mmc.organize_files. print out json encoding of before and after +pairs = [] + f = open('storDump.txt','r') for line in f.readlines(): db_md = line.split("SF_BACKUP_1.9.0") logger.debug(db_md) file_md = {} - file_md['MDATA_KEY_FILEPATH'] = db_md[1] + old_filepath = db_md[1] + file_md["MDATA_KEY_FILEPATH"] = old_filepath #file is recorded #format 1 title year month day hour min @@ -63,7 +68,13 @@ for line in f.readlines(): if match: file_md["MDATA_KEY_TITLE"] = match.group(0) + file_md["MDATA_KEY_TITLE"] = db_md[6]+"-"+db_md[7]+"-00-"+file_md["MDATA_KEY_TITLE"] file_md["MDATA_KEY_YEAR"] = db_md[3]+"-"+db_md[4]+"-"+db_md[5] + + file_md["MDATA_KEY_CREATOR"] = "Airtime Show Recorder".encode('utf-8') + + #mmc.md_manager.save_md_to_file(file_md) + #file is regular audio file #format 0 title artist album track else: @@ -80,11 +91,15 @@ for line in f.readlines(): mmc.md_manager.save_md_to_file(file_md) + #new_filepath = mmc.organize_new_file(old_filepath) + + #if new_filepath is not None: + #pair = old_filepath, new_filepath + #pairs.append(pair) + #mmc.set_needed_file_permissions(new_filepath, False) + f.close() -#read list of all files in stor location.....and one-by-one pass this through to -#mmc.organize_files. print out json encoding of before and after -pairs = [] for root, dirs, files in os.walk(mmconfig.storage_directory): for f in files: old_filepath = os.path.join(root, f) diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py index fa1fcbd8f..4a42095f1 100644 --- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py +++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py @@ -189,10 +189,23 @@ class MediaMonitorCommon: filepath = None #file is recorded by Airtime #/srv/airtime/stor/recorded/year/month/year-month-day-time-showname-bitrate.ext - if(md['MDATA_KEY_CREATOR'] == "AIRTIMERECORDERSOURCEFABRIC".encode('utf-8')): + if(md['MDATA_KEY_CREATOR'] == "Airtime Show Recorder".encode('utf-8')): #yyyy-mm-dd-hh-MM-ss y = orig_md['MDATA_KEY_YEAR'].split("-") filepath = '%s/%s/%s/%s/%s-%s-%s%s' % (storage_directory, "recorded".encode('utf-8'), y[0], y[1], orig_md['MDATA_KEY_YEAR'], md['MDATA_KEY_TITLE'], md['MDATA_KEY_BITRATE'], file_ext) + + #"Show-Title-2011-03-28-17:15:00" + title = md['MDATA_KEY_TITLE'].split("-") + show_hour = title[0] + show_min = title[1] + show_sec = title[2] + show_name = title[3:] + + new_md = {} + new_md["MDATA_KEY_FILEPATH"] = original_path + new_md['MDATA_KEY_TITLE'] = '%s-%s-%s-%s-%s' % (show_name, orig_md['MDATA_KEY_YEAR'], show_hour, show_min, show_sec) + self.md_manager.save_md_to_file(new_md) + elif(md['MDATA_KEY_TRACKNUMBER'] == u'unknown'.encode('utf-8')): filepath = '%s/%s/%s/%s/%s-%s%s' % (storage_directory, "imported".encode('utf-8'), md['MDATA_KEY_CREATOR'], md['MDATA_KEY_SOURCE'], md['MDATA_KEY_TITLE'], md['MDATA_KEY_BITRATE'], file_ext) else: diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index 83ae5e1f5..8c171f6f9 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -132,7 +132,7 @@ class ShowRecorder(Thread): name = time+"-"+self.show_name name.encode('utf-8') - artist = "AIRTIMERECORDERSOURCEFABRIC".encode('utf-8') + artist = "Airtime Show Recorder".encode('utf-8') #set some metadata for our file daemon recorded_file = mutagen.File(filepath, easy=True)