feat: file icons

mistakenelf · Mar 16, 2024 · de082f7 · de082f7
1 parent dd6434f
commit de082f7
Show file tree

Hide file tree

Showing 11 changed files with 495 additions and 1,491 deletions.
diff --git a/filetree/commands.go b/filetree/commands.go
@@ -90,6 +90,7 @@ func getDirectoryListingCmd(directoryName string, showHidden, directoriesOnly, f
 				Extension:        filepath.Ext(fileInfo.Name()),
 				IsDirectory:      fileInfo.IsDir(),
 				CurrentDirectory: workingDirectory,
+				FileInfo:         fileInfo,
 			})
 		}
 

diff --git a/filetree/model.go b/filetree/model.go
@@ -1,6 +1,7 @@
 package filetree
 
 import (
+	"os"
 	"time"
 
 	"github.com/charmbracelet/lipgloss"
@@ -15,6 +16,7 @@ type DirectoryItem struct {
 	Extension        string
 	CurrentDirectory string
 	IsDirectory      bool
+	FileInfo         os.FileInfo
 }
 
 type Model struct {

diff --git a/filetree/view.go b/filetree/view.go
@@ -4,6 +4,8 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/lipgloss"
+
+	"github.com/mistakenelf/fm/icons"
 )
 
 func (m Model) View() string {
@@ -24,17 +26,15 @@ func (m Model) View() string {
 		case i == m.Cursor && !m.Disabled:
 			iconColor := m.inactiveItemColor
 			textColor := m.inactiveItemColor
+
 			if i == m.Cursor && !m.Disabled {
 				iconColor = m.selectedItemColor
 				textColor = m.selectedItemColor
 			}
 
 			if m.showIcons {
-				icon := "🗀 "
-				if !file.IsDirectory {
-					icon = "🗎 "
-				}
-				fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(iconColor).Render(icon))
+				icon := icons.Icons.GetIcon(file.FileInfo)
+				fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(iconColor).Render(icon) + " ")
 			}
 
 			fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(textColor).Render(file.Name) + "\n")
@@ -43,11 +43,8 @@ func (m Model) View() string {
 			textColor := m.unselectedItemColor
 
 			if m.showIcons {
-				icon := "🗀 "
-				if !file.IsDirectory {
-					icon = "🗎 "
-				}
-				fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(iconColor).Render(icon))
+				icon := icons.Icons.GetIcon(file.FileInfo)
+				fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(iconColor).Render(icon) + " ")
 			}
 
 			fileList.WriteString(lipgloss.NewStyle().Bold(true).Foreground(textColor).Render(file.Name) + "\n")

diff --git a/icons/directories.go b/icons/directories.go