ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

SoundAdmin.add_view fix

Browse Source
This commit is contained in:
bkfox
2023-01-25 16:21:19 +01:00
parent 4c3878a300
commit c2cd3b0301
6 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,8 +111,12 @@ class Command(BaseCommand):
def monitor(self):
""" Run in monitor mode """
with futures.ThreadPoolExecutor() as pool:
archives_handler = MonitorHandler(settings.AIRCOX_SOUND_ARCHIVES_SUBDIR, pool)
excerpts_handler = MonitorHandler(settings.AIRCOX_SOUND_EXCERPTS_SUBDIR, pool)
archives_handler = MonitorHandler(
settings.AIRCOX_SOUND_ARCHIVES_SUBDIR, pool,
type=Sound.TYPE_ARCHIVE)
excerpts_handler = MonitorHandler(
settings.AIRCOX_SOUND_EXCERPTS_SUBDIR, pool,
type=Sound.TYPE_EXCERPT)
observer = Observer()
observer.schedule(archives_handler, settings.AIRCOX_PROGRAMS_DIR_ABS,

23
aircox/management/sound_file.py
View File

@ -61,12 +61,13 @@ class SoundFile:
def episode(self):
return self.sound and self.sound.episode
def sync(self, sound=None, program=None, deleted=False, **kwargs):
def sync(self, sound=None, program=None, deleted=False, keep_deleted=False,
**kwargs):
"""
Update related sound model and save it.
"""
if deleted:
return self._on_delete(self.path)
return self._on_delete(self.path, keep_deleted)
# FIXME: sound.program as not null
if not program:
@ -99,14 +100,18 @@ class SoundFile:
self.find_playlist(sound)
return sound
def _on_delete(self, path):
def _on_delete(self, path, keep_deleted):
# TODO: remove from db on delete
sound = Sound.objects.path(self.path).first()
if sound:
sound.type = sound.TYPE_REMOVED
sound.check_on_file()
sound.save()
return sound
if keep_deleted:
sound = Sound.objects.path(self.path).first()
if sound:
if keep_deleted:
sound.type = sound.TYPE_REMOVED
sound.check_on_file()
sound.save()
return sound
else:
Sound.objects.path(self.path).delete()
def read_path(self, path):
"""

13
aircox/management/sound_monitor.py
View File

@ -114,16 +114,16 @@ class MonitorHandler(PatternMatchingEventHandler):
pool = None
jobs = {}
def __init__(self, subdir, pool):
def __init__(self, subdir, pool, **sync_kw):
"""
subdir: AIRCOX_SOUND_ARCHIVES_SUBDIR or AIRCOX_SOUND_EXCERPTS_SUBDIR
:param str subdir: sub-directory in program dirs to monitor \
(AIRCOX_SOUND_ARCHIVES_SUBDIR or AIRCOX_SOUND_EXCERPTS_SUBDIR);
:param concurrent.futures.Executor pool: pool executing jobs on file change;
:param **sync_kw: kwargs passed to `SoundFile.sync`;
"""
self.subdir = subdir
self.pool = pool
if self.subdir == settings.AIRCOX_SOUND_ARCHIVES_SUBDIR:
self.sync_kw = {'type': Sound.TYPE_ARCHIVE}
else:
self.sync_kw = {'type': Sound.TYPE_EXCERPT}
self.sync_kw = sync_kw
patterns = ['*/{}/*{}'.format(self.subdir, ext)
for ext in settings.AIRCOX_SOUND_FILE_EXT]
@ -156,7 +156,6 @@ class MonitorHandler(PatternMatchingEventHandler):
self.jobs[key] = handler
def done(r):
print(':::: job done', key)
if self.jobs.get(key) is handler:
del self.jobs[key]
handler.future.add_done_callback(done)