From cfa983eeea05a87654100541c47cfdd11c968a18 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 10 Apr 2025 05:34:30 +0000 Subject: [PATCH] remove redundant code --- modules/fileicon/basic.go | 8 -------- modules/fileicon/material.go | 8 -------- modules/fileicon/render.go | 13 +++---------- routers/web/repo/view.go | 2 +- services/repository/files/tree.go | 4 ++-- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go index 5312a7180c..e19826d66b 100644 --- a/modules/fileicon/basic.go +++ b/modules/fileicon/basic.go @@ -17,14 +17,6 @@ func BasicThemeFolderIconName(isOpen bool) string { 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 { // TODO: add "open icon" support svgName := "octicon-file" diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go index d06d366e58..b712a9b09c 100644 --- a/modules/fileicon/material.go +++ b/modules/fileicon/material.go @@ -75,14 +75,6 @@ func (m *MaterialIconProvider) renderFileIconSVG(p *RenderedIconPool, name, svg, return template.HTML(``) } -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 { if m.rules == nil { return BasicThemeIconWithOpenStatus(entry, isOpen) diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go index 8f08ca7c6f..f69bfb9c42 100644 --- a/modules/fileicon/render.go +++ b/modules/fileicon/render.go @@ -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 -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" { - return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry) + return DefaultMaterialIconProvider().FileIconWithOpenStatus(renderedIconPool, entry, isOpen) } - return BasicThemeIcon(entry) -} - -func RenderEntryIconOpen(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML { - if setting.UI.FileIconTheme == "material" { - return DefaultMaterialIconProvider().FileIconOpen(renderedIconPool, entry) - } - return BasicThemeIconOpen(entry) + return BasicThemeIconWithOpenStatus(entry, isOpen) } diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 77240f0431..55f9268353 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -257,7 +257,7 @@ func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) { renderedIconPool := fileicon.NewRenderedIconPool() fileIcons := map[string]template.HTML{} 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["FileIconPoolHTML"] = renderedIconPool.RenderToHTML() diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go index 861d89c84c..67edf75bca 100644 --- a/services/repository/files/tree.go +++ b/services/repository/files/tree.go @@ -175,8 +175,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re } if node.EntryIcon == "" { - node.EntryIcon = fileicon.RenderEntryIcon(renderedIconPool, entry) - node.EntryIconOpen = fileicon.RenderEntryIconOpen(renderedIconPool, entry) + node.EntryIcon = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, false) + node.EntryIconOpen = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, true) } if node.EntryMode == "commit" {