diff --git a/plinth/modules/minidlna/__init__.py b/plinth/modules/minidlna/__init__.py index 65dff2f09..1a0bf6ba7 100644 --- a/plinth/modules/minidlna/__init__.py +++ b/plinth/modules/minidlna/__init__.py @@ -93,3 +93,13 @@ def setup(helper, old_version=None): helper.call('post', actions.superuser_run, 'minidlna', ['setup']) if not old_version: helper.call('post', app.enable) + + +def get_media_dir(): + """Return the currently set media directory.""" + return actions.superuser_run('minidlna', ['get-media-dir']) + + +def set_media_dir(media_dir): + """Set the media directory from which files will be scanned for sharing.""" + actions.superuser_run('minidlna', ['set-media-dir', '--dir', media_dir]) diff --git a/plinth/modules/minidlna/views.py b/plinth/modules/minidlna/views.py index 17ad35b94..0bd84f569 100644 --- a/plinth/modules/minidlna/views.py +++ b/plinth/modules/minidlna/views.py @@ -7,7 +7,7 @@ import os from django.contrib import messages from django.utils.translation import ugettext_lazy as _ -from plinth import actions +from plinth.modules import minidlna from plinth.views import AppView from .forms import MiniDLNAServerForm @@ -20,9 +20,7 @@ class MiniDLNAAppView(AppView): def get_initial(self): """Initial form value as found in the minidlna.conf""" initial = super().get_initial() - initial.update({ - 'media_dir': actions.superuser_run('minidlna', ['get-media-dir']), - }) + initial.update({'media_dir': minidlna.get_media_dir()}) return initial @@ -36,9 +34,7 @@ class MiniDLNAAppView(AppView): messages.error(self.request, _('Specified directory does not exist.')) else: - actions.superuser_run( - 'minidlna', - ['set-media-dir', '--dir', new_config['media_dir']]) + minidlna.set_media_dir(new_config['media_dir']) messages.success(self.request, _('Updated media directory')) return super().form_valid(form)