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

Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention

Browse source 
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
This commit is contained in:
Naomi Aro 2011-06-06 11:36:47 +02:00
commit a370a4e812
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/media-monitor/MediaMonitor.py
View file

@ -181,6 +181,7 @@ class MediaMonitor(ProcessEvent):
'album':None,
'title':None,
'tracknumber':None}
<<<<<<< HEAD
for key in metadata.keys():
if key in file_info:
@ -250,8 +251,8 @@ class MediaMonitor(ProcessEvent):
def process_IN_CREATE(self, event):
if not event.dir:
if not event.dir:
#file created is a tmp file which will be modified and then moved back to the original filename.
if self.is_temp_file(event.name) :
self.temp_files[event.pathname] = None