@@ -66,17 +72,17 @@
{% if disk.percent_used < 75 %}
- {{ disk.percent_used }}%
-
-
- {{ disk.used_str }} / {{ disk.size_str }}
+ role="progressbar" aria-valuenow="disk.percent_used"
+ aria-valuemin="0" aria-valuemax="100"
+ style="width: {{ disk.percent_used }}%;">
+ {{ disk.percent_used }}%
+
+
+ {{ disk.used_str }} / {{ disk.size_str }}
{% endfor %}
@@ -100,4 +106,55 @@
{% endif %}
+ {% block status %}
+
+ {{ block.super }}
+
+ {% trans "Removable Devices" %}
+
+ {% if not devices %}
+
+ {% blocktrans trimmed %}
+ There are no additional storage devices attached.
+ {% endblocktrans %}
+
+ {% else %}
+
+
+
+ | {% trans "Device" %} |
+ {% trans "Label" %} |
+ {% trans "Mount Point" %} |
+ {% trans "Type" %} |
+ {% trans "Size" %} |
+ {% trans "Actions" %} |
+
+
+
+ {% for device in devices %}
+
+ | {{ device.device }} |
+ {{ device.label }} |
+ {{ device.mount_points|join:', ' }} |
+ {{ device.filesystem_type }} |
+ {{ device.size }} |
+
+ {% if device.mount_points %}
+
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+ {% endif %}
+
+ {% endblock %}
{% endblock %}
diff --git a/plinth/modules/udiskie/udisks2.py b/plinth/modules/storage/udisks2.py
similarity index 100%
rename from plinth/modules/udiskie/udisks2.py
rename to plinth/modules/storage/udisks2.py
diff --git a/plinth/modules/storage/urls.py b/plinth/modules/storage/urls.py
index 6f005e079..1eda3efa0 100644
--- a/plinth/modules/storage/urls.py
+++ b/plinth/modules/storage/urls.py
@@ -14,7 +14,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
#
-
"""
URLs for the disks module.
"""
@@ -23,8 +22,9 @@ from django.conf.urls import url
from . import views
-
urlpatterns = [
url(r'^sys/storage/$', views.index, name='index'),
url(r'^sys/storage/expand$', views.expand, name='expand'),
+ url(r'^sys/storage/eject/(?P[\w%]+)/$', views.eject,
+ name='eject')
]
diff --git a/plinth/modules/storage/views.py b/plinth/modules/storage/views.py
index b3738cbf5..80db7f7f0 100644
--- a/plinth/modules/storage/views.py
+++ b/plinth/modules/storage/views.py
@@ -19,16 +19,20 @@ Views for storage module.
"""
import logging
+import urllib.parse
from django.contrib import messages
from django.shortcuts import redirect
from django.template.response import TemplateResponse
from django.urls import reverse
from django.utils.translation import ugettext as _
+from django.views.decorators.http import require_POST
from plinth.modules import storage
from plinth.utils import format_lazy, is_user_admin
+from . import udisks2
+
logger = logging.getLogger(__name__)
@@ -44,7 +48,9 @@ def index(request):
return TemplateResponse(
request, 'storage.html', {
'title': _('Storage'),
+ 'description': storage.description,
'disks': disks,
+ 'devices': udisks2.list_devices(),
'manual_page': storage.manual_page,
'expandable_root_size': expandable_root_size
})
@@ -73,9 +79,10 @@ def expand_partition(request, device):
try:
storage.expand_partition(device)
except Exception as exception:
- messages.error(request,
- _('Error expanding partition: {exception}')
- .format(exception=exception))
+ messages.error(
+ request,
+ _('Error expanding partition: {exception}')
+ .format(exception=exception))
else:
messages.success(request, _('Partition expanded successfully.'))
@@ -106,3 +113,37 @@ def warn_about_low_disk_space(request):
messages.error(request, message)
elif percent_used > 75 or free_gib < 2:
messages.warning(request, message)
+
+
+@require_POST
+def eject(request, device_path):
+ """Eject a device, given its path.
+
+ Device path is quoted with slashes written as %2F.
+
+ """
+ device_path = urllib.parse.unquote(device_path)
+
+ try:
+ drive = udisks2.eject_drive_of_device(device_path)
+ if drive:
+ messages.success(
+ request,
+ _('{drive_vendor} {drive_model} can be safely unplugged.')
+ .format(drive_vendor=drive['vendor'],
+ drive_model=drive['model']))
+ else:
+ messages.success(request, _('Device can be safely unplugged.'))
+ except Exception as exception:
+ try:
+ message = udisks2.get_error_message(exception)
+ except AttributeError:
+ message = str(exception)
+
+ logger.exception('Error ejecting device - %s', message)
+ messages.error(
+ request,
+ _('Error ejecting device: {error_message}').format(
+ error_message=message))
+
+ return redirect(reverse('storage:index'))
diff --git a/plinth/modules/udiskie/__init__.py b/plinth/modules/udiskie/__init__.py
deleted file mode 100644
index 1c8d531cd..000000000
--- a/plinth/modules/udiskie/__init__.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-"""
-FreedomBox app for udiskie.
-"""
-
-from django.utils.translation import ugettext_lazy as _
-
-from plinth import action_utils, actions
-from plinth import service as service_module
-from plinth.menu import main_menu
-
-version = 1
-
-managed_services = ['freedombox-udiskie']
-
-managed_packages = ['udiskie', 'gir1.2-udisks-2.0']
-
-name = _('udiskie')
-
-short_description = _('Removable Media')
-
-description = [
- _('udiskie allows automatic mounting of removable media, such as flash '
- 'drives.'),
-]
-
-service = None
-
-
-def init():
- """Intialize the module."""
- menu = main_menu.get('system')
- menu.add_urlname(name, 'glyphicon-floppy-disk', 'udiskie:index',
- short_description)
-
- global service
- setup_helper = globals()['setup_helper']
- if setup_helper.get_state() != 'needs-setup':
- service = service_module.Service(
- managed_services[0], name, ports=[], is_external=True,
- is_enabled=is_enabled, enable=enable, disable=disable,
- is_running=is_running)
-
-
-def setup(helper, old_version=None):
- """Install and configure the module."""
- helper.install(managed_packages, skip_recommends=True)
- helper.call('post', actions.superuser_run, 'udiskie', ['enable'])
- global service
- if service is None:
- service = service_module.Service(
- managed_services[0], name, ports=[], is_external=True,
- is_enabled=is_enabled, enable=enable, disable=disable,
- is_running=is_running)
- helper.call('post', service.notify_enabled, None, True)
-
-
-def is_running():
- """Return whether the service is running."""
- return action_utils.service_is_running('freedombox-udiskie')
-
-
-def is_enabled():
- """Return whether the module is enabled."""
- return action_utils.service_is_enabled('freedombox-udiskie')
-
-
-def enable():
- """Enable the module."""
- actions.superuser_run('udiskie', ['enable'])
-
-
-def disable():
- """Disable the module."""
- actions.superuser_run('udiskie', ['disable'])
diff --git a/plinth/modules/udiskie/templates/udiskie.html b/plinth/modules/udiskie/templates/udiskie.html
deleted file mode 100644
index d30ae9126..000000000
--- a/plinth/modules/udiskie/templates/udiskie.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{% extends "service.html" %}
-{% comment %}
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-{% endcomment %}
-
-{% load bootstrap %}
-{% load i18n %}
-{% load static %}
-
-{% block status %}
-
- {{ block.super }}
-
- {% trans "Devices" %}
-
- {% if not devices %}
-
- {% blocktrans trimmed %}
- There are no additional storage devices attached.
- {% endblocktrans %}
-
- {% else %}
-
-
-
- | {% trans "Device" %} |
- {% trans "Label" %} |
- {% trans "Size" %} |
- {% trans "Filesystem" %} |
- {% trans "Mount Point" %} |
- {% trans "Actions" %} |
-
-
-
- {% for device in devices %}
-
- | {{ device.device }} |
- {{ device.label }} |
- {{ device.size }} |
- {{ device.filesystem_type }} |
- {{ device.mount_points|join:', ' }} |
-
- {% if device.mount_points %}
-
- {% endif %}
- |
-
- {% endfor %}
-
-
- {% endif %}
-
-{% endblock %}
diff --git a/plinth/modules/udiskie/urls.py b/plinth/modules/udiskie/urls.py
deleted file mode 100644
index 519acb26b..000000000
--- a/plinth/modules/udiskie/urls.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-"""
-URLs for the udiskie module.
-"""
-
-from django.conf.urls import url
-
-from plinth.modules import udiskie
-
-from .views import Index, eject
-
-urlpatterns = [
- url(
- r'^sys/udiskie/$',
- Index.as_view(service_id=udiskie.managed_services[0],
- description=udiskie.description, show_status_block=True),
- name='index'),
- url(r'^sys/udiskie/eject/(?P[\w%]+)/$', eject, name='eject'),
-]
diff --git a/plinth/modules/udiskie/views.py b/plinth/modules/udiskie/views.py
deleted file mode 100644
index c00cbb689..000000000
--- a/plinth/modules/udiskie/views.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-"""
-Views for udiskie module.
-"""
-
-import urllib.parse
-from logging import Logger
-
-from django.contrib import messages
-from django.shortcuts import redirect
-from django.urls import reverse
-from django.utils.translation import ugettext as _
-from django.views.decorators.http import require_POST
-
-from plinth.views import ServiceView
-
-from . import udisks2
-
-logger = Logger(__name__)
-
-
-class Index(ServiceView):
- """View to show devices."""
- template_name = 'udiskie.html'
-
- def get_context_data(self, *args, **kwargs):
- """Return the context data rendering the template."""
- context = super().get_context_data(**kwargs)
- context['devices'] = udisks2.list_devices()
- return context
-
-
-@require_POST
-def eject(request, device_path):
- """Eject a device, given its path.
-
- Device path is quoted with slashes written as %2F.
-
- """
- device_path = urllib.parse.unquote(device_path)
-
- try:
- drive = udisks2.eject_drive_of_device(device_path)
- if drive:
- messages.success(
- request,
- _('{drive_vendor} {drive_model} can be safely unplugged.')
- .format(drive_vendor=drive['vendor'],
- drive_model=drive['model']))
- else:
- messages.success(request, _('Device can be safely unplugged.'))
- except Exception as exception:
- try:
- message = udisks2.get_error_message(exception)
- except AttributeError:
- message = str(exception)
-
- logger.exception('Error ejecting device - %s', message)
- messages.error(
- request,
- _('Error ejecting device: {error_message}').format(
- error_message=message))
-
- return redirect(reverse('udiskie:index'))