From 0bf33c32099b0290b185a41de0ef515299b5105f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 8 Dec 2020 09:42:41 -0500 Subject: [PATCH] Move Web related data to fHDHR_web --- fHDHR/config/__init__.py | 5 +++-- {data/www => fHDHR_web}/templates/base.html | 0 {data/www => fHDHR_web}/templates/channels.html | 0 .../templates/channels_editor.html | 0 {data/www => fHDHR_web}/templates/cluster.html | 0 {data/www => fHDHR_web}/templates/diagnostics.html | 0 {data/www => fHDHR_web}/templates/guide.html | 0 {data/www => fHDHR_web}/templates/index.html | 0 {data/www => fHDHR_web}/templates/origin.html | 0 {data/www => fHDHR_web}/templates/settings.html | 0 {data/www => fHDHR_web}/templates/tuners.html | 0 {data/www => fHDHR_web}/templates/version.html | 0 {data/www => fHDHR_web}/templates/xmltv.html | 0 {data/www => fHDHR_web/www_dir}/favicon.ico | Bin {data/www => fHDHR_web/www_dir}/style.css | 0 15 files changed, 3 insertions(+), 2 deletions(-) rename {data/www => fHDHR_web}/templates/base.html (100%) rename {data/www => fHDHR_web}/templates/channels.html (100%) rename {data/www => fHDHR_web}/templates/channels_editor.html (100%) rename {data/www => fHDHR_web}/templates/cluster.html (100%) rename {data/www => fHDHR_web}/templates/diagnostics.html (100%) rename {data/www => fHDHR_web}/templates/guide.html (100%) rename {data/www => fHDHR_web}/templates/index.html (100%) rename {data/www => fHDHR_web}/templates/origin.html (100%) rename {data/www => fHDHR_web}/templates/settings.html (100%) rename {data/www => fHDHR_web}/templates/tuners.html (100%) rename {data/www => fHDHR_web}/templates/version.html (100%) rename {data/www => fHDHR_web}/templates/xmltv.html (100%) rename {data/www => fHDHR_web/www_dir}/favicon.ico (100%) rename {data/www => fHDHR_web/www_dir}/style.css (100%) diff --git a/fHDHR/config/__init__.py b/fHDHR/config/__init__.py index df69b5a..e0784f9 100644 --- a/fHDHR/config/__init__.py +++ b/fHDHR/config/__init__.py @@ -29,7 +29,8 @@ class Config(): def initial_load(self, script_dir): data_dir = pathlib.Path(script_dir).joinpath('data') - www_dir = pathlib.Path(data_dir).joinpath('www') + fHDHR_web_dir = pathlib.Path(script_dir).joinpath('fHDHR_web') + www_dir = pathlib.Path(fHDHR_web_dir).joinpath('www_dir') self.internal["paths"] = { "script_dir": script_dir, @@ -39,7 +40,7 @@ class Config(): "cache_dir": pathlib.Path(data_dir).joinpath('cache'), "internal_config": pathlib.Path(data_dir).joinpath('internal_config'), "www_dir": www_dir, - "www_templates_dir": pathlib.Path(www_dir).joinpath('templates'), + "www_templates_dir": pathlib.Path(fHDHR_web_dir).joinpath('templates'), "font": pathlib.Path(data_dir).joinpath('garamond.ttf'), } diff --git a/data/www/templates/base.html b/fHDHR_web/templates/base.html similarity index 100% rename from data/www/templates/base.html rename to fHDHR_web/templates/base.html diff --git a/data/www/templates/channels.html b/fHDHR_web/templates/channels.html similarity index 100% rename from data/www/templates/channels.html rename to fHDHR_web/templates/channels.html diff --git a/data/www/templates/channels_editor.html b/fHDHR_web/templates/channels_editor.html similarity index 100% rename from data/www/templates/channels_editor.html rename to fHDHR_web/templates/channels_editor.html diff --git a/data/www/templates/cluster.html b/fHDHR_web/templates/cluster.html similarity index 100% rename from data/www/templates/cluster.html rename to fHDHR_web/templates/cluster.html diff --git a/data/www/templates/diagnostics.html b/fHDHR_web/templates/diagnostics.html similarity index 100% rename from data/www/templates/diagnostics.html rename to fHDHR_web/templates/diagnostics.html diff --git a/data/www/templates/guide.html b/fHDHR_web/templates/guide.html similarity index 100% rename from data/www/templates/guide.html rename to fHDHR_web/templates/guide.html diff --git a/data/www/templates/index.html b/fHDHR_web/templates/index.html similarity index 100% rename from data/www/templates/index.html rename to fHDHR_web/templates/index.html diff --git a/data/www/templates/origin.html b/fHDHR_web/templates/origin.html similarity index 100% rename from data/www/templates/origin.html rename to fHDHR_web/templates/origin.html diff --git a/data/www/templates/settings.html b/fHDHR_web/templates/settings.html similarity index 100% rename from data/www/templates/settings.html rename to fHDHR_web/templates/settings.html diff --git a/data/www/templates/tuners.html b/fHDHR_web/templates/tuners.html similarity index 100% rename from data/www/templates/tuners.html rename to fHDHR_web/templates/tuners.html diff --git a/data/www/templates/version.html b/fHDHR_web/templates/version.html similarity index 100% rename from data/www/templates/version.html rename to fHDHR_web/templates/version.html diff --git a/data/www/templates/xmltv.html b/fHDHR_web/templates/xmltv.html similarity index 100% rename from data/www/templates/xmltv.html rename to fHDHR_web/templates/xmltv.html diff --git a/data/www/favicon.ico b/fHDHR_web/www_dir/favicon.ico similarity index 100% rename from data/www/favicon.ico rename to fHDHR_web/www_dir/favicon.ico diff --git a/data/www/style.css b/fHDHR_web/www_dir/style.css similarity index 100% rename from data/www/style.css rename to fHDHR_web/www_dir/style.css