From 4906384b39cf9815d33e6ebbebb5a18c39fd88d2 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sun, 12 Jul 2015 11:56:47 +0530
Subject: [PATCH] privoxy: Remove get-enabled from actions

---
 actions/privoxy                    |  8 --------
 plinth/modules/privoxy/__init__.py | 16 ++++++++++++----
 plinth/modules/privoxy/views.py    |  8 ++------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/actions/privoxy b/actions/privoxy
index 293add297..f8ba905de 100755
--- a/actions/privoxy
+++ b/actions/privoxy
@@ -37,8 +37,6 @@ def parse_arguments():
 
     subparsers.add_parser('setup',
                           help='Perform Privoxy configuration setup')
-    subparsers.add_parser('get-enabled',
-                          help='Get whether Privoxy service is enabled')
     subparsers.add_parser('enable', help='Enable Privoxy service')
     subparsers.add_parser('disable', help='Disable Privoxy service')
 
@@ -65,12 +63,6 @@ def subcommand_setup(_):
     action_utils.service_restart('privoxy')
 
 
-def subcommand_get_enabled(_):
-    """Get whether service is enabled."""
-    is_enabled = action_utils.service_is_enabled('privoxy')
-    print('yes' if is_enabled else 'no')
-
-
 def subcommand_enable(_):
     """Start service."""
     action_utils.service_enable('privoxy')
diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py
index daa98c88b..fdb8d8eb4 100644
--- a/plinth/modules/privoxy/__init__.py
+++ b/plinth/modules/privoxy/__init__.py
@@ -22,6 +22,7 @@ Plinth module to configure Privoxy.
 from gettext import gettext as _
 
 from plinth import actions
+from plinth import action_utils
 from plinth import cfg
 from plinth import service as service_module
 
@@ -37,10 +38,17 @@ def init():
     menu.add_urlname(_('Web Proxy (Privoxy)'), 'glyphicon-cloud-upload',
                      'privoxy:index', 50)
 
-    output = actions.run('privoxy', ['get-enabled'])
-    enabled = (output.strip() == 'yes')
-
     global service
     service = service_module.Service(
         'privoxy', _('Privoxy Web Proxy'),
-        is_external=False, enabled=enabled)
+        is_external=False, enabled=is_enabled())
+
+
+def is_enabled():
+    """Return whether the module is enabled."""
+    return action_utils.service_is_enabled('privoxy')
+
+
+def is_running():
+    """Return whether the service is running."""
+    return action_utils.service_is_running('privoxy')
diff --git a/plinth/modules/privoxy/views.py b/plinth/modules/privoxy/views.py
index aeedd4d25..c779a46e7 100644
--- a/plinth/modules/privoxy/views.py
+++ b/plinth/modules/privoxy/views.py
@@ -26,7 +26,6 @@ import logging
 
 from .forms import PrivoxyForm
 from plinth import actions
-from plinth import action_utils
 from plinth import package
 from plinth.modules import privoxy
 
@@ -63,11 +62,8 @@ def index(request):
 
 def get_status():
     """Get the current settings from server."""
-    output = actions.run('privoxy', ['get-enabled'])
-    enabled = (output.strip() == 'yes')
-
-    status = {'enabled': enabled,
-              'is_running': action_utils.service_is_running('privoxy')}
+    status = {'enabled': privoxy.is_enabled(),
+              'is_running': privoxy.is_running()}
 
     return status