Skip to content

Commit 006901c

Browse files
yorukotyorukot
authored
Merge pull request #394 from kabirgaire0/fix/variable-spell-mistake
fixed spelling mistake : varibale to variable
2 parents 4158b33 + 8b6ced2 commit 006901c

7 files changed

+34
-34
lines changed

Diff for: ‎src/config/fixed_variable.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package varibale
1+
package variable
22

33
import "github.com/adrg/xdg"
44

Diff for: ‎src/internal/config_function.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"github.com/barasher/go-exiftool"
1313
"github.com/charmbracelet/lipgloss"
1414
"github.com/pelletier/go-toml/v2"
15-
varibale "github.com/yorukot/superfile/src/config"
15+
variable "github.com/yorukot/superfile/src/config"
1616
"github.com/yorukot/superfile/src/config/icon"
1717
)
1818

1919
func initialConfig(dir string) (toggleDotFileBool bool, firstFilePanelDir string) {
2020
var err error
2121

22-
logOutput, err = os.OpenFile(varibale.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
22+
logOutput, err = os.OpenFile(variable.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
2323
if err != nil {
2424
log.Fatalf("Error while opening superfile.log file: %v", err)
2525
}
@@ -32,7 +32,7 @@ func initialConfig(dir string) (toggleDotFileBool bool, firstFilePanelDir string
3232

3333
icon.InitIcon(Config.Nerdfont)
3434

35-
toggleDotFileData, err := os.ReadFile(varibale.ToggleDotFile)
35+
toggleDotFileData, err := os.ReadFile(variable.ToggleDotFile)
3636
if err != nil {
3737
outPutLog("Error while reading toggleDotFile data error:", err)
3838
}
@@ -53,12 +53,12 @@ func initialConfig(dir string) (toggleDotFileBool bool, firstFilePanelDir string
5353
if dir != "" {
5454
firstFilePanelDir, err = filepath.Abs(dir)
5555
} else {
56-
Config.DefaultDirectory = strings.Replace(Config.DefaultDirectory, "~", varibale.HomeDir, -1)
56+
Config.DefaultDirectory = strings.Replace(Config.DefaultDirectory, "~", variable.HomeDir, -1)
5757
firstFilePanelDir, err = filepath.Abs(Config.DefaultDirectory)
5858
}
5959

6060
if err != nil {
61-
firstFilePanelDir = varibale.HomeDir
61+
firstFilePanelDir = variable.HomeDir
6262
}
6363

6464
return toggleDotFileBool, firstFilePanelDir
@@ -69,7 +69,7 @@ func loadConfigFile() {
6969
_ = toml.Unmarshal([]byte(ConfigTomlString), &Config)
7070
tempForCheckMissingConfig := ConfigType{}
7171

72-
data, err := os.ReadFile(varibale.ConfigFile)
72+
data, err := os.ReadFile(variable.ConfigFile)
7373
if err != nil {
7474
log.Fatalf("Config file doesn't exist: %v", err)
7575
}
@@ -86,7 +86,7 @@ func loadConfigFile() {
8686
log.Fatalf("Error encoding config: %v", err)
8787
}
8888

89-
err = os.WriteFile(varibale.ConfigFile, tomlData, 0644)
89+
err = os.WriteFile(variable.ConfigFile, tomlData, 0644)
9090
if err != nil {
9191
log.Fatalf("Error writing config file: %v", err)
9292
}
@@ -106,7 +106,7 @@ func loadHotkeysFile() {
106106

107107
_ = toml.Unmarshal([]byte(HotkeysTomlString), &hotkeys)
108108
hotkeysFromConfig := HotkeysType{}
109-
data, err := os.ReadFile(varibale.HotkeysFile)
109+
data, err := os.ReadFile(variable.HotkeysFile)
110110

111111
if err != nil {
112112
log.Fatalf("Config file doesn't exist: %v", err)
@@ -119,7 +119,7 @@ func loadHotkeysFile() {
119119

120120
hasMissingHotkeysInConfig := !reflect.DeepEqual(hotkeys, hotkeysFromConfig)
121121

122-
if hasMissingHotkeysInConfig && !varibale.FixHotkeys {
122+
if hasMissingHotkeysInConfig && !variable.FixHotkeys {
123123
hotKeysConfig := reflect.ValueOf(hotkeysFromConfig)
124124
for i := 0; i < hotKeysConfig.NumField(); i++ {
125125
field := hotKeysConfig.Type().Field(i)
@@ -136,7 +136,7 @@ func loadHotkeysFile() {
136136
fmt.Println("To add missing fields to hotkeys directory automaticially run Superfile with the --fix-hotkeys flag")
137137
}
138138

139-
if hasMissingHotkeysInConfig && varibale.FixHotkeys {
139+
if hasMissingHotkeysInConfig && variable.FixHotkeys {
140140
writeHotkeysFile(hotkeys)
141141
}
142142

@@ -167,14 +167,14 @@ func writeHotkeysFile(hotkeys HotkeysType) {
167167
log.Fatalf("Error encoding hotkeys: %v", err)
168168
}
169169

170-
err = os.WriteFile(varibale.HotkeysFile, tomlData, 0644)
170+
err = os.WriteFile(variable.HotkeysFile, tomlData, 0644)
171171
if err != nil {
172172
log.Fatalf("Error writing hotkeys file: %v", err)
173173
}
174174
}
175175

176176
func loadThemeFile() {
177-
data, err := os.ReadFile(varibale.ThemeFolder + "/" + Config.Theme + ".toml")
177+
data, err := os.ReadFile(variable.ThemeFolder + "/" + Config.Theme + ".toml")
178178
if err != nil {
179179
data = []byte(DefaultThemeString)
180180
}
@@ -205,22 +205,22 @@ func LoadAllDefaultConfig(content embed.FS) {
205205
}
206206
DefaultThemeString = string(temp)
207207

208-
currentThemeVersion, err := os.ReadFile(varibale.ThemeFileVersion)
208+
currentThemeVersion, err := os.ReadFile(variable.ThemeFileVersion)
209209

210210
if err != nil && !os.IsNotExist(err) {
211211
outPutLog("Error reading from file:", err)
212212
return
213213
}
214214

215-
_, err = os.Stat(varibale.ThemeFolder)
215+
_, err = os.Stat(variable.ThemeFolder)
216216

217217
if os.IsNotExist(err) {
218-
err := os.MkdirAll(varibale.ThemeFolder, 0755)
218+
err := os.MkdirAll(variable.ThemeFolder, 0755)
219219
if err != nil {
220220
outPutLog("error create theme direcroty", err)
221221
return
222222
}
223-
} else if string(currentThemeVersion) == varibale.CurrentVersion {
223+
} else if string(currentThemeVersion) == variable.CurrentVersion {
224224
return
225225
}
226226

@@ -240,7 +240,7 @@ func LoadAllDefaultConfig(content embed.FS) {
240240
return
241241
}
242242

243-
file, err := os.Create(filepath.Join(varibale.ThemeFolder, file.Name()))
243+
file, err := os.Create(filepath.Join(variable.ThemeFolder, file.Name()))
244244
if err != nil {
245245
outPutLog("error create theme file from embed", err)
246246
return
@@ -249,5 +249,5 @@ func LoadAllDefaultConfig(content embed.FS) {
249249
defer file.Close()
250250
}
251251

252-
os.WriteFile(varibale.ThemeFileVersion, []byte(varibale.CurrentVersion), 0644)
252+
os.WriteFile(variable.ThemeFileVersion, []byte(variable.CurrentVersion), 0644)
253253
}

Diff for: ‎src/internal/file_operations.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"runtime"
88

99
"github.com/rkoesters/xdg/trash"
10-
varibale "github.com/yorukot/superfile/src/config"
10+
variable "github.com/yorukot/superfile/src/config"
1111
"github.com/yorukot/superfile/src/config/icon"
1212
)
1313

@@ -23,7 +23,7 @@ func moveElement(src, dst string) error {
2323
// Move file to trash can and can auto switch macos trash can or linux trash can
2424
func trashMacOrLinux(src string) error {
2525
if runtime.GOOS == "darwin" {
26-
err := moveElement(src, varibale.HomeDir+"/.Trash/"+filepath.Base(src))
26+
err := moveElement(src, variable.HomeDir+"/.Trash/"+filepath.Base(src))
2727
if err != nil {
2828
outPutLog("Delete single item function move file to trash can error", err)
2929
}
@@ -108,4 +108,4 @@ func pasteDir(src, dst string, id string, m model) (model, error) {
108108
}
109109

110110
return m, nil
111-
}
111+
}

Diff for: ‎src/internal/get_data.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/adrg/xdg"
99
"github.com/shirou/gopsutil/disk"
10-
varibale "github.com/yorukot/superfile/src/config"
10+
variable "github.com/yorukot/superfile/src/config"
1111
"github.com/yorukot/superfile/src/config/icon"
1212
)
1313

@@ -59,7 +59,7 @@ func getPinnedDirectories() []directory {
5959
directories := []directory{}
6060
var paths []string
6161

62-
jsonData, err := os.ReadFile(varibale.PinnedFile)
62+
jsonData, err := os.ReadFile(variable.PinnedFile)
6363
if err != nil {
6464
outPutLog("Read superfile data error", err)
6565
}

Diff for: ‎src/internal/handle_panel_movement.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"runtime"
1010

11-
varibale "github.com/yorukot/superfile/src/config"
11+
variable "github.com/yorukot/superfile/src/config"
1212
)
1313

1414
// Change file panel mode (select mode or browser mode)
@@ -166,7 +166,7 @@ func (m *model) toggleDotFileController() {
166166
newToggleDotFile = "true"
167167
m.toggleDotFile = true
168168
}
169-
err := os.WriteFile(varibale.ToggleDotFile, []byte(newToggleDotFile), 0644)
169+
err := os.WriteFile(variable.ToggleDotFile, []byte(newToggleDotFile), 0644)
170170
if err != nil {
171171
outPutLog("Pinned folder function updatedData superfile data error", err)
172172
}

Diff for: ‎src/internal/handle_panel_navigation.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"os"
66

7-
varibale "github.com/yorukot/superfile/src/config"
7+
variable "github.com/yorukot/superfile/src/config"
88
)
99

1010
// Pinned directory
@@ -13,7 +13,7 @@ func (m *model) pinnedDirectory() {
1313

1414
unPinned := false
1515

16-
jsonData, err := os.ReadFile(varibale.PinnedFile)
16+
jsonData, err := os.ReadFile(variable.PinnedFile)
1717
if err != nil {
1818
outPutLog("Pinned folder function read superfile data error", err)
1919
}
@@ -39,7 +39,7 @@ func (m *model) pinnedDirectory() {
3939
outPutLog("Pinned folder function updatedData superfile data error", err)
4040
}
4141

42-
err = os.WriteFile(varibale.PinnedFile, updatedData, 0644)
42+
err = os.WriteFile(variable.PinnedFile, updatedData, 0644)
4343
if err != nil {
4444
outPutLog("Pinned folder function updatedData superfile data error", err)
4545
}
@@ -54,7 +54,7 @@ func (m *model) createNewFilePanel() {
5454
}
5555

5656
m.fileModel.filePanels = append(m.fileModel.filePanels, filePanel{
57-
location: varibale.HomeDir,
57+
location: variable.HomeDir,
5858
panelMode: browserMode,
5959
focusType: secondFocus,
6060
directoryRecord: make(map[string]directoryRecord),

Diff for: ‎src/internal/model.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/charmbracelet/bubbles/textinput"
1212
tea "github.com/charmbracelet/bubbletea"
1313
"github.com/charmbracelet/lipgloss"
14-
varibale "github.com/yorukot/superfile/src/config"
14+
variable "github.com/yorukot/superfile/src/config"
1515
stringfunction "github.com/yorukot/superfile/src/pkg/string_function"
1616
)
1717

@@ -320,11 +320,11 @@ func (m model) quitSuperfile() {
320320
// cd on quit
321321
if Config.CdOnQuit {
322322
currentDir := m.fileModel.filePanels[m.filePanelFocusIndex].location
323-
if currentDir == varibale.HomeDir {
323+
if currentDir == variable.HomeDir {
324324
return
325325
}
326326
// escape single quote
327327
currentDir = strings.ReplaceAll(currentDir, "'", "'\\''")
328-
os.WriteFile(varibale.SuperFileStateDir+"/lastdir", []byte("cd '"+currentDir+"'"), 0755)
328+
os.WriteFile(variable.SuperFileStateDir+"/lastdir", []byte("cd '"+currentDir+"'"), 0755)
329329
}
330-
}
330+
}

0 commit comments

Comments
 (0)