gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-13 03:56:31 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1113 from gucio321/revert-1105-fix_ci

Browse Source 
this broke opening mpq's
This commit is contained in:
gravestench 2021-03-30 09:15:52 -07:00 committed by GitHub
commit 1c0b9a1c9c
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" "bufio"
"errors" "errors"
"fmt" "fmt"
"io/fs"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -182,26 +181,24 @@ func (mpq *MPQ) Size() uint32 {
func openIgnoreCase(mpqPath string) (*os.File, error) { func openIgnoreCase(mpqPath string) (*os.File, error) {
// First see if file exists with specified case // First see if file exists with specified case
mpqFile, err := os.Open(mpqPath) //nolint:gosec // Will fix later mpqFile, err := os.Open(mpqPath) //nolint:gosec // Will fix later
if err != nil { if err == nil {
mpqName := filepath.Base(mpqPath) return mpqFile, err
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
} }
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
} }