Skip to content

Improve string and file extension handling: ReplaceAll & filepath.Ext #401

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

Merged
merged 5 commits into from
Jul 3, 2025
Merged

Improve string and file extension handling: ReplaceAll & filepath.Ext #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63219da
fix: Refactor OpenDestination func
Gofastasf Feb 2, 2025
31deeaf
enhance: replace with strings.ReplaceAll
Gofastasf Feb 2, 2025
d5dd40a
enhance: Use filepath.Ext instead of strings.HasSuffix
Gofastasf Feb 2, 2025
c6d8b6b
Merge branch 'jaypipes:main' into update-code
Gofastasf Feb 3, 2025
ee5c5c4
Merge branch 'main' into update-code
jaypipes Jul 3, 2025
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
4 changes: 2 additions & 2 deletions pkg/gpu/gpu_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (i *Info) load() error {
// Building dynamic WHERE clause with addresses to create a single query collecting all desired data
queryAddresses := []string{}
for _, description := range win32VideoControllerDescriptions {
var queryAddres = strings.Replace(description.PNPDeviceID, "\\", `\\`, -1)
var queryAddres = strings.ReplaceAll(description.PNPDeviceID, "\\", `\\`)
queryAddresses = append(queryAddresses, "PNPDeviceID='"+queryAddres+"'")
}
whereClause := strings.Join(queryAddresses[:], " OR ")
Expand Down Expand Up @@ -85,7 +85,7 @@ func (i *Info) load() error {

func GetDevice(id string, entities []win32PnPEntity) *pci.Device {
// Backslashing PnP address ID as requested by JSON and VMI query: https://docs.microsoft.com/en-us/windows/win32/wmisdk/where-clause
var queryAddress = strings.Replace(id, "\\", `\\`, -1)
var queryAddress = strings.ReplaceAll(id, "\\", `\\`)
// Preparing default structure
var device = &pci.Device{
Address: queryAddress,
Expand Down
2 changes: 1 addition & 1 deletion pkg/memory/memory_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func memTotalPhysicalBytesFromSyslog(paths *linuxpath.Paths) int64 {
for _, file := range logFiles {
if strings.HasPrefix(file.Name(), "syslog") {
fullPath := filepath.Join(logDir, file.Name())
unzip := strings.HasSuffix(file.Name(), ".gz")
unzip := filepath.Ext(file.Name()) == ".gz"
var r io.ReadCloser
r, err = os.Open(fullPath)
if err != nil {
Expand Down
Loading