diff --git a/pygitweb/main.py b/pygitweb/main.py index 6752c55..8396ac9 100644 --- a/pygitweb/main.py +++ b/pygitweb/main.py @@ -13,6 +13,8 @@ from fastapi import FastAPI, HTTPException, Query, Request from fastapi.responses import HTMLResponse, PlainTextResponse, Response from fastapi.staticfiles import StaticFiles +from jinja2 import Template, Environment, PackageLoader + from pygitweb import config from pygitweb.config import ( EXPORT_OK, @@ -86,9 +88,16 @@ ACTIONS = { app = FastAPI(title="pygitweb", description="FastAPI + Pygit2 Repo Browser") -# Theme: default is dark; set or class="theme-solarized" to switch -HTML_HEAD = '' +env = Environment( + loader=PackageLoader("pygitweb", "templates"), + # autoescape=True, + trim_blocks=True, + lstrip_blocks=True, +) +PREAMBLE = env.get_template("preamble.html") +POSTAMBLE = "" +# Todo handle with nginx route _static_dir = Path(__file__).parent / "static" if _static_dir.is_dir(): app.mount("/static", StaticFiles(directory=str(_static_dir)), name="static") @@ -170,19 +179,17 @@ def git_project_list( # todo # list_ = filter_forks_from_projects_list(list_) - # Simple HTML response (full template can be added later) - rows = [] - for pr in list_[:50]: - path = pr.get("path", "") - descr = pr.get("descr", "") or path - rows.append(f"{esc_html(path)}{esc_html(descr)}") - body = "\n".join(rows) - return HTMLResponse( - f"""{config.SITE_NAME} - project list{HTML_HEAD} -

Projects

-{body} -
ProjectDescription
""" + + # We need better escaping logic here but can wait until we harden the templates + table = env.get_template("table.html").render( + cols=["Project", "Description"], + rows=[ + [f"{pr.get('path', "")}", + pr.get('descr') or pr.get('path', "")] + for pr in list_[:50]] ) + pre = PREAMBLE.render(title=f'{esc_html(config.SITE_NAME)} - Projects') + return HTMLResponse(f"{pre}

Project List

{table}{POSTAMBLE}") @app.get("/index", response_class=PlainTextResponse) @@ -280,9 +287,9 @@ def dispatch( if action == "history": return git_history(proj, hash_param, file_name) # Stub others with minimal response + pre = PREAMBLE.render(title=f"{esc_html(action)} - {esc_html(proj)}") return HTMLResponse( - f"""{esc_html(action)} - {esc_html(proj)}{HTML_HEAD} -

Action: {esc_html(action)}

Project: {esc_html(proj)}

""" + f"{pre}

Action: {esc_html(action)}

Project: {esc_html(proj)}

{POSTAMBLE}" ) @@ -298,15 +305,18 @@ def git_summary(project: str) -> HTMLResponse: head = git_get_head_hash(project) co = parse_commit(project, head) if head else {} head_short = head[:7] if head else "" - return HTMLResponse( - f"""{config.SITE_NAME} - {project}{HTML_HEAD} -

{esc_html(project)}

- - - - -
description{esc_html(descr)}
owner{esc_html(owner)}
HEAD{head_short or 'N/A'}
treebrowse
""" + + table = env.get_template("table.html").render( + cols=[], + rows=[ + ["Description", esc_html(descr)], + ["Owner", esc_html(owner)], + [esc_html("HEAD"), f"{head_short or 'N/A'}"], + [esc_html("tree"), f"browse"], + ] ) + pre = PREAMBLE.render(title=f"{esc_html(config.SITE_NAME)} - {project}") + return HTMLResponse(f"{pre}

{esc_html(project)}

{table}{POSTAMBLE}") def _tree_url(project: str, h: str, f: str | None, a: str = "tree") -> str: @@ -339,11 +349,10 @@ def git_blob(project: str, h: str | None, f: str | None, *, raw: bool = False) - return Response(content=data, media_type=media_type) # HTML view: raw content, escaped for safe display text = to_utf8(data) or "" - body_escaped = sanitize(text) or "" + body = sanitize(text) or "" + pre = PREAMBLE.render(title=f"{esc_html(f)} - {esc_html(project)}") return HTMLResponse( - f"""{esc_html(f)} - {esc_html(project)}{HTML_HEAD} -
{body_escaped}
""" - ) + f"{pre}
{body}
{POSTAMBLE}") def git_tree(project: str, h: str | None, f: str | None) -> HTMLResponse: @@ -374,24 +383,22 @@ def git_tree(project: str, h: str | None, f: str | None) -> HTMLResponse: sub_path = f"{f.strip('/')}/{name}".strip("/") if f else name link = _tree_url(project, ref_oid, sub_path) rows.append( - f'{esc_html(name)}/tree' + [f'{esc_html(name)}/', "tree"] ) for name, typ, _ in blobs: sub_path = f"{f.strip('/')}/{name}".strip("/") if f else name link = _tree_url(project, ref_oid, sub_path, a="blob") rows.append( - f'{esc_html(name)}blob' + [f'{esc_html(name)}', "blob"] ) - table_body = "\n".join(rows) title_path = f" / {f}" if f else "" + pre = PREAMBLE.render(title=f"{esc_html(project)}{esc_html(title_path)} - Tree") + table = env.get_template("table.html").render( + cols=["Name", "Type"], + rows=rows + ) return HTMLResponse( - f"""{esc_html(project)}{esc_html(title_path)} - tree{HTML_HEAD} -

{breadcrumb_html}

-

Tree{esc_html(title_path)}

- - -{table_body} -
NameType
""" + f"{pre}

{breadcrumb_html}

Tree{esc_html(title_path)}

{table}{POSTAMBLE}" ) @@ -406,9 +413,9 @@ def git_forks(project: str, request: Request) -> HTMLResponse: for pr in list_: path = pr.get("path", "") rows.append(f"{esc_html(path)}") + pre = PREAMBLE.render(title=f"{esc_html(project)} - Forks") return HTMLResponse( - f"""Forks - {esc_html(project)}{HTML_HEAD} -

Forks of {esc_html(project)}

{"".join(rows)}
""" + f"{pre}

Forks of {esc_html(project)}

{"".join(rows)}
{POSTAMBLE}" ) @@ -455,25 +462,21 @@ def _format_commit_table_row(project: str, commit: dict[str, Any], short: bool = if short: # Shortlog: simpler format - return ( - f'' - f'{esc_html(oid_short)}' - f'{esc_html(subject)}' - f'{author_display}' - f'{esc_html(age_str)}' - f'' - ) + return [ + f'{esc_html(oid_short)}', + esc_html(subject), + author_display, + esc_html(age_str) + ] else: # Full log: more details - return ( - f'' - f'{esc_html(oid_short)}' - f'{esc_html(subject)}' - f'{author_display} <{esc_html(author_email)}>' - f'{esc_html(date_str)}' - f'{esc_html(age_str)}' - f'' - ) + return [ + f'{esc_html(oid_short)}', + esc_html(subject), + author_display, + esc_html(date_str), + esc_html(age_str) + ] def git_log(project: str, h: str | None) -> HTMLResponse: @@ -486,23 +489,16 @@ def git_log(project: str, h: str | None) -> HTMLResponse: for commit in commits: rows.append(_format_commit_table_row(project, commit, short=False)) - table_body = "\n".join(rows) ref_display = h[:7] if h else "HEAD" - title = f"Log - {esc_html(project)}" - if h: - title += f" @ {esc_html(ref_display)}" - + title = f"Log - {esc_html(project)} @ {esc_html(ref_display)}" + + pre = PREAMBLE.render(title=title) + table = env.get_template("table.html").render( + cols=["Commit", "Subject", "Author", "Date", "Age"], + rows=rows + ) return HTMLResponse( - f"""{title}{HTML_HEAD} -

Commit log - {esc_html(project)}

- - - - - -{table_body} - -
CommitSubjectAuthorDateAge
""" + f"{pre}

{title}

{table}{POSTAMBLE}" ) @@ -516,23 +512,16 @@ def git_shortlog(project: str, h: str | None) -> HTMLResponse: for commit in commits: rows.append(_format_commit_table_row(project, commit, short=True)) - table_body = "\n".join(rows) ref_display = h[:7] if h else "HEAD" - title = f"Shortlog - {esc_html(project)}" - if h: - title += f" @ {esc_html(ref_display)}" + title = f"Shortlog - {esc_html(project)} @ {esc_html(ref_display)}" + pre = PREAMBLE.render(title=title) + table = env.get_template("table.html").render( + cols=["Commit", "Subject", "Author", "Age"], + rows=rows + ) return HTMLResponse( - f"""{title}{HTML_HEAD} -

Shortlog - {esc_html(project)}

- - - - - -{table_body} - -
CommitSubjectAuthorAge
""" + f"{pre}

{title}

{table}{POSTAMBLE}" ) @@ -550,22 +539,16 @@ def git_history(project: str, h: str | None, f: str | None) -> HTMLResponse: rows = [] for commit in commits: rows.append(_format_commit_table_row(project, commit, short=False)) - - table_body = "\n".join(rows) - ref_display = h[:7] if h else "HEAD" - + + ref_display = h[:7] if h else "HEAD" + title=f"History - {esc_html(f)} - {esc_html(project)} @ {esc_html(ref_display)}" + pre = PREAMBLE.render(title=title) + table = env.get_template("table.html").render( + cols=["Commit", "Subject", "Author", "Date", "Age"], + rows=rows + ) return HTMLResponse( - f"""History - {esc_html(f)} - {esc_html(project)}{HTML_HEAD} -

History of {esc_html(f)}

-

Project: {esc_html(project)}

- - - - - -{table_body} - -
CommitSubjectAuthorDateAge
""" + f"{pre}

{title}

Project: {esc_html(project)}

{table}{POSTAMBLE}" ) diff --git a/pygitweb/templates/preamble.html b/pygitweb/templates/preamble.html new file mode 100644 index 0000000..7574ae3 --- /dev/null +++ b/pygitweb/templates/preamble.html @@ -0,0 +1,9 @@ +{{title}} + + + + + + + + \ No newline at end of file diff --git a/pygitweb/templates/table.html b/pygitweb/templates/table.html new file mode 100644 index 0000000..6f451ec --- /dev/null +++ b/pygitweb/templates/table.html @@ -0,0 +1,13 @@ + +{% for col in cols %} + +{% endfor %} + +{% for row in rows %} +{% for cell in row %} + +{% endfor %} + +{% endfor %} + +
{{col}}
{{cell}}