aniani/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-26 11:04:27 -04:00
Code

remove redundant code

Browse Source
This commit is contained in:
Kerwin Bryant 2025-04-10 05:34:30 +00:00
parent 3009712e1b
commit cfa983eeea
5 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/fileicon/basic.go
View File

@ -17,14 +17,6 @@ func BasicThemeFolderIconName(isOpen bool) string {
return "octicon-file-directory-fill" return "octicon-file-directory-fill"
} }
func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
return BasicThemeIconWithOpenStatus(entry, false)
}
func BasicThemeIconOpen(entry *git.TreeEntry) template.HTML {
return BasicThemeIconWithOpenStatus(entry, true)
}
func BasicThemeIconWithOpenStatus(entry *git.TreeEntry, isOpen bool) template.HTML { func BasicThemeIconWithOpenStatus(entry *git.TreeEntry, isOpen bool) template.HTML {
// TODO: add "open icon" support // TODO: add "open icon" support
svgName := "octicon-file" svgName := "octicon-file"

8
modules/fileicon/material.go
View File

@ -75,14 +75,6 @@ func (m *MaterialIconProvider) renderFileIconSVG(p *RenderedIconPool, name, svg,
return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`) return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`)
} }
func (m *MaterialIconProvider) FileIcon(p *RenderedIconPool, entry *git.TreeEntry) template.HTML {
return m.FileIconWithOpenStatus(p, entry, false)
}
func (m *MaterialIconProvider) FileIconOpen(p *RenderedIconPool, entry *git.TreeEntry) template.HTML {
return m.FileIconWithOpenStatus(p, entry, true)
}
func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML { func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
if m.rules == nil { if m.rules == nil {
return BasicThemeIconWithOpenStatus(entry, isOpen) return BasicThemeIconWithOpenStatus(entry, isOpen)

13
modules/fileicon/render.go
View File

@ -36,16 +36,9 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {
// TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module // TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module
func RenderEntryIcon(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML { func RenderEntryIconWithOpenStatus(renderedIconPool *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
if setting.UI.FileIconTheme == "material" { if setting.UI.FileIconTheme == "material" {
return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry) return DefaultMaterialIconProvider().FileIconWithOpenStatus(renderedIconPool, entry, isOpen)
} }
return BasicThemeIcon(entry) return BasicThemeIconWithOpenStatus(entry, isOpen)
}
func RenderEntryIconOpen(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
if setting.UI.FileIconTheme == "material" {
return DefaultMaterialIconProvider().FileIconOpen(renderedIconPool, entry)
}
return BasicThemeIconOpen(entry)
} }

2
routers/web/repo/view.go
View File

@ -257,7 +257,7 @@ func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) {
renderedIconPool := fileicon.NewRenderedIconPool() renderedIconPool := fileicon.NewRenderedIconPool()
fileIcons := map[string]template.HTML{} fileIcons := map[string]template.HTML{}
for _, f := range files { for _, f := range files {
fileIcons[f.Entry.Name()] = fileicon.RenderEntryIcon(renderedIconPool, f.Entry) fileIcons[f.Entry.Name()] = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, f.Entry, false)
} }
ctx.Data["FileIcons"] = fileIcons ctx.Data["FileIcons"] = fileIcons
ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML() ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()

4
services/repository/files/tree.go
View File

@ -175,8 +175,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re
} }
if node.EntryIcon == "" { if node.EntryIcon == "" {
node.EntryIcon = fileicon.RenderEntryIcon(renderedIconPool, entry) node.EntryIcon = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, false)
node.EntryIconOpen = fileicon.RenderEntryIconOpen(renderedIconPool, entry) node.EntryIconOpen = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, true)
} }
if node.EntryMode == "commit" { if node.EntryMode == "commit" {