gravestench
/
OpenDiablo2
mirror of https://github.com/OpenDiablo2/OpenDiablo2
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1098 from willroberts/windows-path-support 

Use filepath instead of path for Windows support
This commit is contained in:
Tim Sarbin 2021-03-24 08:55:20 -04:00 committed by GitHub
parent 6c00b3241f d1c1e8bd26
commit 236a091997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"runtime"
"strings"
@ -201,5 +200,5 @@ func openIgnoreCase(mpqPath string) (*os.File, error) {
}
}
return os.Open(path.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
return os.Open(filepath.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
}

3
d2core/d2config/d2config.go
View File

@ -3,7 +3,6 @@ package d2config
import (
"encoding/json"
"os"
"path"
"path/filepath"
)
@ -24,7 +23,7 @@ type Configuration struct {
// Save saves the configuration object to disk
func (c *Configuration) Save() error {
configDir := path.Dir(c.path)
configDir := filepath.Dir(c.path)
if err := os.MkdirAll(configDir, 0750); err != nil {
return err
}

6
d2core/d2config/default_directories.go
View File

@ -2,7 +2,7 @@ package d2config
import (
"os"
"path"
"path/filepath"
)
const (
@ -13,7 +13,7 @@ const (
// DefaultConfigPath returns the absolute path for the default config file location
func DefaultConfigPath() string {
if configDir, err := os.UserConfigDir(); err == nil {
return path.Join(configDir, od2ConfigDirName, od2ConfigFileName)
return filepath.Join(configDir, od2ConfigDirName, od2ConfigFileName)
}
return LocalConfigPath()
@ -21,5 +21,5 @@ func DefaultConfigPath() string {
// LocalConfigPath returns the absolute path to the directory of the OpenDiablo2 executable
func LocalConfigPath() string {
return path.Join(path.Dir(os.Args[0]), od2ConfigFileName)
return filepath.Join(filepath.Dir(os.Args[0]), od2ConfigFileName)
}

4
d2core/d2config/defaults.go
View File

@ -2,7 +2,7 @@ package d2config
import (
"os/user"
"path"
"path/filepath"
"runtime"
)
@ -47,7 +47,7 @@ func DefaultConfig() *Configuration {
config.MpqPath = "/Applications/Diablo II/"
case "linux":
if usr, err := user.Current(); err == nil {
config.MpqPath = path.Join(usr.HomeDir, ".wine/drive_c/Program Files (x86)/Diablo II")
config.MpqPath = filepath.Join(usr.HomeDir, ".wine", "drive_c", "Program Files (x86)", "Diablo II")
}
}

9
d2core/d2hero/hero_state_factory.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"strconv"
"strings"
@ -82,7 +81,7 @@ func (f *HeroStateFactory) GetAllHeroStates() ([]*HeroState, error) {
continue
}
gameState := f.LoadHeroState(path.Join(basePath, file.Name()))
gameState := f.LoadHeroState(filepath.Join(basePath, file.Name()))
if gameState == nil || gameState.HeroType == d2enum.HeroNone {
} else if gameState.Stats == nil || gameState.Skills == nil {
@ -224,7 +223,7 @@ func (f *HeroStateFactory) getGameBaseSavePath() (string, error) {
return "", err
}
return path.Join(configDir, "OpenDiablo2/Saves"), nil
return filepath.Join(configDir, "OpenDiablo2", "Saves"), nil
}
func (f *HeroStateFactory) getFirstFreeFileName() string {
@ -232,7 +231,7 @@ func (f *HeroStateFactory) getFirstFreeFileName() string {
basePath, _ := f.getGameBaseSavePath()
for {
filePath := path.Join(basePath, strconv.Itoa(i)+".od2")
filePath := filepath.Join(basePath, strconv.Itoa(i)+".od2")
if _, err := os.Stat(filePath); os.IsNotExist(err) {
return filePath
}
@ -246,7 +245,7 @@ func (f *HeroStateFactory) Save(state *HeroState) error {
state.FilePath = f.getFirstFreeFileName()
}
if err := os.MkdirAll(path.Dir(state.FilePath), mkdirPermission); err != nil {
if err := os.MkdirAll(filepath.Dir(state.FilePath), mkdirPermission); err != nil {
return err
}

4
d2game/d2gamescreen/credits.go
View File

@ -3,7 +3,7 @@ package d2gamescreen
import (
"bufio"
"os"
"path"
"path/filepath"
"strings"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
@ -72,7 +72,7 @@ type Credits struct {
// LoadContributors loads the contributors data from file
func (v *Credits) LoadContributors() []string {
file, err := os.Open(path.Join("./", "CONTRIBUTORS"))
file, err := os.Open(filepath.Join(".", "CONTRIBUTORS"))
if err != nil || file == nil {
v.Warning("CONTRIBUTORS file is missing")
return []string{"MISSING CONTRIBUTOR FILES!"}