rename the pack.js to <UUID>.json when injecting

.gitignore

@@ -4,3 +4,5 @@
 *.json
 *.dungeondraft_*
 *.log
+vendor/
+gui/

cmd/dungeondraft-pack/dungeondraft-pack.go

@@ -8,8 +8,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/ryex/dungeondraft-gopackager/pkg/pack"
 	log "github.com/sirupsen/logrus"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/pkg/pack"
 )
 
 const usageText = `Desc:
@@ -66,6 +66,10 @@ func main() {
 
 	log.SetOutput(os.Stdout)
 
+	log.SetFormatter(&log.TextFormatter{
+		ForceColors: true,
+	})
+
 	// Only log the warning severity or above.
 	log.SetLevel(log.WarnLevel)
 	if debug {

cmd/dungeondraft-unpack/dungeondraft-unpack.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/ryex/dungeondraft-gopackager/pkg/unpack"
 	log "github.com/sirupsen/logrus"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/pkg/unpack"
 )
 
 const usageText = `Desc:
@@ -54,6 +54,9 @@ func main() {
 	packName := strings.TrimSuffix(packFileName, filepath.Ext(packFileName))
 
 	log.SetOutput(os.Stdout)
+	log.SetFormatter(&log.TextFormatter{
+		ForceColors: true,
+	})
 
 	// Only log the warning severity or above.
 	log.SetLevel(log.WarnLevel)

go.mod

@@ -1,5 +1,7 @@
-module gitlab.com/ryexandrite/dungeondraft-gopackager
+module github.com/ryex/dungeondraft-gopackager
 
 go 1.14
 
-require github.com/sirupsen/logrus v1.6.0
+require (
+	github.com/sirupsen/logrus v1.6.0
+)

internal/structures/structures.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"io/ioutil"
 
+	"github.com/ryex/dungeondraft-gopackager/internal/utils"
 	"github.com/sirupsen/logrus"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/internal/utils"
 )
 
 // PackageHeadersBytes is a struct used for reading and writing the encoded package headers

pkg/pack/pack.go

@@ -3,16 +3,17 @@ package pack
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/ryex/dungeondraft-gopackager/internal/structures"
+	"github.com/ryex/dungeondraft-gopackager/internal/utils"
 	"github.com/sirupsen/logrus"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/internal/structures"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/internal/utils"
 )
 
 // Packer packs up a folder into a dungeodraft_pack file
@@ -174,7 +175,7 @@ func (p *Packer) BuildFileList() (err error) {
 
 	packJSONPath := filepath.Join(p.path, `pack.json`)
 
-	packJSONRelPath, err := filepath.Rel(p.path, packJSONPath)
+	packJSONRelPath, err := filepath.Rel(p.path, filepath.Join(p.path, fmt.Sprintf(`%s.json`, p.id)))
 	if err != nil {
 		p.log.Error("can not get path relative to package root")
 		return err

pkg/unpack/unpack.go

@@ -11,9 +11,9 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/ryex/dungeondraft-gopackager/internal/structures"
+	"github.com/ryex/dungeondraft-gopackager/internal/utils"
 	"github.com/sirupsen/logrus"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/internal/structures"
-	"gitlab.com/ryexandrite/dungeondraft-gopackager/internal/utils"
 )
 
 // Unpacker unpacks dungeondraft_pack files in the pck arcive format