Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(shell): add case insensitivity to filecontent method #4306

Closed
wants to merge 6 commits into from
Closed

feat(shell): add case insensitivity to filecontent method #4306

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66fa77c
feat(shell): add case insensitivity to filecontent method
warrenbuckley Oct 2, 2023
42f6f5f
Merge branch 'main' into filecontent-case-insensitvity
warrenbuckley Oct 10, 2023
c76a773
Merge branch 'main' into filecontent-case-insensitvity
warrenbuckley Oct 11, 2023
825eec8
Merge branch 'main' into filecontent-case-insensitvity
warrenbuckley Oct 12, 2023
84fd83e
Merge branch 'main' into filecontent-case-insensitvity
warrenbuckley Oct 13, 2023
eb14769
Merge branch 'main' into filecontent-case-insensitvity
warrenbuckley Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/platform/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,32 @@ func (env *Shell) FileContent(file string) string {
if !filepath.IsAbs(file) {
file = filepath.Join(env.Pwd(), file)
}
content, err := os.ReadFile(file)

// Get all files in the directory of the file
globOfFilesInDir := filepath.Join(filepath.Dir(file), "*")
matches, err := filepath.Glob(globOfFilesInDir)
if err != nil {
env.Error(err)
return ""
}
fileContent := string(content)
env.Debug(fileContent)
return fileContent

// For each file found in the directory of the file we want to read its contents
for _, match := range matches {
// Do a case insensitive comparison of the file name to find the file we want
if strings.EqualFold(filepath.Base(match), filepath.Base(file)) {
content, err := os.ReadFile(match)
if err != nil {
env.Error(err)
return ""
}
fileContent := string(content)
env.Debug(fileContent)
return fileContent
}
}

env.Debug("File not found")
return ""
}

func (env *Shell) LsDir(path string) []fs.DirEntry {
Expand Down