Commit ea367fac08bc33a826455535831651e40097f131
2023-02-03T14:40:59
add / at end of directory URLs
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 138 139 140 141 142 143 144 145 146 147 148 149 150 151
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index ca15b5e..39bbbf1 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -113,32 +113,36 @@ defmodule KmxgitWeb.RepositoryController do
current_user = conn.assigns[:current_user]
chunks = params["slug"] |> chunk_path()
slug = chunks |> Enum.at(0) |> Enum.join("/")
- op = get_op(chunks)
- op_params = get_op_params(op, chunks)
- repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
- if op_params && repo && (repo.public_access || Repository.member?(repo, current_user)) do
- org = repo.organisation
- user = repo.user
- git = setup_git(repo, conn, op, op_params)
- first_tree = Enum.find_value(git.trees,
- fn {:branch, "master", _} -> "master"
- _ -> false
- end) ||
- case Enum.at(git.trees, 0) do
- {_, first_tree, _} -> first_tree
- nil -> nil
+ if conn.request_path == "/#{params["owner"]}/#{slug}" do
+ redirect conn, to: conn.request_path <> "/"
+ else
+ op = get_op(chunks)
+ op_params = get_op_params(op, chunks)
+ repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ if op_params && repo && (repo.public_access || Repository.member?(repo, current_user)) do
+ org = repo.organisation
+ user = repo.user
+ git = setup_git(repo, conn, op, op_params)
+ first_tree = Enum.find_value(git.trees,
+ fn {:branch, "master", _} -> "master"
+ _ -> false
+ end) ||
+ case Enum.at(git.trees, 0) do
+ {_, first_tree, _} -> first_tree
+ nil -> nil
+ end
+ tree1 = op_params.tree || first_tree
+ op_params = %OpParams{op_params | tree: tree1, git: git, org: org, repo: repo, user: user}
+ if git.valid do
+ show_op(conn, op || :tree, op_params)
+ else
+ IO.inspect(:invalid_git)
+ not_found(conn)
end
- tree1 = op_params.tree || first_tree
- op_params = %OpParams{op_params | tree: tree1, git: git, org: org, repo: repo, user: user}
- if git.valid do
- show_op(conn, op || :tree, op_params)
else
- IO.inspect(:invalid_git)
+ IO.inspect(:no_repo)
not_found(conn)
end
- else
- IO.inspect(:no_repo)
- not_found(conn)
end
end
diff --git a/lib/kmxgit_web/controllers/slug_controller.ex b/lib/kmxgit_web/controllers/slug_controller.ex
index 9d971cb..ad1269f 100644
--- a/lib/kmxgit_web/controllers/slug_controller.ex
+++ b/lib/kmxgit_web/controllers/slug_controller.ex
@@ -24,47 +24,51 @@ defmodule KmxgitWeb.SlugController do
alias KmxgitWeb.UserView
def show(conn, params) do
- current_user = conn.assigns.current_user
- slug = SlugManager.get_slug(params["slug"])
- if !slug do
- not_found(conn)
+ if ! String.match?(conn.request_path, ~r(/$)) do
+ redirect conn, to: conn.request_path <> "/"
else
- user = slug.user
- if user do
- owned_repos = User.owned_repositories(user)
- contributor_repos = RepositoryManager.list_contributor_repositories(user)
- repos = owned_repos ++ contributor_repos
- |> Enum.filter(fn repo ->
- repo.public_access || Repository.member?(repo, current_user)
- end)
- conn
- |> assign(:disk_usage, User.disk_usage(user))
- |> assign(:disk_usage_all, Repository.disk_usage(repos))
- |> assign(:repos, repos)
- |> assign(:page_title, gettext("User %{login}", login: User.login(user)))
- |> assign(:user, user)
- |> put_view(UserView)
- |> render("show.html")
+ current_user = conn.assigns.current_user
+ slug = SlugManager.get_slug(params["slug"])
+ if !slug do
+ not_found(conn)
else
- org = slug.organisation
- if org do
- repos = org.owned_repositories
+ user = slug.user
+ if user do
+ owned_repos = User.owned_repositories(user)
+ contributor_repos = RepositoryManager.list_contributor_repositories(user)
+ repos = owned_repos ++ contributor_repos
|> Enum.filter(fn repo ->
repo.public_access || Repository.member?(repo, current_user)
end)
- |> Enum.sort(fn a, b ->
- a.slug < b.slug
- end)
conn
- |> assign(:current_organisation, org)
- |> assign(:disk_usage, Organisation.disk_usage(org))
- |> assign(:org, org)
- |> assign(:page_title, org.name || org.slug_)
+ |> assign(:disk_usage, User.disk_usage(user))
+ |> assign(:disk_usage_all, Repository.disk_usage(repos))
|> assign(:repos, repos)
- |> put_view(OrganisationView)
+ |> assign(:page_title, gettext("User %{login}", login: User.login(user)))
+ |> assign(:user, user)
+ |> put_view(UserView)
|> render("show.html")
else
- raise "invalid slug"
+ org = slug.organisation
+ if org do
+ repos = org.owned_repositories
+ |> Enum.filter(fn repo ->
+ repo.public_access || Repository.member?(repo, current_user)
+ end)
+ |> Enum.sort(fn a, b ->
+ a.slug < b.slug
+ end)
+ conn
+ |> assign(:current_organisation, org)
+ |> assign(:disk_usage, Organisation.disk_usage(org))
+ |> assign(:org, org)
+ |> assign(:page_title, org.name || org.slug_)
+ |> assign(:repos, repos)
+ |> put_view(OrganisationView)
+ |> render("show.html")
+ else
+ raise "invalid slug"
+ end
end
end
end