rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

fix sound path query bugs

Browse Source
This commit is contained in:
bkfox 2022-10-10 19:08:51 +02:00
parent 05a3b9c95d
commit 1fed61f47f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aircox/management/commands/sounds_monitor.py
View File

@ -74,7 +74,7 @@ class SoundFile:
Update related sound model and save it.
"""
if deleted:
sound = Sound.objects.filter(file=self.path).first()
sound = Sound.objects.path(self.path).first()
if sound:
sound.type = sound.TYPE_REMOVED
sound.check_on_file()
@ -249,7 +249,7 @@ class MonitorHandler(PatternMatchingEventHandler):
logger.info('sound deleted: %s', event.src_path)
def deleted(event):
SoundFile(event.src_path).sync(deleted=True)
self.pool.submit(deleted, event.src_path)
self.pool.submit(deleted, event)
class Command(BaseCommand):
@ -325,9 +325,9 @@ class Command(BaseCommand):
excerpts_handler = MonitorHandler(settings.AIRCOX_SOUND_EXCERPTS_SUBDIR, pool)
observer = Observer()
observer.schedule(archives_handler, settings.AIRCOX_PROGRAMS_DIR,
observer.schedule(archives_handler, settings.AIRCOX_PROGRAMS_DIR_ABS,
recursive=True)
observer.schedule(excerpts_handler, settings.AIRCOX_PROGRAMS_DIR,
observer.schedule(excerpts_handler, settings.AIRCOX_PROGRAMS_DIR_ABS,
recursive=True)
observer.start()

4
aircox/models/program.py
View File

@ -98,8 +98,8 @@ class Program(Page):
Return a Program from the given path. We assume the path has been
given in a previous time by this model (Program.path getter).
"""
if path.startswith(settings.AIRCOX_PROGRAMS_DIR):
path = path.replace(settings.AIRCOX_PROGRAMS_DIR + '/', '')
if path.startswith(settings.AIRCOX_PROGRAMS_DIR_ABS):
path = path.replace(settings.AIRCOX_PROGRAMS_DIR_ABS, '')
while path[0] == '/':
path = path[1:]
path = path[:path.index('/')]

4
aircox/settings.py
View File

@ -86,7 +86,9 @@ ensure('AIRCOX_DEFAULT_USER_GROUPS', {
})
# Directory for the programs data
ensure('AIRCOX_PROGRAMS_DIR', os.path.join(settings.MEDIA_ROOT, 'programs'))
ensure('AIRCOX_PROGRAMS_DIR', 'programs')
ensure('AIRCOX_PROGRAMS_DIR_ABS', os.path.join(settings.MEDIA_ROOT,
AIRCOX_PROGRAMS_DIR))
########################################################################