Use new logger
This commit is contained in:
@@ -2,35 +2,14 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
logger "git.site.quack-lab.dev/dave/cylogger"
|
||||
)
|
||||
|
||||
var Error *log.Logger
|
||||
var Warning *log.Logger
|
||||
|
||||
func init() {
|
||||
log.SetFlags(log.Ldate | log.Lshortfile)
|
||||
logFile, err := os.Create("main.log")
|
||||
if err != nil {
|
||||
log.Printf("Error creating log file: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
logger := io.MultiWriter(os.Stdout, logFile)
|
||||
log.SetOutput(logger)
|
||||
|
||||
Error = log.New(io.MultiWriter(logFile, os.Stderr, os.Stdout),
|
||||
fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
|
||||
log.Ldate|log.Lshortfile)
|
||||
Warning = log.New(io.MultiWriter(logFile, os.Stdout),
|
||||
fmt.Sprintf("%sWarning:%s ", "\033[0;93m", "\033[0m"),
|
||||
log.Ldate|log.Lshortfile)
|
||||
}
|
||||
|
||||
var steamWorkshopContentDir = `C:/Users/Administrator/Seafile/Projects-Go/GoProjects/steamcmd-api/steamcmd/steamapps/workshop/content/445220`
|
||||
var avorionRoaming = `C:/Users/Administrator/AppData/Roaming/Avorion`
|
||||
|
||||
@@ -38,7 +17,7 @@ func main() {
|
||||
steamWorkshopContentDir, _ = filepath.Abs(steamWorkshopContentDir)
|
||||
files, err := os.ReadDir(steamWorkshopContentDir)
|
||||
if err != nil {
|
||||
Error.Printf("Error reading steam workshop content dir: %v", err)
|
||||
logger.Error("Error reading steam workshop content dir: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -57,14 +36,14 @@ func main() {
|
||||
fileHandle, err := os.Open(modFile)
|
||||
if err != nil {
|
||||
if !os.IsNotExist(err) {
|
||||
Error.Printf("Error opening mod file '%s': '%v'", modFile, err)
|
||||
logger.Error("Error opening mod file '%s': '%v'", modFile, err)
|
||||
return
|
||||
} else {
|
||||
log.Printf("Mod '%s' is a ship!", src)
|
||||
logger.Info("Mod '%s' is a ship!", src)
|
||||
dst := filepath.Join(avorionRoaming, "ships", "workshop", file.Name())
|
||||
err2 := Copy(src, dst)
|
||||
if err2 != nil {
|
||||
Error.Printf("Error copying '%s' to '%s': '%v'", src, dst, err2)
|
||||
logger.Error("Error copying '%s' to '%s': '%v'", src, dst, err2)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -77,35 +56,35 @@ func main() {
|
||||
turretFileDst := filepath.Join(avorionRoaming, "ships", "turrets", file.Name()+".turret.xml")
|
||||
|
||||
if FileExists(shipFileSrc) && !FileExists(shipFileDst) {
|
||||
log.Printf("Copying '%s' to '%s'", shipFileSrc, shipFileDst)
|
||||
logger.Info("Copying '%s' to '%s'", shipFileSrc, shipFileDst)
|
||||
err := Copy(shipFileSrc, shipFileDst)
|
||||
if err != nil {
|
||||
Error.Printf("Error copying '%s' to '%s': '%v'", shipFileSrc, shipFileDst, err)
|
||||
logger.Error("Error copying '%s' to '%s': '%v'", shipFileSrc, shipFileDst, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if FileExists(planFileSrc) && !FileExists(planFileDst) {
|
||||
log.Printf("Copying '%s' to '%s'", planFileSrc, planFileDst)
|
||||
logger.Info("Copying '%s' to '%s'", planFileSrc, planFileDst)
|
||||
err := Copy(planFileSrc, planFileDst)
|
||||
if err != nil {
|
||||
Error.Printf("Error copying '%s' to '%s': '%v'", planFileSrc, planFileDst, err)
|
||||
logger.Error("Error copying '%s' to '%s': '%v'", planFileSrc, planFileDst, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if FileExists(turretFileSrc) && !FileExists(turretFileDst) {
|
||||
log.Printf("Copying '%s' to '%s'", turretFileSrc, turretFileDst)
|
||||
logger.Info("Copying '%s' to '%s'", turretFileSrc, turretFileDst)
|
||||
err := Copy(turretFileSrc, turretFileDst)
|
||||
if err != nil {
|
||||
Error.Printf("Error copying '%s' to '%s': '%v'", turretFileSrc, turretFileDst, err)
|
||||
logger.Error("Error copying '%s' to '%s': '%v'", turretFileSrc, turretFileDst, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if err == nil {
|
||||
log.Printf("'%s' is a mod, not a ship, skipping", src)
|
||||
logger.Info("'%s' is a mod, not a ship, skipping", src)
|
||||
fileHandle.Close()
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user