games/factorio-server-manager
games/factorio-server-manager
1
0
Fork 0
mirror of https://github.com/OpenFactorioServerManager/factorio-server-manager.git synced 2025-01-10 04:19:38 +02:00
Code Issues Releases Activity

switched from path to filepath for files

Browse Source
This commit is contained in:
knoxfighter 2019-03-22 00:49:43 +01:00
parent 27a5f62560
commit dbcaba7231
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/handlers.go
View File

@ -63,7 +63,7 @@ func DLSave(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
save := vars["save"] save := vars["save"]
saveName := path.Join(config.FactorioSavesDir, save) saveName := filepath.Join(config.FactorioSavesDir, save)
w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", save)) w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", save))
log.Printf("%s downloading: %s", r.Host, saveName) log.Printf("%s downloading: %s", r.Host, saveName)

5
src/mod_modInfo.go
View File

@ -9,7 +9,6 @@ import (
"lockfile" "lockfile"
"log" "log"
"os" "os"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
) )
@ -134,7 +133,7 @@ func (modInfoList *ModInfoList) deleteMod(modName string) error {
//search for mod, that should be deleted //search for mod, that should be deleted
for _, mod := range modInfoList.Mods { for _, mod := range modInfoList.Mods {
if mod.Name == modName { if mod.Name == modName {
filePath := path.Join(modInfoList.Destination, mod.FileName) filePath := filepath.Join(modInfoList.Destination, mod.FileName)
fileLock.LockW(filePath) fileLock.LockW(filePath)
//delete mod //delete mod
@ -195,7 +194,7 @@ func (modInfoList *ModInfoList) createMod(modName string, fileName string, modFi
var err error var err error
//save uploaded file //save uploaded file
filePath := path.Join(modInfoList.Destination, fileName) filePath := filepath.Join(modInfoList.Destination, fileName)
newFile, err := os.Create(filePath) newFile, err := os.Create(filePath)
if err != nil { if err != nil {
log.Printf("error on creating new file - %s: %s", fileName, err) log.Printf("error on creating new file - %s: %s", fileName, err)

2
src/mods.go
View File

@ -276,7 +276,7 @@ func modStartUp() {
} }
newJson, _ := json.Marshal(modSimpleList) newJson, _ := json.Marshal(modSimpleList)
err = ioutil.WriteFile(modSimpleList.Destination+"/mod-list.json", newJson, 0664) err = ioutil.WriteFile(filepath.Join(modSimpleList.Destination,"mod-list.json"), newJson, 0664)
if err != nil { if err != nil {
log.Printf("error when writing new mod-list: %s", err) log.Printf("error when writing new mod-list: %s", err)
return err return err

6
src/vendor/lockfile/lockfile.go vendored
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"log" "log"
"os" "os"
"path" "path/filepath"
"sync" "sync"
"time" "time"
) )
@ -30,7 +30,7 @@ func NewLock() FileLock {
} }
func makeAbsolutePath(target string) string { func makeAbsolutePath(target string) string {
if path.IsAbs(target) { if filepath.IsAbs(target) {
return target return target
} }
@ -40,7 +40,7 @@ func makeAbsolutePath(target string) string {
return "" return ""
} }
return path.Join(wd, target) return filepath.Join(wd, target)
} }
func (fl *FileLock) Lock(filePath string) error { func (fl *FileLock) Lock(filePath string) error {