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

MM2: Normalize directory paths received from airtime once and for all.

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-10 17:39:43 -04:00
parent 43bef4939e
commit 3fc60c741d
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/media-monitor2/media/monitor/airtime.py
View file

@ -54,6 +54,7 @@ class AirtimeNotifier(Loggable):
message.ack() message.ack()
self.logger.info("Received md from RabbitMQ: %s" % str(body)) self.logger.info("Received md from RabbitMQ: %s" % str(body))
m = json.loads(message.body) m = json.loads(message.body)
if 'directory' in m: m['directory'] = normpath(m['directory'])
self.handler.message(m) self.handler.message(m)
class AirtimeMessageReceiver(Loggable): class AirtimeMessageReceiver(Loggable):
@ -119,6 +120,7 @@ class AirtimeMessageReceiver(Loggable):
% md_path, e) % md_path, e)
def new_watch(self, msg): def new_watch(self, msg):
msg['directory'] = normpath(msg['directory'])
self.logger.info("Creating watch for directory: '%s'" % self.logger.info("Creating watch for directory: '%s'" %
msg['directory']) msg['directory'])
if not os.path.exists(msg['directory']): if not os.path.exists(msg['directory']):