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

Merge branch 'cc-3936' into devel

This commit is contained in:
Rudi Grinberg 2012-08-22 17:20:52 -04:00
parent e987f7a0aa c7cf687e66
commit ff24c156e8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python_apps/media-monitor2/media/monitor/eventcontractor.py
View File

@ -57,4 +57,7 @@ class EventContractor(Loggable):
def __unregister(self, evt): def __unregister(self, evt):
try: del self.store[evt.path] try: del self.store[evt.path]
except KeyError as e:
self.logger.info("Contractor failed to unrecord event: '%s'" \
% evt.path)
except Exception as e: self.unexpected_exception(e) except Exception as e: self.unexpected_exception(e)

5
python_apps/media-monitor2/media/monitor/metadata.py
View File

@ -154,6 +154,11 @@ class Metadata(Loggable):
try : full_mutagen = mutagen.File(fpath, easy=True) try : full_mutagen = mutagen.File(fpath, easy=True)
except Exception : raise BadSongFile(fpath) except Exception : raise BadSongFile(fpath)
self.path = fpath self.path = fpath
if not os.path.exists(self.path):
self.logger.info("Attempting to read metadata of file \
that does not exist. Setting metadata to {}")
self.__metadata = {}
return
# TODO : Simplify the way all of these rules are handled right not it's # TODO : Simplify the way all of these rules are handled right not it's
# extremely unclear and needs to be refactored. # extremely unclear and needs to be refactored.
self.__metadata = Metadata.airtime_dict(full_mutagen) self.__metadata = Metadata.airtime_dict(full_mutagen)