Commit 8769c23d154c7b25c13b273a16f19e7f752e13de
2021-12-30T13:34:05
repository show operation tree and blob
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 77333b2..38d7ecd 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -98,7 +98,7 @@ defmodule KmxgitWeb.RepositoryController do
current_user = conn.assigns[:current_user]
chunks = params["slug"] |> chunk_path()
slug = chunks |> Enum.at(0) |> Enum.join("/")
- {branch, path} = get_branch_and_path(chunks)
+ {op, branch, path} = get_op_branch_and_path(chunks)
repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
if repo && repo.public_access || Repository.member?(repo, current_user) do
org = repo.organisation
@@ -110,18 +110,35 @@ defmodule KmxgitWeb.RepositoryController do
end
branch1 = branch || first_branch
if git.valid do
- conn
- |> assign(:branch, branch1)
- |> assign(:branch_url, Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo, if branch1 do ["_branch", branch1] else [] end)))
- |> assign_current_organisation(org)
- |> assign(:current_repository, repo)
- |> assign(:git, git)
- |> assign(:repo, repo)
- |> assign(:members, Repository.members(repo))
- |> assign(:owner, org || user)
- |> assign(:path, path)
- |> render("show.html")
+ op = op || :tree
+ case op do
+ :blob ->
+ if (git.content) do
+ conn
+ |> put_resp_content_type("application/binary")
+ |> put_resp_header("Content-Disposition", "attachment; filename=#{git.filename |> URI.encode()}")
+ |> resp(200, git.content)
+ else
+ not_found(conn)
+ end
+ :tree ->
+ conn
+ |> assign(:branch, branch1)
+ |> assign(:branch_url, Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo, if branch1 do ["_tree", branch1] else [] end)))
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:git, git)
+ |> assign(:repo, repo)
+ |> assign(:members, Repository.members(repo))
+ |> assign(:owner, org || user)
+ |> assign(:path, path)
+ |> render("show.html")
+ x ->
+ IO.inspect({:unknown_op, x})
+ not_found(conn)
+ end
else
+ IO.inspect(:invalid_git)
not_found(conn)
end
else
@@ -146,23 +163,35 @@ defmodule KmxgitWeb.RepositoryController do
end
end
- defp get_branch_and_path(chunks) do
- if (path = chunks |> Enum.at(1)) && (path |> Enum.at(0)) == "_branch" do
- {_, rest} = chunks |> Enum.split(2)
- rest1 = rest |> Enum.map(fn x ->
- Enum.join(x, "/")
- end)
- {["_branch", branch], path1} = path |> Enum.split(2)
- {branch,
- path1 ++ rest1 |> Enum.reject(&(!&1 || &1 == "")) |> Enum.join("/")}
+ defp get_op_branch_and_path(chunks) do
+ if path = chunks |> Enum.at(1) do
+ op = case path |> Enum.at(0) do
+ "_tree" -> :tree
+ "_blob" -> :blob
+ _ -> nil
+ end
+ if op do
+ {_, rest} = chunks |> Enum.split(2)
+ rest1 = rest |> Enum.map(fn x ->
+ Enum.join(x, "/")
+ end)
+ {[_, branch], path1} = path |> Enum.split(2)
+ path2 = (path1 ++ rest1)
+ |> Enum.reject(&(!&1 || &1 == ""))
+ |> Enum.join("/")
+ {op, branch, path2}
+ else
+ {nil, nil, ""}
+ end
else
- {nil, ""}
+ {nil, nil, ""}
end
end
defp setup_git(repo, branch, path, conn) do
%{branches: [],
content: nil,
+ filename: nil,
files: [],
readme: [],
status: "",
@@ -178,7 +207,7 @@ defmodule KmxgitWeb.RepositoryController do
{:ok, branches} ->
branches = branches
|> Enum.map(fn b ->
- url = Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_branch", b])
+ url = Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_tree", b])
{b, url}
end)
%{git | branches: branches}
@@ -195,7 +224,7 @@ defmodule KmxgitWeb.RepositoryController do
{:ok, files} ->
files = files
|> Enum.map(fn f = %{url: url} ->
- %{f | url: Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_branch", branch | String.split(url, "/")])}
+ %{f | url: Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_tree", branch | String.split(url, "/")])}
end)
%{git | files: files}
{:error, status} -> %{git | status: "#{git.status}\n#{status}", valid: false}
@@ -205,9 +234,10 @@ defmodule KmxgitWeb.RepositoryController do
git
end
- defp git_put_content(git = %{files: [%{type: "blob", sha1: sha1}], valid: true}, repo) do
+ defp git_put_content(git = %{files: [%{name: name, sha1: sha1, type: "blob"}], valid: true}, repo) do
+ IO.inspect(git)
case GitManager.content(Repository.full_slug(repo), sha1) do
- {:ok, content} -> %{git | content: content}
+ {:ok, content} -> %{git | content: content, filename: name}
{:error, error} -> %{git | status: error}
end
end