rrix
/
arcology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make sure to try rendering ARCOLOGY_FEEDs from localhost...

main
Ryan Rix 2022-07-04 15:24:45 -07:00
parent 3dad26df48
commit d68d209a02
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arcology-router.org
View File

@ -101,16 +101,19 @@ def decorate_app(app: FastAPI) -> FastAPI:
@app.get("/{sub_key:path}", response_class=HTMLResponse, name="base-route")
@app.get("/{sub_key:path}/", response_class=HTMLResponse, name="base-route")
async def public_router(request: Request, sub_key: str):
key = None
if request.headers.get('host',"").startswith('localhost'):
key = ArcologyKey(key=sub_key)
return await render_page_from_key(request, key.key, engine, key.site)
else:
with Session(engine) as session:
key = ArcologyKey.from_request(request)
kw = Keyword.get("ARCOLOGY_FEED", key.key, session)
if kw is not None:
return await render_feed_from_file(request, kw.filename(), engine, key.site)
return await render_page_from_key(request, key.key, engine, key.site)
key = ArcologyKey.from_request(request)
with Session(engine) as session:
kw = Keyword.get("ARCOLOGY_FEED", key.key, session)
if kw is not None:
return await render_feed_from_file(request, kw.filename(), engine, key.site)
return await render_page_from_key(request, key.key, engine, key.site)
return app
#+end_src

17
arcology/routing/domains.py
View File

@ -27,15 +27,18 @@ def decorate_app(app: FastAPI) -> FastAPI:
@app.get("/{sub_key:path}", response_class=HTMLResponse, name="base-route")
@app.get("/{sub_key:path}/", response_class=HTMLResponse, name="base-route")
async def public_router(request: Request, sub_key: str):
key = None
if request.headers.get('host',"").startswith('localhost'):
key = ArcologyKey(key=sub_key)
return await render_page_from_key(request, key.key, engine, key.site)
else:
with Session(engine) as session:
key = ArcologyKey.from_request(request)
kw = Keyword.get("ARCOLOGY_FEED", key.key, session)
if kw is not None:
return await render_feed_from_file(request, kw.filename(), engine, key.site)
return await render_page_from_key(request, key.key, engine, key.site)
key = ArcologyKey.from_request(request)
with Session(engine) as session:
kw = Keyword.get("ARCOLOGY_FEED", key.key, session)
if kw is not None:
return await render_feed_from_file(request, kw.filename(), engine, key.site)
return await render_page_from_key(request, key.key, engine, key.site)
return app