From 9fc7f1b39b3d1b5df488050e192185518d671844 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 26 Sep 2017 18:48:01 +0100 Subject: [PATCH] restart removal --- openlp/plugins/remotes/endpoint.py | 46 -------------------------- openlp/plugins/remotes/remoteplugin.py | 7 ++-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 openlp/plugins/remotes/endpoint.py diff --git a/openlp/plugins/remotes/endpoint.py b/openlp/plugins/remotes/endpoint.py deleted file mode 100644 index a9b0d0815..000000000 --- a/openlp/plugins/remotes/endpoint.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2017 OpenLP Developers # -# --------------------------------------------------------------------------- # -# This program is free software; you can redistribute it and/or modify it # -# under the terms of the GNU General Public License as published by the Free # -# Software Foundation; version 2 of the License. # -# # -# 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 General Public License for # -# more details. # -# # -# You should have received a copy of the GNU General Public License along # -# with this program; if not, write to the Free Software Foundation, Inc., 59 # -# Temple Place, Suite 330, Boston, MA 02111-1307 USA # -############################################################################### -import logging - -import os - -from openlp.core.api.http.endpoint import Endpoint -from openlp.core.api.endpoint.core import TRANSLATED_STRINGS -from openlp.core.common import AppLocation - - -static_dir = os.path.join(str(AppLocation.get_section_data_path('remotes'))) - -log = logging.getLogger(__name__) - -remote_endpoint = Endpoint('remote', template_dir=static_dir, static_dir=static_dir) - - -@remote_endpoint.route('{view}') -def index(request, view): - """ - Handles requests for /remotes url - - :param request: The http request object. - :param view: The view name to be servered. - """ - return remote_endpoint.render_template('{view}.mako'.format(view=view), **TRANSLATED_STRINGS) diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 1344c66d1..4974e451b 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -20,16 +20,15 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -import logging -import os import time - from PyQt5 import QtCore, QtWidgets +import logging + +from openlp.core.api.endpoint.remote import remote_endpoint from openlp.core.api.http import register_endpoint from openlp.core.common import AppLocation, Registry, Settings, OpenLPMixin, UiStrings, check_directory_exists from openlp.core.lib import Plugin, StringContent, translate, build_icon -from openlp.plugins.remotes.endpoint import remote_endpoint from openlp.plugins.remotes.deploy import download_and_check, download_sha256 log = logging.getLogger(__name__)