From 8230801cc95d80e930195410d4b5b8751ade3e6e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 9 Dec 2020 08:40:25 -0500 Subject: [PATCH] test --- fHDHR_web/__init__.py | 4 ++-- fHDHR_web/pages/channels_editor.py | 4 ++-- fHDHR_web/pages/channels_html.py | 4 ++-- fHDHR_web/pages/cluster_html.py | 4 ++-- fHDHR_web/pages/diagnostics_html.py | 4 ++-- fHDHR_web/pages/guide_html.py | 4 ++-- fHDHR_web/pages/index_html.py | 4 ++-- fHDHR_web/pages/origin_html.py | 4 ++-- fHDHR_web/pages/settings_html.py | 4 ++-- fHDHR_web/pages/tuners_html.py | 4 ++-- fHDHR_web/pages/version_html.py | 4 ++-- fHDHR_web/pages/xmltv_html.py | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fHDHR_web/__init__.py b/fHDHR_web/__init__.py index 0d52121..7b01fdb 100644 --- a/fHDHR_web/__init__.py +++ b/fHDHR_web/__init__.py @@ -17,11 +17,11 @@ class fHDHR_HTTP_Server(): def __init__(self, fhdhr): self.fhdhr = fhdhr - self.iptvorg-us_folder = fhdhr.config.internal["paths"]["www_iptvorg-uss_dir"] + self.template_folder = fhdhr.config.internal["paths"]["www_templates_dir"] self.fhdhr.logger.info("Loading Flask.") - self.app = Flask("fHDHR", iptvorg-us_folder=self.iptvorg-us_folder) + self.app = Flask("fHDHR", template_folder=self.template_folder) self.fhdhr.logger.info("Loading HTTP Pages Endpoints.") self.pages = fHDHR_Pages(fhdhr) diff --git a/fHDHR_web/pages/channels_editor.py b/fHDHR_web/pages/channels_editor.py index f90e1ea..ea83ba9 100644 --- a/fHDHR_web/pages/channels_editor.py +++ b/fHDHR_web/pages/channels_editor.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Channels_Editor_HTML(): @@ -20,4 +20,4 @@ class Channels_Editor_HTML(): channel_dict["play_url"] = channel_obj.play_url channelslist.append(channel_dict) - return render_iptvorg-us('channels_editor.html', request=request, fhdhr=self.fhdhr, channelslist=channelslist) + return render_template('channels_editor.html', request=request, fhdhr=self.fhdhr, channelslist=channelslist) diff --git a/fHDHR_web/pages/channels_html.py b/fHDHR_web/pages/channels_html.py index 283df18..1ca0611 100644 --- a/fHDHR_web/pages/channels_html.py +++ b/fHDHR_web/pages/channels_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Channels_HTML(): @@ -27,4 +27,4 @@ class Channels_HTML(): if channel_dict["enabled"]: channels_dict["Enabled"] += 1 - return render_iptvorg-us('channels.html', request=request, fhdhr=self.fhdhr, channelslist=channelslist, channels_dict=channels_dict, list=list) + return render_template('channels.html', request=request, fhdhr=self.fhdhr, channelslist=channelslist, channels_dict=channels_dict, list=list) diff --git a/fHDHR_web/pages/cluster_html.py b/fHDHR_web/pages/cluster_html.py index f16558c..cc26a12 100644 --- a/fHDHR_web/pages/cluster_html.py +++ b/fHDHR_web/pages/cluster_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template import urllib.parse @@ -47,4 +47,4 @@ class Cluster_HTML(): } locations_list.append(location_dict) - return render_iptvorg-us('cluster.html', request=request, fhdhr=self.fhdhr, locations_list=locations_list) + return render_template('cluster.html', request=request, fhdhr=self.fhdhr, locations_list=locations_list) diff --git a/fHDHR_web/pages/diagnostics_html.py b/fHDHR_web/pages/diagnostics_html.py index ca1354c..04eda62 100644 --- a/fHDHR_web/pages/diagnostics_html.py +++ b/fHDHR_web/pages/diagnostics_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Diagnostics_HTML(): @@ -122,4 +122,4 @@ class Diagnostics_HTML(): "other": None, }) - return render_iptvorg-us('diagnostics.html', request=request, fhdhr=self.fhdhr, button_list=button_list) + return render_template('diagnostics.html', request=request, fhdhr=self.fhdhr, button_list=button_list) diff --git a/fHDHR_web/pages/guide_html.py b/fHDHR_web/pages/guide_html.py index c07cb83..7c70276 100644 --- a/fHDHR_web/pages/guide_html.py +++ b/fHDHR_web/pages/guide_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template import datetime from fHDHR.tools import humanized_time @@ -49,4 +49,4 @@ class Guide_HTML(): chan_guide_list.append(chan_dict) - return render_iptvorg-us('guide.html', request=request, fhdhr=self.fhdhr, chan_guide_list=chan_guide_list, epg_methods=epg_methods, source=source) + return render_template('guide.html', request=request, fhdhr=self.fhdhr, chan_guide_list=chan_guide_list, epg_methods=epg_methods, source=source) diff --git a/fHDHR_web/pages/index_html.py b/fHDHR_web/pages/index_html.py index 3fc8503..9da681a 100644 --- a/fHDHR_web/pages/index_html.py +++ b/fHDHR_web/pages/index_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Index_HTML(): @@ -24,4 +24,4 @@ class Index_HTML(): "Tuner Usage": ("%s/%s" % (str(tuners_in_use), str(max_tuners))), } - return render_iptvorg-us('index.html', request=request, fhdhr=self.fhdhr, fhdhr_status_dict=fhdhr_status_dict, list=list) + return render_template('index.html', request=request, fhdhr=self.fhdhr, fhdhr_status_dict=fhdhr_status_dict, list=list) diff --git a/fHDHR_web/pages/origin_html.py b/fHDHR_web/pages/origin_html.py index e50e67a..998f847 100644 --- a/fHDHR_web/pages/origin_html.py +++ b/fHDHR_web/pages/origin_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Origin_HTML(): @@ -15,4 +15,4 @@ class Origin_HTML(): origin_status_dict = self.fhdhr.originwrapper.get_status_dict() origin_status_dict["Total Channels"] = len(self.fhdhr.device.channels.list) - return render_iptvorg-us('origin.html', request=request, fhdhr=self.fhdhr, origin_status_dict=origin_status_dict, list=list) + return render_template('origin.html', request=request, fhdhr=self.fhdhr, origin_status_dict=origin_status_dict, list=list) diff --git a/fHDHR_web/pages/settings_html.py b/fHDHR_web/pages/settings_html.py index 58d1b4c..de7d615 100644 --- a/fHDHR_web/pages/settings_html.py +++ b/fHDHR_web/pages/settings_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Settings_HTML(): @@ -30,4 +30,4 @@ class Settings_HTML(): if not len(web_settings_dict[config_section].keys()): del web_settings_dict[config_section] - return render_iptvorg-us('settings.html', request=request, fhdhr=self.fhdhr, web_settings_dict=web_settings_dict, list=list) + return render_template('settings.html', request=request, fhdhr=self.fhdhr, web_settings_dict=web_settings_dict, list=list) diff --git a/fHDHR_web/pages/tuners_html.py b/fHDHR_web/pages/tuners_html.py index 89025f1..787076b 100644 --- a/fHDHR_web/pages/tuners_html.py +++ b/fHDHR_web/pages/tuners_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template from fHDHR.tools import humanized_filesize @@ -33,4 +33,4 @@ class Tuners_HTML(): tuner_list.append(tuner_dict) - return render_iptvorg-us('tuners.html', request=request, fhdhr=self.fhdhr, tuner_list=tuner_list, tuner_scanning=tuner_scanning) + return render_template('tuners.html', request=request, fhdhr=self.fhdhr, tuner_list=tuner_list, tuner_scanning=tuner_scanning) diff --git a/fHDHR_web/pages/version_html.py b/fHDHR_web/pages/version_html.py index eafe1ab..24eca65 100644 --- a/fHDHR_web/pages/version_html.py +++ b/fHDHR_web/pages/version_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class Version_HTML(): @@ -15,4 +15,4 @@ class Version_HTML(): version_dict = {} for key in list(self.fhdhr.config.internal["versions"].keys()): version_dict[key] = self.fhdhr.config.internal["versions"][key] - return render_iptvorg-us('version.html', request=request, fhdhr=self.fhdhr, version_dict=version_dict, list=list) + return render_template('version.html', request=request, fhdhr=self.fhdhr, version_dict=version_dict, list=list) diff --git a/fHDHR_web/pages/xmltv_html.py b/fHDHR_web/pages/xmltv_html.py index f31bbfe..869f0b7 100644 --- a/fHDHR_web/pages/xmltv_html.py +++ b/fHDHR_web/pages/xmltv_html.py @@ -1,4 +1,4 @@ -from flask import request, render_iptvorg-us +from flask import request, render_template class xmlTV_HTML(): @@ -13,4 +13,4 @@ class xmlTV_HTML(): def get(self, *args): - return render_iptvorg-us('xmltv.html', request=request, fhdhr=self.fhdhr) + return render_template('xmltv.html', request=request, fhdhr=self.fhdhr)