gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-02 14:46:28 -05:00
Code Issues Releases Wiki Activity

Revert "Fix golang-ci gocritic error"

Browse Source
This commit is contained in:
gucio321 2021-03-30 18:04:56 +02:00 committed by GitHub
parent c8ef8cf2a4
commit 67eb1cc103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
d2common/d2fileformats/d2mpq/mpq.go
View File

@ -4,7 +4,6 @@ import (
"bufio"
"errors"
"fmt"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
@ -182,26 +181,24 @@ func (mpq *MPQ) Size() uint32 {
func openIgnoreCase(mpqPath string) (*os.File, error) {
// First see if file exists with specified case
mpqFile, err := os.Open(mpqPath) //nolint:gosec // Will fix later
if err != nil {
mpqName := filepath.Base(mpqPath)
mpqDir := filepath.Dir(mpqPath)
var files []fs.FileInfo
files, err = ioutil.ReadDir(mpqDir)
if err != nil {
return nil, err
}
for _, file := range files {
if strings.EqualFold(file.Name(), mpqName) {
mpqName = file.Name()
break
}
}
return os.Open(filepath.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
if err == nil {
return mpqFile, err
}
return mpqFile, err
mpqName := filepath.Base(mpqPath)
mpqDir := filepath.Dir(mpqPath)
files, err := ioutil.ReadDir(mpqDir)
if err != nil {
return nil, err
}
for _, file := range files {
if strings.EqualFold(file.Name(), mpqName) {
mpqName = file.Name()
break
}
}
return os.Open(filepath.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
}