fine tune

Author: wxiaoguang

modules/fileicon/material.go

@@ -5,7 +5,6 @@ package fileicon
 
 import (
 	"html/template"
-	"path"
 	"strings"
 	"sync"
 
@@ -134,7 +133,7 @@ func (m *MaterialIconProvider) FindIconName(entry *EntryInfo) string {
 		return "folder-git"
 	}
 
-	fileNameLower := strings.ToLower(path.Base(entry.BaseName))
+	fileNameLower := strings.ToLower(entry.BaseName)
 	if entry.EntryMode.IsDir() {
 		if s, ok := m.rules.FolderNames[fileNameLower]; ok {
 			return s

modules/git/tree_entry.go

@@ -72,7 +72,7 @@ func EntryFollowLinks(commit *Commit, firstFullPath string, firstTreeEntry *Tree
 		}
 	}
 	if treeEntry.IsLink() {
-		return res, util.ErrorWrap(util.ErrUnprocessableContent, "%q has too many links", fullPath)
+		return res, util.ErrorWrap(util.ErrUnprocessableContent, "%q has too many links", firstFullPath)
 	}
 	return res, nil
 }

modules/git/tree_entry_gogit.go

@@ -51,10 +51,6 @@ func (te *TreeEntry) Size() int64 {
 	return te.size
 }
 
-func (te *TreeEntry) FullPath() string {
-	return te.Name()
-}
-
 // IsSubModule if the entry is a submodule
 func (te *TreeEntry) IsSubModule() bool {
 	return te.gogitTreeEntry.Mode == filemode.Submodule

routers/web/repo/treelist.go

@@ -6,6 +6,7 @@ package repo
 import (
 	"html/template"
 	"net/http"
+	"path"
 	"strings"
 
 	pull_model "code.gitea.io/gitea/models/pull"
@@ -111,7 +112,7 @@ func transformDiffTreeForWeb(renderedIconPool *fileicon.RenderedIconPool, diffTr
 		item := &WebDiffFileItem{FullName: file.HeadPath, DiffStatus: file.Status}
 		item.IsViewed = filesViewedState[item.FullName] == pull_model.Viewed
 		item.NameHash = git.HashFilePathForWebUI(item.FullName)
-		item.FileIcon = fileicon.RenderEntryIconHTML(renderedIconPool, &fileicon.EntryInfo{BaseName: file.HeadPath, EntryMode: file.HeadMode})
+		item.FileIcon = fileicon.RenderEntryIconHTML(renderedIconPool, &fileicon.EntryInfo{BaseName: path.Base(file.HeadPath), EntryMode: file.HeadMode})
 
 		switch file.HeadMode {
 		case git.EntryModeTree:

routers/web/repo/view_home.go

@@ -386,23 +386,16 @@ func redirectSrcToRaw(ctx *context.Context) bool {
 	return false
 }
 
-func redirectFollowSymlink(ctx *context.Context) bool {
-	if ctx.Repo.TreePath != "" && ctx.FormBool("follow_symlink") {
-		// Redirect to the symlink target path
-		entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
-		if err != nil {
-			HandleGitError(ctx, "Repo.Commit.GetTreeEntryByPath", err)
-			return true
-		}
-		if entry.IsLink() {
-			res, err := git.EntryFollowLinks(ctx.Repo.Commit, ctx.Repo.TreePath, entry)
-			if err != nil {
-				return false // don't handle the links we cannot resolve
-			}
+func redirectFollowSymlink(ctx *context.Context, treePathEntry *git.TreeEntry) bool {
+	if ctx.Repo.TreePath == "" || !ctx.FormBool("follow_symlink") {
+		return false
+	}
+	if treePathEntry.IsLink() {
+		if res, err := git.EntryFollowLinks(ctx.Repo.Commit, ctx.Repo.TreePath, treePathEntry); err == nil {
 			redirect := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL() + "/" + util.PathEscapeSegments(res.TargetFullPath) + "?" + ctx.Req.URL.RawQuery
 			ctx.Redirect(redirect)
 			return true
-		}
+		} // else: don't handle the links we cannot resolve, so ignore the error
 	}
 	return false
 }
@@ -412,9 +405,6 @@ func Home(ctx *context.Context) {
 	if handleRepoHomeFeed(ctx) {
 		return
 	}
-	if redirectFollowSymlink(ctx) {
-		return
-	}
 	if redirectSrcToRaw(ctx) {
 		return
 	}
@@ -449,6 +439,10 @@ func Home(ctx *context.Context) {
 		return
 	}
 
+	if redirectFollowSymlink(ctx, entry) {
+		return
+	}
+
 	// prepare the tree path
 	var treeNames, paths []string
 	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL()

routers/web/repo/view_readme.go

@@ -144,27 +144,24 @@ func prepareToRenderReadmeFile(ctx *context.Context, subfolder string, readmeFil
 	}
 
 	readmeFullPath := path.Join(ctx.Repo.TreePath, subfolder, readmeFile.Name())
-	target := readmeFile
+	readmeTargetEntry := readmeFile
 	if readmeFile.IsLink() {
-		res, _ := git.EntryFollowLinks(ctx.Repo.Commit, readmeFullPath, readmeFile)
-		if res != nil {
-			target = res.TargetEntry
+		if res, err := git.EntryFollowLinks(ctx.Repo.Commit, readmeFullPath, readmeFile); err == nil {
+			readmeTargetEntry = res.TargetEntry
 		} else {
-			target = nil
+			readmeTargetEntry = nil // if we cannot resolve the symlink, we cannot render the readme, ignore the error
 		}
 	}
-	if target == nil {
-		// if findReadmeFile() failed and/or gave us a broken symlink (which it shouldn't)
-		// simply skip rendering the README
-		return
+	if readmeTargetEntry == nil {
+		return // if no valid README entry found, skip rendering the README
 	}
 
 	ctx.Data["RawFileLink"] = ""
 	ctx.Data["ReadmeInList"] = path.Join(subfolder, readmeFile.Name()) // the relative path to the readme file to the current tree path
 	ctx.Data["ReadmeExist"] = true
 	ctx.Data["FileIsSymlink"] = readmeFile.IsLink()
 
-	buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, target.Blob())
+	buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, readmeTargetEntry.Blob())
 	if err != nil {
 		ctx.ServerError("getFileReader", err)
 		return