Skip to content

Commit 34349c0

Browse files
wxiaoguangwxiaoguang
authored
Fix incorrect file links (go-gitea#34189)
Fix go-gitea#34188 The name "FileName" is ambiguous: sometimes it is "base name without path", sometimes it is "full name with path". The ambiguous name causes various problems. This PR clarifies the usage: `FileTreePath`: the full name with path.
1 parent a2651c1 commit 34349c0

File tree

9 files changed

+17
-19
lines changed

9 files changed

+17
-19
lines changed

‎routers/web/repo/blame.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
gotemplate "html/template"
99
"net/http"
1010
"net/url"
11+
"path"
1112
"strconv"
1213
"strings"
1314

@@ -69,7 +70,7 @@ func RefBlame(ctx *context.Context) {
6970
blob := entry.Blob()
7071
fileSize := blob.Size()
7172
ctx.Data["FileSize"] = fileSize
72-
ctx.Data["FileName"] = blob.Name()
73+
ctx.Data["FileTreePath"] = ctx.Repo.TreePath
7374

7475
tplName := tplRepoViewContent
7576
if !ctx.FormBool("only_content") {
@@ -285,8 +286,7 @@ func renderBlame(ctx *context.Context, blameParts []*git.BlamePart, commitNames
285286
if i != len(lines)-1 {
286287
line += "\n"
287288
}
288-
fileName := fmt.Sprintf("%v", ctx.Data["FileName"])
289-
line, lexerNameForLine := highlight.Code(fileName, language, line)
289+
line, lexerNameForLine := highlight.Code(path.Base(ctx.Repo.TreePath), language, line)
290290

291291
// set lexer name to the first detected lexer. this is certainly suboptimal and
292292
// we should instead highlight the whole file at once

‎routers/web/repo/commit.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,12 @@ func SearchCommits(ctx *context.Context) {
215215

216216
// FileHistory show a file's reversions
217217
func FileHistory(ctx *context.Context) {
218-
fileName := ctx.Repo.TreePath
219-
if len(fileName) == 0 {
218+
if ctx.Repo.TreePath == "" {
220219
Commits(ctx)
221220
return
222221
}
223222

224-
commitsCount, err := ctx.Repo.GitRepo.FileCommitsCount(ctx.Repo.RefFullName.ShortName(), fileName) // FIXME: legacy code used ShortName
223+
commitsCount, err := ctx.Repo.GitRepo.FileCommitsCount(ctx.Repo.RefFullName.ShortName(), ctx.Repo.TreePath)
225224
if err != nil {
226225
ctx.ServerError("FileCommitsCount", err)
227226
return
@@ -238,7 +237,7 @@ func FileHistory(ctx *context.Context) {
238237
commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange(
239238
git.CommitsByFileAndRangeOptions{
240239
Revision: ctx.Repo.RefFullName.ShortName(), // FIXME: legacy code used ShortName
241-
File: fileName,
240+
File: ctx.Repo.TreePath,
242241
Page: page,
243242
})
244243
if err != nil {
@@ -253,7 +252,7 @@ func FileHistory(ctx *context.Context) {
253252

254253
ctx.Data["Username"] = ctx.Repo.Owner.Name
255254
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
256-
ctx.Data["FileName"] = fileName
255+
ctx.Data["FileTreePath"] = ctx.Repo.TreePath
257256
ctx.Data["CommitCount"] = commitsCount
258257

259258
pager := context.NewPagination(int(commitsCount), setting.Git.CommitsRangeSize, page, 5)

‎routers/web/repo/editor.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ func editFile(ctx *context.Context, isNewFile bool) {
160160
defer dataRc.Close()
161161

162162
ctx.Data["FileSize"] = blob.Size()
163-
ctx.Data["FileName"] = blob.Name()
164163

165164
buf := make([]byte, 1024)
166165
n, _ := util.ReadAtMost(dataRc, buf)

‎routers/web/repo/view_file.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func prepareToRenderFile(ctx *context.Context, entry *git.TreeEntry) {
5252

5353
ctx.Data["Title"] = ctx.Tr("repo.file.title", ctx.Repo.Repository.Name+"/"+path.Base(ctx.Repo.TreePath), ctx.Repo.RefFullName.ShortName())
5454
ctx.Data["FileIsSymlink"] = entry.IsLink()
55-
ctx.Data["FileName"] = blob.Name()
55+
ctx.Data["FileTreePath"] = ctx.Repo.TreePath
5656
ctx.Data["RawFileLink"] = ctx.Repo.RepoLink + "/raw/" + ctx.Repo.RefTypeNameSubURL() + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
5757

5858
if ctx.Repo.TreePath == ".editorconfig" {

‎routers/web/repo/view_readme.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func prepareToRenderReadmeFile(ctx *context.Context, subfolder string, readmeFil
162162
defer dataRc.Close()
163163

164164
ctx.Data["FileIsText"] = fInfo.isTextFile
165-
ctx.Data["FileName"] = path.Join(subfolder, readmeFile.Name())
165+
ctx.Data["FileTreePath"] = path.Join(subfolder, readmeFile.Name())
166166
ctx.Data["FileSize"] = fInfo.fileSize
167167
ctx.Data["IsLFSFile"] = fInfo.isLFSFile
168168

‎templates/repo/blame.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
{{end}}
1212
{{end}}
13-
<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
13+
<div class="{{TabSizeClass .Editorconfig .FileTreePath}} non-diff-file-content">
1414
<h4 class="file-header ui top attached header tw-flex tw-items-center tw-justify-between tw-flex-wrap">
1515
<div class="file-header-left tw-flex tw-items-center tw-py-2 tw-pr-4">
1616
{{template "repo/file_info" .}}

‎templates/repo/commits_list.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
{{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}}
7171
{{if not $.PageIsWiki}}
7272
{{/* view single file diff */}}
73-
{{if $.FileName}}
73+
{{if $.FileTreePath}}
7474
<a class="btn interact-bg tw-p-2 view-single-diff" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_file_diff"}}"
75-
href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileName}}"
75+
href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileTreePath}}"
7676
>{{svg "octicon-file-diff"}}</a>
7777
{{end}}
7878

7979
{{/* view at history point */}}
8080
{{$viewCommitLink := printf "%s/src/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
81-
{{if $.FileName}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileName)}}{{end}}
81+
{{if $.FileTreePath}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileTreePath)}}{{end}}
8282
<a class="btn interact-bg tw-p-2 view-commit-path" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{$viewCommitLink}}">{{svg "octicon-file-code"}}</a>
8383
{{end}}
8484
</td>

‎templates/repo/home_sidebar_top.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
{{end}}
4646

4747
{{if .ReadmeExist}}
48-
<a class="flex-text-block muted" href="{{.TreeLink}}/{{.FileName}}">
48+
<a class="flex-text-block muted" href="{{.RepoLink}}/src/{{.RefTypeNameSubURL}}/{{PathEscapeSegments .FileTreePath}}">
4949
{{svg "octicon-book"}} {{ctx.Locale.Tr "readme"}}
5050
</a>
5151
{{end}}

‎templates/repo/view_file.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div {{if .ReadmeInList}}id="readme" {{end}}class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
1+
<div {{if .ReadmeInList}}id="readme" {{end}}class="{{TabSizeClass .Editorconfig .FileTreePath}} non-diff-file-content">
22
{{- if .FileError}}
33
<div class="ui error message">
44
<div class="text left tw-whitespace-pre">{{.FileError}}</div>
@@ -27,7 +27,7 @@
2727
<div class="file-header-left tw-flex tw-items-center tw-py-2 tw-pr-4">
2828
{{if .ReadmeInList}}
2929
{{svg "octicon-book" 16 "tw-mr-2"}}
30-
<strong><a class="muted" href="#readme">{{.FileName}}</a></strong>
30+
<strong><a class="muted" href="#readme">{{.FileTreePath}}</a></strong>
3131
{{else}}
3232
{{template "repo/file_info" .}}
3333
{{end}}
@@ -78,7 +78,7 @@
7878
<button class="ui mini basic button escape-button tw-mr-1">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
7979
{{end}}
8080
{{if and .ReadmeInList .CanEditReadmeFile}}
81-
<a class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.editor.edit_this_file"}}" href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}/{{PathEscapeSegments .FileName}}">{{svg "octicon-pencil"}}</a>
81+
<a class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.editor.edit_this_file"}}" href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .FileTreePath}}">{{svg "octicon-pencil"}}</a>
8282
{{end}}
8383
</div>
8484
</h4>

0 commit comments

Comments
 (0)