From defcb37472fe22ccd92651fdf146bb1bf52c0aef Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 27 Oct 2017 15:00:20 +0530 Subject: [PATCH] Remove duplicate client information from __init__.py of modules Signed-off-by: Joseph Nuthalapati Reviewed-by: James Valleroy --- plinth/client.py | 30 ------------------------- plinth/modules/deluge/__init__.py | 2 -- plinth/modules/ejabberd/__init__.py | 5 ----- plinth/modules/ikiwiki/__init__.py | 2 -- plinth/modules/infinoted/__init__.py | 2 -- plinth/modules/minetest/__init__.py | 11 --------- plinth/modules/mumble/__init__.py | 13 ----------- plinth/modules/quassel/__init__.py | 11 --------- plinth/modules/radicale/__init__.py | 15 ------------- plinth/modules/repro/__init__.py | 9 -------- plinth/modules/restore/__init__.py | 3 --- plinth/modules/roundcube/__init__.py | 3 --- plinth/modules/shaarli/__init__.py | 3 --- plinth/modules/tor/__init__.py | 12 ---------- plinth/modules/transmission/__init__.py | 11 --------- plinth/modules/ttrss/__init__.py | 10 --------- plinth/templates/clients.html | 2 +- 17 files changed, 1 insertion(+), 143 deletions(-) delete mode 100644 plinth/client.py diff --git a/plinth/client.py b/plinth/client.py deleted file mode 100644 index 4d40bb7ae..000000000 --- a/plinth/client.py +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is part of Plinth. -# -# 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 . -# - -""" -Django models for the main application -""" - -from collections import namedtuple - -web_client = namedtuple('Web_Client', ['name', 'url']) - -desktop_client = namedtuple('Desktop_clients', ['name', 'url']) - -mobile_client = namedtuple('Mobile_clients', ['name', - 'fully_qualified_name', - 'fdroid_url', 'play_store_url']) diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py index 285ce957c..d73abc044 100644 --- a/plinth/modules/deluge/__init__.py +++ b/plinth/modules/deluge/__init__.py @@ -25,7 +25,6 @@ from plinth import actions from plinth import action_utils from plinth import frontpage from plinth import service as service_module -from plinth.client import web_client from plinth.menu import main_menu from plinth.modules.users import add_group from .manifest import clients @@ -55,7 +54,6 @@ description = [ reserved_usernames = ['debian-deluged'] clients = clients -web_clients = [web_client(name='Deluge', url='/deluge')] def init(): diff --git a/plinth/modules/ejabberd/__init__.py b/plinth/modules/ejabberd/__init__.py index e877e2e99..164abcba6 100644 --- a/plinth/modules/ejabberd/__init__.py +++ b/plinth/modules/ejabberd/__init__.py @@ -35,7 +35,6 @@ from plinth.menu import main_menu from plinth.signals import pre_hostname_change, post_hostname_change from plinth.signals import domainname_change from .manifest import clients -from plinth.client import web_client version = 1 @@ -61,10 +60,6 @@ description = [ box_name=_(cfg.box_name)) ] -web_clients = [web_client(name='JSXC', url='/plinth/apps/jsxc'), - web_client(name='XMPP client', url='http://xmpp.org/xmpp' - '-software/clients')] - clients = clients reserved_usernames = ['ejabberd'] diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py index 9aceebe2c..6661deab0 100644 --- a/plinth/modules/ikiwiki/__init__.py +++ b/plinth/modules/ikiwiki/__init__.py @@ -28,7 +28,6 @@ from plinth import cfg from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu -from plinth.client import web_client from .manifest import clients @@ -61,7 +60,6 @@ description = [ clients = clients -web_clients = [web_client(name='ikiwiki', url='/ikiwiki')] def init(): """Initialize the ikiwiki module.""" diff --git a/plinth/modules/infinoted/__init__.py b/plinth/modules/infinoted/__init__.py index d074e5bb0..c1489de5f 100644 --- a/plinth/modules/infinoted/__init__.py +++ b/plinth/modules/infinoted/__init__.py @@ -31,7 +31,6 @@ from plinth.menu import main_menu from plinth.utils import format_lazy from plinth.views import ServiceView from .manifest import clients -from plinth.client import desktop_client version = 1 @@ -56,7 +55,6 @@ description = [ box_name=_(cfg.box_name)), ] -desktop_clients = [desktop_client(name='Gobby', url='https://gobby.github.io/')] clients = clients diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py index 7b05f5a74..1e1f278e9 100644 --- a/plinth/modules/minetest/__init__.py +++ b/plinth/modules/minetest/__init__.py @@ -31,7 +31,6 @@ from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.utils import format_lazy -from plinth.client import desktop_client, mobile_client from .manifest import clients @@ -62,16 +61,6 @@ description = [ clients = clients -desktop_clients = [desktop_client(name='Minetest', - url= 'https://www.minetest.net/downloads/')] - -mobile_clients = [ - mobile_client(name='Minetest', - fully_qualified_name='net.minetest.mintest', - fdroid_url='https://f-droid.org/packages/net.minetest.minetest/', - play_store_url='https://play.google.com/store/apps/details?' - 'id=net.minetest.minetest')] - reserved_usernames = ['Debian-minetest'] CONFIG_FILE = '/etc/minetest/minetest.conf' diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py index 9b1a5385d..5a6217931 100644 --- a/plinth/modules/mumble/__init__.py +++ b/plinth/modules/mumble/__init__.py @@ -28,7 +28,6 @@ from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.views import ServiceView -from plinth.client import desktop_client, mobile_client from .manifest import clients @@ -55,18 +54,6 @@ description = [ clients = clients -desktop_clients = [ - desktop_client(name='Mumble',url= 'https://wiki.mumble.info/wiki/Main_Page')] - -mobile_clients = [ - mobile_client(name='Mumble', - fully_qualified_name='com.morlunk.mumbleclient', - fdroid_url='https://f-droid.org/packages/com.morlunk' - '.mumbleclient/', - play_store_url='https://play.google.com/store/apps/details' - '?id=com.morlunk.mumbleclient.free')] - - reserved_usernames = ['mumble-server'] diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py index ba8b510df..2230e8569 100644 --- a/plinth/modules/quassel/__init__.py +++ b/plinth/modules/quassel/__init__.py @@ -30,7 +30,6 @@ from plinth import service as service_module from plinth.menu import main_menu from plinth.utils import format_lazy from plinth.views import ServiceView -from plinth.client import mobile_client, desktop_client from .manifest import clients version = 1 @@ -64,16 +63,6 @@ description = [ clients = clients -desktop_clients = [ - desktop_client(name='Quassel', url='http://quassel-irc.org/downloads')] - -mobile_clients = [ - mobile_client(name='QuasselDroid', - fully_qualified_name='com.iskrembilen.quasseldroid', - fdroid_url=None, - play_store_url='https://play.google.com/store/apps/details?' - 'id=com.iskrembilen.quasseldroid')] - reserved_usernames = ['quasselcore'] diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py index 5a8ef0777..0c334d8ae 100644 --- a/plinth/modules/radicale/__init__.py +++ b/plinth/modules/radicale/__init__.py @@ -30,7 +30,6 @@ from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.utils import format_lazy -from plinth.client import desktop_client, mobile_client from .manifest import clients @@ -57,20 +56,6 @@ description = [ clients = clients -desktop_clients = [desktop_client(name='GNOME Calendar', - url='https://wiki.gnome.org/Apps/Calendar'), - desktop_client(name='Contacts', - url='https://wiki.gnome.org/Apps/Contacts'), - desktop_client(name='Evolution', - url='https://wiki.gnome.org/Apps/Evolution')] - -mobile_clients = [ - mobile_client(name='DAVdroid', - fully_qualified_name='at.bitfire.davdroid', - fdroid_url=None, - play_store_url='https://play.google.com/store/apps/details' - '?id=at.bitfire.davdroid')] - reserved_usernames = ['radicale'] CONFIG_FILE = '/etc/radicale/config' diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index 4fa491e9b..01b3500a2 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -28,7 +28,6 @@ from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.views import ServiceView -from plinth.client import desktop_client, mobile_client from .manifest import clients version = 2 @@ -64,14 +63,6 @@ description = [ clients = clients -desktop_clients = [desktop_client(name='Jitsi',url='https://jitsi.org/')] - -mobile_clients = [ - mobile_client(name='Csip Simple',fully_qualified_name='com.csipsimple', - fdroid_url=None, - play_store_url='https://play.google.com/store/apps/details' - '?id=com.csipsimple')] - reserved_usernames = ['repro'] service = None diff --git a/plinth/modules/restore/__init__.py b/plinth/modules/restore/__init__.py index 4cd8ed8b5..4f6b681a9 100644 --- a/plinth/modules/restore/__init__.py +++ b/plinth/modules/restore/__init__.py @@ -25,7 +25,6 @@ from plinth import cfg from plinth import service as service_module from plinth.menu import main_menu from plinth.utils import format_lazy -from plinth.client import web_client from .manifest import clients @@ -54,8 +53,6 @@ description = [ clients = clients -web_clients = [web_client(name='reStore web-interface', url='/restore')] - reserved_usernames = ['node-restore'] service = None diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py index 5ebdfc062..41e02736b 100644 --- a/plinth/modules/roundcube/__init__.py +++ b/plinth/modules/roundcube/__init__.py @@ -26,7 +26,6 @@ from plinth import action_utils from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu -from plinth.client import web_client from .manifest import clients @@ -62,8 +61,6 @@ description = [ clients = clients -web_clients = [web_client('Roundcube', '/roundcube')] - service = None diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index 814cb9ec6..6927c0261 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -26,7 +26,6 @@ from plinth import action_utils from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu -from plinth.client import web_client from .manifest import clients @@ -49,8 +48,6 @@ description = [ clients = clients -web_clients = [web_client(name='Shaarli', url='/shaarli')] - service = None diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py index 5954964ab..f2cdb002b 100644 --- a/plinth/modules/tor/__init__.py +++ b/plinth/modules/tor/__init__.py @@ -28,7 +28,6 @@ from plinth import service as service_module from plinth.menu import main_menu from plinth.modules.names import SERVICES from plinth.signals import domain_added, domain_removed -from plinth.client import desktop_client, mobile_client from .manifest import clients from . import utils @@ -56,17 +55,6 @@ description = [ clients = clients -desktop_clients = [ - desktop_client(name='Tor Browser', - url='https://www.torproject.org/download/download-easy' - '.html.en')] - -mobile_clients = [ - mobile_client(name='Orbot', fully_qualified_name='org.torproject.android', - fdroid_url='https://guardianproject.info/fdroid/', - play_store_url='https://play.google.com/store/apps/details' - '?id=org.torproject.android')] - reserved_usernames = ['debian-tor'] socks_service = None diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py index a571f03fb..9a5b623d6 100644 --- a/plinth/modules/transmission/__init__.py +++ b/plinth/modules/transmission/__init__.py @@ -23,15 +23,9 @@ import json from django.utils.translation import ugettext_lazy as _ from plinth import service as service_module -<<<<<<< HEAD from plinth import action_utils, actions, frontpage from plinth.menu import main_menu from plinth.modules.users import add_group -======= -from plinth.client import web_client -from plinth.menu import main_menu -from .manifest import clients ->>>>>>> Add client information for Matrix Synapse and Syncthing from .manifest import clients @@ -54,11 +48,6 @@ description = [ clients = clients -<<<<<<< HEAD -======= -web_clients = [web_client(name='Transmission', url='/transmission')] - ->>>>>>> Add client information for Matrix Synapse and Syncthing reserved_usernames = ['debian-transmission'] service = None diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index 22df7b829..f7f53fd01 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -28,7 +28,6 @@ from plinth import cfg from plinth import frontpage from plinth import service as service_module from plinth.menu import main_menu -from plinth.client import web_client, mobile_client from .manifest import clients @@ -61,15 +60,6 @@ description = [ clients = clients -web_clients = [web_client(name='TT-RSS', url='/tt-rss')] - -mobile_clients = [ - mobile_client(name='TTRSS-Reader', - fully_qualified_name='org.ttrssreader', - play_store_url='https://play.google.com/store/apps/details' - '?id=org.ttrssreader', - fdroid_url='https://f-droid.org/packages/org.ttrssreader/')] - service = None diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html index 12a929d2b..d17b37dec 100644 --- a/plinth/templates/clients.html +++ b/plinth/templates/clients.html @@ -27,7 +27,7 @@ {% for platform in client.platforms %} {% if platform.type == 'web' %}
  • - {{ client.name}} + {{ client.name}}
    • {% endif %} {% endfor %}