From ba4d73ae609e40b6796981572185ee6b48bc5026 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 1 Apr 2019 16:35:09 -0700 Subject: [PATCH] i2p: Minor styling changes Signed-off-by: Sunil Mohan Adapa --- actions/i2p | 11 +++++------ plinth/modules/i2p/__init__.py | 23 +++++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/actions/i2p b/actions/i2p index de6e5f70c..343c6e4d8 100755 --- a/actions/i2p +++ b/actions/i2p @@ -15,7 +15,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # - """ Wrapper to list and handle system services """ @@ -28,7 +27,7 @@ from plinth import action_utils, cfg cfg.read() module_config_path = os.path.join(cfg.config_dir, 'modules-enabled') -I2P_CONF_DIR = "/var/lib/i2p/i2p-config" +I2P_CONF_DIR = '/var/lib/i2p/i2p-config' def parse_arguments(): @@ -89,7 +88,7 @@ def subcommand_add_favorite(arguments): :param arguments: :type arguments: """ - router_config_path = os.path.join(I2P_CONF_DIR, "router.config") + router_config_path = os.path.join(I2P_CONF_DIR, 'router.config') # Read config with open(router_config_path) as config_file: config_lines = config_file.readlines() @@ -101,10 +100,10 @@ def subcommand_add_favorite(arguments): line = config_lines[i] # Find favorites line - if line.startswith("routerconsole.favorites"): + if line.startswith('routerconsole.favorites'): found_favorites = True if url in line: - print("URL already in favorites") + print('URL already in favorites') exit(0) # Append favorite @@ -130,7 +129,7 @@ def subcommand_add_favorite(arguments): with open(router_config_path, mode='w') as config_file: config_file.writelines(config_lines) - print("Added '%s' to favorites" % url) + print('Added {} to favorites'.format(url)) def main(): diff --git a/plinth/modules/i2p/__init__.py b/plinth/modules/i2p/__init__.py index 36b302a74..485d53dfc 100644 --- a/plinth/modules/i2p/__init__.py +++ b/plinth/modules/i2p/__init__.py @@ -24,6 +24,7 @@ from plinth import action_utils, actions, frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.modules.users import register_group + from .manifest import backup, clients version = 1 @@ -58,18 +59,17 @@ service = None manual_page = 'I2P' additional_favorites = [ - ("Searx instance", "http://ransack.i2p"), - ("Torrent tracker", "http://tracker2.postman.i2p"), - ("YaCy Legwork", "http://legwork.i2p"), - ("YaCy Seeker", "http://seeker.i2p"), + ('Searx instance', 'http://ransack.i2p'), + ('Torrent tracker', 'http://tracker2.postman.i2p'), + ('YaCy Legwork', 'http://legwork.i2p'), + ('YaCy Seeker', 'http://seeker.i2p'), ] def init(): """Intialize the module.""" menu = main_menu.get('apps') - menu.add_urlname(name, 'i2p', 'i2p:index', - short_description) + menu.add_urlname(name, 'i2p', 'i2p:index', short_description) register_group(group) global service @@ -87,7 +87,6 @@ def init(): def setup(helper, old_version=None): """Install and configure the module.""" - helper.install(managed_packages) # Add favorites to the configuration @@ -105,21 +104,21 @@ def setup(helper, old_version=None): ], is_external=True, is_enabled=is_enabled, enable=enable, disable=disable, is_running=is_running) + helper.call('post', service.notify_enabled, None, True) helper.call('post', add_shortcut) def add_shortcut(): """Helper method to add a shortcut to the frontpage.""" - frontpage.add_shortcut('i2p', name, - short_description=short_description, + frontpage.add_shortcut('i2p', name, short_description=short_description, url='/i2p/', login_required=True, allowed_groups=[group[0]]) def is_running(): """Return whether the service is running.""" - return action_utils.service_is_running("i2p") + return action_utils.service_is_running('i2p') def is_enabled(): @@ -129,13 +128,13 @@ def is_enabled(): def enable(): """Enable the module.""" - actions.superuser_run("i2p", ["enable"]) + actions.superuser_run('i2p', ['enable']) add_shortcut() def disable(): """Enable the module.""" - actions.superuser_run("i2p", ["disable"]) + actions.superuser_run('i2p', ['disable']) frontpage.remove_shortcut('i2p')