Project: {esc_html(project)}
{blob_html}{POSTAMBLE}") + return HTMLResponse(f"{pre}Project: {esc_html(project)}
{blob_html}{POSTAMBLE}") raise HTTPException(status_code=404, detail="Unknown object type") @@ -278,13 +278,13 @@ def git_summary(project: str) -> HTMLResponse: rows=[ ["Description", esc_html(descr)], ["Owner", esc_html(owner)], - [esc_html("HEAD"), f"{head_short or 'N/A'}"], - [esc_html("tree"), f"browse"], - ["Log", f"view log"], - ["Shortlog", f"view shortlog"], - ["Heads", f"view heads"], - ["Tags", f"view tags"], - ["Remotes", f"view remotes"], + [esc_html("HEAD"), f"{head_short or 'N/A'}"], + [esc_html("tree"), f"browse"], + ["Log", f"view log"], + ["Shortlog", f"view shortlog"], + ["Heads", f"view heads"], + ["Tags", f"view tags"], + ["Remotes", f"view remotes"], ], ) pre = PREAMBLE.render(title=f"{esc_html(config.SITE_NAME)} - {project}", site_name=config.SITE_NAME) @@ -355,7 +355,7 @@ def git_blob(project: str, h: str | None, f: str | None, *, raw: bool = False) - f"{body}Project: {esc_html(project)}
{table}{pagination_html}{POSTAMBLE}" + f"{pre}Project: {esc_html(project)}
{table}{pagination_html}{POSTAMBLE}" ) @@ -498,8 +498,8 @@ def git_heads(project: str) -> HTMLResponse: rows = [] for name, _ref, oid in heads_list: oid_short = oid[:7] if oid else "" - commit_link = f"/{project}?a=commit&h={quote(oid, safe='')}" - tree_link = f"/{project}?a=tree&h={quote(oid, safe='')}" + commit_link = f"/project/{project}?a=commit&h={quote(oid, safe='')}" + tree_link = f"/project/{project}?a=tree&h={quote(oid, safe='')}" rows.append([ f'{esc_html(name)}', f'{esc_html(oid_short)}', @@ -512,7 +512,7 @@ def git_heads(project: str) -> HTMLResponse: rows=rows, ) return HTMLResponse( - f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" + f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" ) @@ -533,7 +533,7 @@ def git_tags(project: str, request: Request, page: int, pagecount: int) -> HTMLR raise HTTPException(status_code=404, detail="Repository not found") rows = [] for name, _ref, oid in tags_page: - tag_link = f"/{project}?a=tag&h={quote(oid, safe='')}" + tag_link = f"/project/{project}?a=tag&h={quote(oid, safe='')}" target_oid = oid target_type = "commit" try: @@ -545,9 +545,9 @@ def git_tags(project: str, request: Request, page: int, pagecount: int) -> HTMLR pass target_short = target_oid[:7] if target_oid else "" if target_type == "commit": - target_link = f"/{project}?a=commit&h={quote(target_oid, safe='')}" + target_link = f"/project/{project}?a=commit&h={quote(target_oid, safe='')}" elif target_type == "tree": - target_link = f"/{project}?a=tree&h={quote(target_oid, safe='')}" + target_link = f"/project/{project}?a=tree&h={quote(target_oid, safe='')}" else: target_link = None obj_cell = f'{esc_html(target_short)}' if target_link else esc_html(target_short) @@ -565,7 +565,7 @@ def git_tags(project: str, request: Request, page: int, pagecount: int) -> HTMLR request, page, pagecount, page > 1, page < total_pages, total_pages=total_pages ) return HTMLResponse( - f"{pre}Project: {esc_html(project)}
{table}{pagination_html}{POSTAMBLE}" + f"{pre}Project: {esc_html(project)}
{table}{pagination_html}{POSTAMBLE}" ) @@ -601,9 +601,9 @@ def git_tag(project: str, h: str | None) -> HTMLResponse: tag_name = tag_oid[:7] target_short = target_oid[:7] if target_oid else "" if target_type == "commit": - object_link = f'{esc_html(target_short)}' + object_link = f'{esc_html(target_short)}' elif target_type == "tree": - object_link = f'{esc_html(target_short)}' + object_link = f'{esc_html(target_short)}' else: object_link = esc_html(target_short) table_rows = [ @@ -618,7 +618,7 @@ def git_tag(project: str, h: str | None) -> HTMLResponse: title = f"Tag {esc_html(tag_name)} - {esc_html(project)}" pre = PREAMBLE.render(title=title, site_name=config.SITE_NAME) return HTMLResponse( - f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" + f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" ) @@ -644,10 +644,10 @@ def git_commit(project: str, h: str | None) -> HTMLResponse: author_date = _format_date(data.get("author_epoch"), data.get("author_tz")) tree_oid = data.get("tree", "") message = (data.get("body") or "").strip() - commit_link = f"/{project}?a=commit&h={quote(oid, safe='')}" - tree_link = f"/{project}?a=tree&h={quote(oid, safe='')}" - diff_link = f"/{project}?a=commitdiff&h={quote(oid, safe='')}" - patch_link = f"/{project}?a=patch&h={quote(oid, safe='')}" + commit_link = f"/project/{project}?a=commit&h={quote(oid, safe='')}" + tree_link = f"/project/{project}?a=tree&h={quote(oid, safe='')}" + diff_link = f"/project/{project}?a=commitdiff&h={quote(oid, safe='')}" + patch_link = f"/project/{project}?a=patch&h={quote(oid, safe='')}" table_rows = [ ["commit", f'{esc_html(oid)}'], ["Author", f"{esc_html(author)} <{esc_html(author_email)}>"], @@ -657,7 +657,7 @@ def git_commit(project: str, h: str | None) -> HTMLResponse: for i, parent_id in enumerate(commit.parent_ids): parent_oid = str(parent_id) parent_short = parent_oid[:7] - parent_link = f"/{project}?a=commit&h={quote(parent_oid, safe='')}" + parent_link = f"/project/{project}?a=commit&h={quote(parent_oid, safe='')}" label = "parent" if len(commit.parent_ids) == 1 else f"parent ({i + 1})" table_rows.append([label, f'{esc_html(parent_short)}']) if message: @@ -667,7 +667,7 @@ def git_commit(project: str, h: str | None) -> HTMLResponse: title = f"Commit {esc_html(oid_short)} - {esc_html(project)}" pre = PREAMBLE.render(title=title, site_name=config.SITE_NAME) return HTMLResponse( - f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" + f"{pre}Project: {esc_html(project)}
{table}{POSTAMBLE}" ) @@ -681,7 +681,7 @@ def git_commitdiff(project: str, h: str | None) -> HTMLResponse: project=project, oid_short=oid_short, diff_b64=diff_b64, - commit_link=f"/{project}?a=commit&h={quote(h or '', safe='')}", + commit_link=f"/project/{project}?a=commit&h={quote(h or '', safe='')}", ) return HTMLResponse(f"{pre}{body}{POSTAMBLE}") @@ -749,7 +749,7 @@ def git_blobdiff( if diff_text is None: raise HTTPException(status_code=404, detail="Blob not found") diff_b64 = base64.b64encode(diff_text.encode("utf-8")).decode("ascii") - blob_link = f"/{project}?a=blob&h={quote(h or '', safe='')}&f={quote(path_new, safe='/')}" + blob_link = f"/project/{project}?a=blob&h={quote(h or '', safe='')}&f={quote(path_new, safe='/')}" pre = PREAMBLE.render( title=f"Blob diff - {esc_html(path_new)} - {esc_html(project)}", site_name=config.SITE_NAME, diff --git a/pygitweb/main.py b/pygitweb/main.py index 94af50a..49d76a3 100644 --- a/pygitweb/main.py +++ b/pygitweb/main.py @@ -189,7 +189,7 @@ def git_project_list( table = env.get_template("table.html").render( cols=["Project", "Description"], rows=[ - [f"{pr.get('path', "")}", + [f"{pr.get('path', '')}", pr.get('descr') or pr.get('path', "")] for pr in list_[:50]] ) @@ -351,13 +351,13 @@ async def addproject_submit( except OSError as e: raise HTTPException(status_code=500, detail=str(e)) - return RedirectResponse(url=f"/{project_name}", status_code=303) + return RedirectResponse(url=f"/project/{project_name}", status_code=303) # ---------- Routes (project required) ---------- -@app.get("/{project:path}", response_class=HTMLResponse) +@app.get("/project/{project:path}", response_class=HTMLResponse) def dispatch( request: Request, project: str, @@ -370,15 +370,12 @@ def dispatch( pagecount: Annotated[str | None, Query(alias="pagecount")] = None, ): """ - Dispatch by path: /project -> summary; /project/action/... -> action. + Dispatch by path: /project/{project} -> summary; /project/{project}/action/... -> action. Port of dispatch + run_request path handling. """ - # Normalize project: first path segment that is a valid repo - segments = [s for s in project.split("/") if s] - if not segments: + if not project or project == "": raise HTTPException(status_code=400, detail="Project needed") - proj = segments[0] - _validate_project(proj) + _validate_project(project) action = a hash_param = h or hb file_name = f @@ -386,12 +383,12 @@ def dispatch( # If no action, infer: hash only -> object type; project only -> summary if not action: if hash_param and file_name: - obj_type = git_get_type(proj, f"{hash_param}:{file_name}") + obj_type = git_get_type(project, f"{hash_param}:{file_name}") if not obj_type: raise HTTPException(status_code=404, detail="File or directory does not exist") action = "tree" if obj_type == "tree" else "blob_plain" elif hash_param: - obj_type = git_get_type(proj, hash_param) + obj_type = git_get_type(project, hash_param) if not obj_type: raise HTTPException(status_code=404, detail="Object does not exist") action = {"commit": "commit", "tree": "tree", "blob": "blob", "tag": "tag"}.get(obj_type, "object") @@ -403,47 +400,47 @@ def dispatch( raise HTTPException(status_code=400, detail="Project not needed for this action") # Route to handler if action == "summary": - return git_summary(proj) + return git_summary(project) if action == "tree": - return git_tree(proj, hash_param, file_name) + return git_tree(project, hash_param, file_name) if action in ("blob", "blob_plain"): - return git_blob(proj, hash_param, file_name, raw=(action == "blob_plain")) + return git_blob(project, hash_param, file_name, raw=(action == "blob_plain")) if action == "blobdiff": - return git_blobdiff(proj, h, hb, file_name, file_parent) + return git_blobdiff(project, h, hb, file_name, file_parent) if action == "blobpatch": - return git_blobpatch(proj, h, hb, file_name, file_parent) + return git_blobpatch(project, h, hb, file_name, file_parent) if action == "log": p, pc = parse_pagination(page, pagecount) - return git_log(proj, hash_param, request, p, pc) + return git_log(project, hash_param, request, p, pc) if action == "shortlog": p, pc = parse_pagination(page, pagecount) - return git_shortlog(proj, hash_param, request, p, pc) + return git_shortlog(project, hash_param, request, p, pc) if action == "history": p, pc = parse_pagination(page, pagecount) - return git_history(proj, hash_param, file_name, request, p, pc) + return git_history(project, hash_param, file_name, request, p, pc) if action == "heads": - return git_heads(proj) + return git_heads(project) if action == "tags": p, pc = parse_pagination(page, pagecount) - return git_tags(proj, request, p, pc) + return git_tags(project, request, p, pc) if action == "tag": - return git_tag(proj, hash_param) + return git_tag(project, hash_param) if action == "commit": - return git_commit(proj, hash_param) + return git_commit(project, hash_param) if action == "patch": - return git_patch(proj, h) + return git_patch(project, h) if action == "patches": - return git_patches(proj, h, hb) + return git_patches(project, h, hb) if action == "commitdiff": - return git_commitdiff(proj, hash_param) + return git_commitdiff(project, hash_param) if action == "remotes": - return git_remotes(proj) + return git_remotes(project) if action == "object": - return git_object(proj, hash_param) + return git_object(project, hash_param) # Stub others with minimal response - pre = PREAMBLE.render(title=f"{esc_html(action)} - {esc_html(proj)}", site_name=config.SITE_NAME) + pre = PREAMBLE.render(title=f"{esc_html(action)} - {esc_html(project)}", site_name=config.SITE_NAME) return HTMLResponse( - f"{pre}Action: {esc_html(action)}
Project: {esc_html(proj)}
{POSTAMBLE}" + f"{pre}Action: {esc_html(action)}
Project: {esc_html(project)}
{POSTAMBLE}" ) diff --git a/pygitweb/templates/blobdiff.html b/pygitweb/templates/blobdiff.html index a88b3ba..f1d5c65 100644 --- a/pygitweb/templates/blobdiff.html +++ b/pygitweb/templates/blobdiff.html @@ -1,5 +1,5 @@Project: {{ project }} · blob
+Project: {{ project }} · blob
Project: {{ project }} · commit
+Project: {{ project }} · commit