From 28a40983ad839f51b1decffe9c2039f283e55a77 Mon Sep 17 00:00:00 2001 From: lord Date: Wed, 9 Sep 2020 05:22:13 -0700 Subject: [PATCH] move logger into d2util (#720) * moved logger into d2util * resolved upstream conflict --- d2common/d2loader/loader.go | 5 +++-- d2common/{ => d2util}/logger.go | 2 +- d2common/{ => d2util}/logger_test.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename d2common/{ => d2util}/logger.go (99%) rename d2common/{ => d2util}/logger_test.go (99%) diff --git a/d2common/d2loader/loader.go b/d2common/d2loader/loader.go index 52191830..042b59de 100644 --- a/d2common/d2loader/loader.go +++ b/d2common/d2loader/loader.go @@ -3,16 +3,17 @@ package d2loader import ( "errors" "fmt" + "os" "path/filepath" - "github.com/OpenDiablo2/OpenDiablo2/d2common" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2cache" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset/types" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/filesystem" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/mpq" + "github.com/OpenDiablo2/OpenDiablo2/d2common/d2util" ) const ( @@ -33,7 +34,7 @@ func NewLoader() *Loader { // that have been added type Loader struct { d2interface.Cache - *d2common.Logger + *d2util.Logger sources []asset.Source } diff --git a/d2common/logger.go b/d2common/d2util/logger.go similarity index 99% rename from d2common/logger.go rename to d2common/d2util/logger.go index 1d21f2fc..47cf0209 100644 --- a/d2common/logger.go +++ b/d2common/d2util/logger.go @@ -1,4 +1,4 @@ -package d2common +package d2util import ( "fmt" diff --git a/d2common/logger_test.go b/d2common/d2util/logger_test.go similarity index 99% rename from d2common/logger_test.go rename to d2common/d2util/logger_test.go index b205dd0c..8af9d97b 100644 --- a/d2common/logger_test.go +++ b/d2common/d2util/logger_test.go @@ -1,4 +1,4 @@ -package d2common +package d2util import ( "fmt"