issue_comments

Done:

• https://latest.datasette.io/fixtures/table~2Fwith~2Fslashes~2Ecsv
• https://latest.datasette.io/fixtures/table~2Fwith~2Fslashes~2Ecsv.csv
• https://latest.datasette.io/fixtures/table~2Fwith~2Fslashes~2Ecsv.json

This work is now blocked on: - https://github.com/simonw/datasette/issues/1657

A lot of the code complexity here is caused by DataView (here), which has the logic for CSV streaming and plugin formats such that it can be shared between tables and custom queries.

It would be good to get rid of that subclassed shared code, figure out how to do it via a utility function instead.

I'm going to do a review of how URL routing works at the moment for the various views.

I edited down the full list a bit - these are the most relevant: python add_route(IndexView.as_view(self), r"/(?P<as_format>(\.jsono?)?$)") add_route( DatabaseView.as_view(self), r"/(?P<db_name>[^/]+?)(?P<as_format>" + renderer_regex + r"|.jsono|\.csv)?$", ) add_route( TableView.as_view(self), r"/(?P<db_name>[^/]+)/(?P<table_and_format>[^/]+?$)", ) add_route( RowView.as_view(self), r"/(?P<db_name>[^/]+)/(?P<table>[^/]+?)/(?P<pk_path>[^/]+?)(?P<as_format>" + renderer_regex + r")?$", )

My attempts to simplify get_format() keep resulting in errors like this one: File "/Users/simon/Dropbox/Development/datasette/datasette/views/base.py", line 474, in view_get response_or_template_contexts = await self.data( TypeError: TableView.data() missing 1 required positional argument: 'table' I really need to clean this up.

Wow, this code is difficult to follow! Look at this bit inside the get_format() method:

https://github.com/simonw/datasette/blob/bb499942c15c4e2cfa4b6afab8f8debe5948c009/datasette/views/base.py#L469-L478

That's modifying the arguments that were extracted from the path by the routing regular expressions to have table as dash-decoded value! So calling.get_format()` has the side effect of decoding the table names for you. Nasty.

I found an obscure bug in #1650 which I can fix with this too. The following test should pass: python @pytest.mark.parametrize( "path,expected", ( ( "/fivethirtyeight/twitter-ratio%2Fsenators", "/fivethirtyeight/twitter-2Dratio-2Fsenators", ), ( "/fixtures/table%2Fwith%2Fslashes.csv", "/fixtures/table-2Fwith-2Fslashes-2Ecsv", ), # query string should be preserved ("/foo/bar%2Fbaz?id=5", "/foo/bar-2Fbaz?id=5"), ), ) def test_redirect_percent_encoding_to_dash_encoding(app_client, path, expected): response = app_client.get(path) assert response.status == 302 assert response.headers["location"] == expected It currently fails like this: ```

  assert response.headers["location"] == expected

E AssertionError: assert '/fixtures/table-2Fwith-2Fslashes.csv?_nofacet=1&_nocount=1' == '/fixtures/table-2Fwith-2Fslashes-2Ecsv' E - /fixtures/table-2Fwith-2Fslashes-2Ecsv E + /fixtures/table-2Fwith-2Fslashes.csv?_nofacet=1&_nocount=1 `` Because the logic in thatget_format()` function notices that the table exists, and then weird things happen here: https://github.com/simonw/datasette/blob/1baa030eca375f839f3471237547ab403523e643/datasette/views/base.py#L288-L303

Here's the relevant code:

https://github.com/simonw/datasette/blob/1baa030eca375f839f3471237547ab403523e643/datasette/utils/init.py#L753-L772

https://github.com/simonw/datasette/blob/1baa030eca375f839f3471237547ab403523e643/datasette/views/base.py#L451-L479