pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated env var EXTRA_PAGES structure

Browse source
This commit is contained in:
Luis Aleixo 2023-05-09 17:13:46 +02:00
parent eac7591046
commit 7fd0e0f8ec
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
caimira/apps/calculator/__init__.py
View file

@ -1,6 +1,8 @@
# This module is part of CAiMIRA. Please see the repository at # This module is part of CAiMIRA. Please see the repository at
# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. # https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use.
import ast
import logging
import asyncio import asyncio
import concurrent.futures import concurrent.futures
import datetime import datetime
@ -16,7 +18,7 @@ import traceback
import typing import typing
import uuid import uuid
import zlib import zlib
import ast
import jinja2 import jinja2
import loky import loky
@ -38,6 +40,8 @@ from .user import AuthenticatedUser, AnonymousUser
# increase the overall CAiMIRA version (found at ``caimira.__version__``). # increase the overall CAiMIRA version (found at ``caimira.__version__``).
__version__ = "4.9" __version__ = "4.9"
LOG = logging.getLogger(__name__)
class BaseRequestHandler(RequestHandler): class BaseRequestHandler(RequestHandler):
async def prepare(self): async def prepare(self):
@ -327,7 +331,7 @@ class GenericExtraPage(BaseRequestHandler):
def get(self): def get(self):
template_environment = self.settings["template_environment"] template_environment = self.settings["template_environment"]
template = template_environment.get_template(f"{self.filename}.html.j2") template = template_environment.get_template(self.filename)
self.finish(template.render( self.finish(template.render(
user=self.current_user, user=self.current_user,
get_url = template.globals['get_url'], get_url = template.globals['get_url'],
@ -369,22 +373,19 @@ def make_app(
] ]
# Any extra generic page must be declared in the env. variable "EXTRA_PAGES" # Any extra generic page must be declared in the env. variable "EXTRA_PAGES"
extra_pages=os.environ.get('EXTRA_PAGES', None) extra_pages: typing.Union[str, typing.List] = os.environ.get('EXTRA_PAGES', [])
try: try:
for extra in ast.literal_eval(extra_pages): # type: ignore pages = ast.literal_eval(extra_pages) # type: ignore
if extra['is_root']:
urls.append((get_root_url(r'%s' % extra['url']),
GenericExtraPage, {
'active_page': extra['url'].strip('/'),
'filename': extra['filename'], }))
else:
urls.append((get_root_calculator_url(r'%s' % extra['url']),
GenericExtraPage, {
'active_page': 'calculator/' + extra['url'].strip('/'),
'filename': extra['filename'], }))
except (SyntaxError, ValueError): except (SyntaxError, ValueError):
LOG.warning('Warning: There was a problem with the extra pages. Is the "EXTRA_PAGES" environment variable correctly defined?')
pass pass
for extra in pages:
urls.append((get_root_url(r'%s' % extra['url_path']),
GenericExtraPage, {
'active_page': extra['url_path'].strip('/'),
'filename': extra['filename'], }))
caimira_templates = Path(__file__).parent.parent / "templates" caimira_templates = Path(__file__).parent.parent / "templates"
calculator_templates = Path(__file__).parent / "templates" calculator_templates = Path(__file__).parent / "templates"
templates_directories = [caimira_templates, calculator_templates] templates_directories = [caimira_templates, calculator_templates]

4
caimira/tests/apps/calculator/test_webapp.py
View file

@ -144,8 +144,8 @@ class TestCERNGenericPage(tornado.testing.AsyncHTTPTestCase):
cern_theme = Path(caimira.apps.calculator.__file__).parent.parent / 'themes' / 'cern' cern_theme = Path(caimira.apps.calculator.__file__).parent.parent / 'themes' / 'cern'
app = caimira.apps.calculator.make_app(theme_dir=cern_theme) app = caimira.apps.calculator.make_app(theme_dir=cern_theme)
pages = [ pages = [
(r'/calculator/user-guide', caimira.apps.calculator.GenericExtraPage, {'active_page': 'userguide', 'filename': 'userguide'}), (r'/calculator/user-guide', caimira.apps.calculator.GenericExtraPage, {'active_page': 'calculator/user-guide', 'filename': 'userguide.html.j2'}),
(r'/about', caimira.apps.calculator.GenericExtraPage, {'active_page': 'about', 'filename': 'about'}), (r'/about', caimira.apps.calculator.GenericExtraPage, {'active_page': 'about', 'filename': 'about.html.j2'}),
] ]
return tornado.web.Application(pages, **app.settings) return tornado.web.Application(pages, **app.settings)