From 7270893b4de1a957aee8c5f36cf8f72392d23347 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 27 Aug 2012 12:07:54 -0400 Subject: [PATCH] cc-3936: Clarified comments regarding event hooks and file ownership. --- python_apps/media-monitor2/media/monitor/events.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor2/media/monitor/events.py index a36750b7f..660ff4c40 100644 --- a/python_apps/media-monitor2/media/monitor/events.py +++ b/python_apps/media-monitor2/media/monitor/events.py @@ -98,11 +98,11 @@ class BaseEvent(Loggable): events that must catch their own BadSongFile exceptions since generate a set of exceptions instead of a single one """ - # pack will only throw an exception if it processes one file but this - # is a little bit hacky try: self._pack_hook() ret = self.pack() + # Remove owner of this file only after packing. Otherwise packing + # will not serialize the owner correctly into the airtime request owners.remove_file_owner(self.path) return ret except BadSongFile as e: return [e] @@ -114,6 +114,8 @@ class BaseEvent(Loggable): self.path = evt.path self.__class__ = evt.__class__ # We don't transfer the _pack_hook over to the new event + # TODO : perhaps we should call the old events pack_hook just to make + # sure everything is done cleanly? return self def assign_owner(self,req):