Commit 7cbcb99eaa4a6a7f5c9263e11949d059bc4a9aae
2023-02-28T12:36:36
ci
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
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 68d062b..325c9a5 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -372,13 +372,14 @@ defmodule KmxgitWeb.RepositoryController do
log1 = case Git.log(slug, tree, path || "", 0, 1) do
{:ok, [log1]} ->
ci_status_path = "priv/ci/#{Repository.full_slug(repo)}/ci/status/rbpkg_ci.#{repo.slug}.commit_#{log1.hash}.status"
+ IO.inspect(ci_status_path)
if File.exists?(ci_status_path) do
{:ok, ci_status} = File.read(ci_status_path)
- %{log1 | ci_status: ci_status}
+ %{log1 | ci_status: String.trim(ci_status)}
else
log1
end
- {:ok, result} ->
+ {:ok, _result} ->
#IO.inspect({:log1, result})
nil
{:error, err} ->
@@ -427,7 +428,7 @@ defmodule KmxgitWeb.RepositoryController do
ci_status_path = "priv/ci/#{Repository.full_slug(repo)}/ci/status/rbpkg_ci.#{repo.slug}.commit_#{log1.hash}.status"
if File.exists?(ci_status_path) do
{:ok, ci_status} = File.read(ci_status_path)
- %{log1 | ci_status: ci_status}
+ %{log1 | ci_status: String.trim(ci_status)}
else
log1
end
@@ -490,40 +491,44 @@ defmodule KmxgitWeb.RepositoryController do
not_found(conn)
end
end
- defp show_op(conn, op = :ci, %{org: org, path: path, repo: repo, user: user}) do
- ci = %{content: nil,
- content_lang: nil,
- content_type: nil,
- filename: nil,
- files: nil,
- line_numbers: nil,
- markdown_html: nil,
- path: "priv/ci/#{Repository.full_slug(repo)}/#{path}"}
- |> ci_put_content()
- |> ci_put_dir()
- if ci.content == nil && ci.files == nil do
+ defp show_op(conn, :ci, %{org: org, path: path, repo: repo, user: user}) do
+ if String.match?(path, ~r{(^|/)[.][.](/|$)}) do
not_found(conn)
else
- if Path.extname(path) == ".log" || ci.content_type && String.match?(ci.content_type, ~r(^image/)) do
- conn
- |> put_resp_content_type(ci.content_type)
- |> resp(200, ci.content)
- else
- if ci.content_lang == "html" do
- conn
- |> put_resp_content_type("text/html")
- |> resp(200, ci.content)
+ ci = %{content: nil,
+ content_lang: nil,
+ content_type: nil,
+ filename: nil,
+ files: nil,
+ line_numbers: nil,
+ markdown_html: nil,
+ path: "priv/ci/#{Repository.full_slug(repo)}/#{path}"}
+ |> ci_put_content()
+ |> ci_put_dir()
+ if ci.content == nil && ci.files == nil do
+ not_found(conn)
else
- conn
- |> assign(:ci, ci)
- |> assign_current_organisation(org)
- |> assign(:current_repository, repo)
- |> assign(:owner, org || user)
- |> assign(:path, path)
- |> assign(:repo, repo)
- |> render("ci.html")
+ if Path.extname(path) == ".log" || ci.content_type && String.match?(ci.content_type, ~r(^image/)) do
+ conn
+ |> put_resp_content_type(ci.content_type)
+ |> resp(200, ci.content)
+ else
+ if ci.content_lang == "html" do
+ conn
+ |> put_resp_content_type("text/html")
+ |> resp(200, ci.content)
+ else
+ conn
+ |> assign(:ci, ci)
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:owner, org || user)
+ |> assign(:path, path)
+ |> assign(:repo, repo)
+ |> render("ci.html")
+ end
+ end
end
- end
end
end
defp show_op(conn, :commit = op, %{git: git, org: org, path: path, repo: repo, tree: tree}) do