radium
/
flatfilecms
Archived
1
0
Fork 0
Code Issues 16 Pull Requests Releases Wiki Activity

Улучшение читаемости кода

master
Антон Касимов 2019-04-15 15:53:17 +03:00
parent 07c77500e4
commit 724ec1040c
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
flatfilecms/views/pages.py
View File

@ -1,7 +1,7 @@
from pyramid.view import ( from pyramid.view import (
view_config, view_config,
render_view_to_response, render_view_to_response,
) )
from pyramid.renderers import render_to_response from pyramid.renderers import render_to_response
from pyramid.httpexceptions import HTTPNotFound from pyramid.httpexceptions import HTTPNotFound
from pyramid.response import FileResponse from pyramid.response import FileResponse
@ -9,12 +9,8 @@ from pyramid.path import (DottedNameResolver, AssetResolver)
from pathlib import PurePath from pathlib import PurePath
import yaml import yaml
from flatfilecms.models import ( from flatfilecms.models import (Folder, Document, IMarkdown, Jinja2,
Folder, LoaderFactory)
Document,
IMarkdown,
Jinja2,
LoaderFactory)
class PagesView: class PagesView:
@ -31,8 +27,8 @@ class PagesView:
@view_config(context=Document) @view_config(context=Document)
def document(self): def document(self):
return FileResponse( return FileResponse(
AssetResolver().resolve(self.context.path).abspath(), AssetResolver().resolve(self.context.path).abspath(),
request=self.request) request=self.request)
@view_config(context=IMarkdown) @view_config(context=IMarkdown)
def process_yaml(self): def process_yaml(self):
@ -62,21 +58,16 @@ class PagesView:
if 'menu' not in post: if 'menu' not in post:
post['menu'] = yaml.load( post['menu'] = yaml.load(
AssetResolver().resolve( AssetResolver().resolve(
str(PurePath(self.context.data_path) / str(
PurePath(self.context.data_path) /
'menu/default.yaml')).stream(), 'menu/default.yaml')).stream(),
LoaderFactory(self.context.data_path)) LoaderFactory(self.context.data_path))
return render_to_response( return render_to_response(
'{0}.jinja2'.format( '{0}.jinja2'.format(post.get('template', 'default')),
post.get('template', 'default')), post,
post, request=self.request,
request=self.request, response=self.request.response)
response=self.request.response
)
@view_config(context=Jinja2) @view_config(context=Jinja2)
def jinja2(self): def jinja2(self):
return render_to_response( return render_to_response(self.context.path, {}, request=self.request)
self.context.path,
{},
request=self.request
)