github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactored view class hierarchy, refs #272

Browse source 
See https://github.com/simonw/datasette/issues/272#issuecomment-502393107
This commit is contained in:
Simon Willison 2019-06-15 12:41:34 -07:00
commit d4df640d18
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datasette/views/base.py
View file

@ -49,7 +49,7 @@ class DatasetteError(Exception):
self.messagge_is_html = messagge_is_html self.messagge_is_html = messagge_is_html
class RenderMixin(HTTPMethodView): class BaseView(HTTPMethodView):
def _asset_urls(self, key, template, context): def _asset_urls(self, key, template, context):
# Flatten list-of-lists from plugins: # Flatten list-of-lists from plugins:
seen_urls = set() seen_urls = set()
@ -128,7 +128,7 @@ class RenderMixin(HTTPMethodView):
) )
class BaseView(RenderMixin): class DataView(BaseView):
name = "" name = ""
re_named_parameter = re.compile(":([a-zA-Z0-9_]+)") re_named_parameter = re.compile(":([a-zA-Z0-9_]+)")

6
datasette/views/database.py
View file

@ -4,10 +4,10 @@ from sanic import response
from datasette.utils import to_css_class, validate_sql_select from datasette.utils import to_css_class, validate_sql_select
from .base import BaseView, DatasetteError from .base import DataView, DatasetteError
class DatabaseView(BaseView): class DatabaseView(DataView):
name = "database" name = "database"
async def data(self, request, database, hash, default_labels=False, _size=None): async def data(self, request, database, hash, default_labels=False, _size=None):
@ -65,7 +65,7 @@ class DatabaseView(BaseView):
) )
class DatabaseDownload(BaseView): class DatabaseDownload(DataView):
name = "database_download" name = "database_download"
async def view_get(self, request, database, hash, correct_hash_present, **kwargs): async def view_get(self, request, database, hash, correct_hash_present, **kwargs):

4
datasette/views/index.py
View file

@ -6,7 +6,7 @@ from sanic import response
from datasette.utils import CustomJSONEncoder from datasette.utils import CustomJSONEncoder
from datasette.version import __version__ from datasette.version import __version__
from .base import RenderMixin from .base import BaseView
# Truncate table list on homepage at: # Truncate table list on homepage at:
@ -16,7 +16,7 @@ TRUNCATE_AT = 5
COUNT_TABLE_LIMIT = 30 COUNT_TABLE_LIMIT = 30
class IndexView(RenderMixin): class IndexView(BaseView):
name = "index" name = "index"
def __init__(self, datasette): def __init__(self, datasette):

4
datasette/views/special.py
View file

@ -1,9 +1,9 @@
import json import json
from sanic import response from sanic import response
from .base import RenderMixin from .base import BaseView
class JsonDataView(RenderMixin): class JsonDataView(BaseView):
name = "json_data" name = "json_data"
def __init__(self, datasette, filename, data_callback): def __init__(self, datasette, filename, data_callback):

4
datasette/views/table.py
View file

@ -25,7 +25,7 @@ from datasette.utils import (
value_as_boolean, value_as_boolean,
) )
from datasette.filters import Filters from datasette.filters import Filters
from .base import BaseView, DatasetteError, ureg from .base import DataView, DatasetteError, ureg
LINK_WITH_LABEL = ( LINK_WITH_LABEL = (
'<a href="/{database}/{table}/{link_id}">{label}</a>&nbsp;<em>{id}</em>' '<a href="/{database}/{table}/{link_id}">{label}</a>&nbsp;<em>{id}</em>'
@ -33,7 +33,7 @@ LINK_WITH_LABEL = (
LINK_WITH_VALUE = '<a href="/{database}/{table}/{link_id}">{id}</a>' LINK_WITH_VALUE = '<a href="/{database}/{table}/{link_id}">{id}</a>'
class RowTableShared(BaseView): class RowTableShared(DataView):
async def sortable_columns_for_table(self, database, table, use_rowid): async def sortable_columns_for_table(self, database, table, use_rowid):
db = self.ds.databases[database] db = self.ds.databases[database]
table_metadata = self.ds.table_metadata(database, table) table_metadata = self.ds.table_metadata(database, table)