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

CC-2419: Media monitor does not import files that already existed in /srv/airtime/stor

Browse source 
-work in progress
This commit is contained in:
martin 2011-06-29 17:26:42 -04:00
parent 3335ff703a
commit 4ab7523a84
4 changed files with 45 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
View file

@ -5,8 +5,9 @@ from subprocess import Popen, PIPE
class AirtimeMediaMonitorBootstrap():
def __init__(self, logger):
def __init__(self, logger, multi_queue):
self.logger = logger
self.multi_queue = multi_queue
"""
on bootup we want to scan all directories and look for files that
@ -21,21 +22,21 @@ class AirtimeMediaMonitorBootstrap():
def check_for_diff(self, dir):
airtime_tmp = '/var/tmp/airtime'
#find files that have been modified since the last time
#media-monitor process was running.
command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable -mmin -30" % dir
stdout = self.execCommandAndReturnStdOut(command)
self.logger.info("Files modified since last checkin: \n%s\n", stdout)
#TODO: notify about modified and newly created files (not including copied files)
if os.path.exists(airtime_tmp + '/.airtime_media_index'):
#a previous index exists, we can do a diff between this
#file and the current state to see whether anything has
#changed.
self.logger.info("Previous index file found.")
#find files that have been modified since the last time
#media-monitor process was running.
command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable -mmin -30" % dir
stdout = self.execCommandAndReturnStdOut(command)
self.logger.info("Files modified since last checkin: \n%s\n", stdout)
#find deleted files
command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable > %s/.airtime_media_index.tmp" % (dir, airtime_tmp)
self.execCommand(command)
@ -43,6 +44,8 @@ class AirtimeMediaMonitorBootstrap():
command = "diff %s/.airtime_media_index.tmp %s/.airtime_media_index" % (airtime_tmp, airtime_tmp)
stdout = self.execCommandAndReturnStdOut(command)
self.logger.info("Deleted files since last checkin:\n%s\n", stdout)
#TODO: notify about deleted files and files moved here
else:
#a previous index does not exist. Most likely means that
@ -53,6 +56,9 @@ class AirtimeMediaMonitorBootstrap():
#create a new index file.
command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable > %s/.airtime_media_index" % (dir, airtime_tmp)
self.execCommand(command)
#TODO: notify about all files in this directory.
self.multi_queue.put(event)
def execCommand(self, command):
p = Popen(command, shell=True)
@ -71,4 +77,4 @@ class AirtimeMediaMonitorBootstrap():
if __name__ == '__main__':
mmb = AirtimeMediaMonitorBootstrap()
mmb.scan()
mmb.scan()