Update README.md

Improved/Fixed CSV formatting issues

.gitlab-ci.yml

@@ -0,0 +1,9 @@
+stages:
+  - test
+
+test:
+  stage: test
+  image: golang:1.15.3
+  script:
+    - go test
+

README.md

@@ -1,9 +1,12 @@
 # NMSlib
 
+**master Branch** : ![](https://gitlab.com/bradley.richins/nmslib/badges/master/pipeline.svg)
+
+**develop Branch** : ![](https://gitlab.com/bradley.richins/nmslib/badges/develop/pipeline.svg)
+
 NMSlib is a GoLang package for dealing with converting Galactic coordinates to Portal codes and vice versa.
 
-NMSlib also translates known Korvax words to English and back.
-   - Gek, Vykeen, etc will be added in the future
+NMSlib also translates in game languages to english.
 
 ## Installation
 
@@ -37,8 +40,9 @@ func main() {
 	
     nmslib.CreateBanner(portalcode, "NewLennon.png", 0)
 	
-    fmt.Println(nmslib.Korvax2Eng("eapoluch"))
-    fmt.Println(nmslib.Eng2Korvax("emergency"))
+    fmt.Println(Translate{"KIHTYOMOLES"}.Kor2Eng())
+    korvax := Translate{"Contraband"}
+    fmt.Println(korvax.Eng2Kor())
 }
 
 ```
@@ -63,7 +67,7 @@ nmslib.CreateBanner("006afa556c30", "NewLennon.png", 0)
 
 ### Converting Portal code to Galactic address with P2gc()
 
-This function only takes 1 parameter and returns a string
+This function only takes 1 parameter and returns a string and error
 
 * portalcode: 12 char hex string of portal glyphs
 
@@ -80,7 +84,7 @@ Output:
 
 ### Converting Galactic coordinates to Portal codes with Gc2p()
 
-This function only takes 1 parameter and returns a string
+This function only takes 1 parameter and returns a string and error
 
 * galacticaddress: 16 char 4 block hex address
 
@@ -95,21 +99,30 @@ Output:
 
 ``006AFA556C30``
 
-### Translate Korvax to English with Korvax2Eng()
+## Translate Words
+
+Supported languages
+
+- Korvax
+- Gek
+- Vy'keen
+- Atlas
+
+### Translate Atlas to English with Atl2Eng()
 
 This function takes only 1 parameter and returns a string
 
-* korvaxword: Any known Korvaxen word (ex. eapoluch)
+* Word: Any known Atlas word (ex. Paka)
 
 **Example:**
 
 ```golang
-fmt.Println(Korvax2Eng("eapoluch"))
+fmt.Println(Translate{"Paka"}.Atl2Eng())
 ```
 
 Output:
 
-``emergency``
+``Awake``
 
 ### Translate English to Korvax with Eng2Korvax()
 
@@ -120,12 +133,32 @@ This function takes only 1 parameter and returns a string
 **Example:**
 
 ```golang
-fmt.Println(Eng2Korvax("emergency"))
+korvax := Translate{"Contraband"}
+fmt.Println(korvax.Eng2Kor())
 ```
 
 Output:
 
-``eapoluch``
+``Zelidovoso``
+
+
+### Language commands
+
+Gek:
+- ``Translate{word}.Gek2Eng()``
+- ``Translate{word}.Eng2Gek()``
+
+Korvax:
+- ``Translate{word}.Kor2Eng()``
+- ``Translate{word}.Eng2Kor()``
+
+Vy'keen:
+- ``Translate{word}.Vyk2Eng()``
+- ``Translate{word}.Eng2Vyk()``
+
+Atlas:
+- ``Translate{word}.Atl2Eng()``
+- ``Translate{word}.Eng2Atl()``
 
 ## License
 [MIT](COPYING)

convert.go

@@ -70,22 +70,23 @@ func P2gc(p string) (gc string, err error) {
 
 /*
 Gc2p - Galactic coordinates to portal code
-Requires 1 string and returns a string and error
+Requires 1 string and 1 int returns a string and error
 	var gc string
 		Galactic address (ex. 042F:0079:0D55:006A)
+	var p int
+		Planet ID [1-6]
 	Return var string
 		Portal Glyph hex string 12 chars in len (ex. 006afa556c30)
 */
-func Gc2p(gc string) (portalcode string, err error) {
-	if err != nil {
-		panic(err)
-	}
-
-	/*TODO: add option for Planet choice (1-6)*/
+func Gc2p(gc string, p int) (portalcode string, err error) {
 	// split and store string
 	// coords[0] == X; coords[1] == Y coords[2] == Z;
 	// coords[3] == SSI coords[4] == P
-	coords := strings.Split(gc+":1", ":")
+	if p > 6 {
+		p = 1
+	}
+	nustring := fmt.Sprintf("%s:%d", gc, p)
+	coords := strings.Split(nustring, ":")
 	for n := 0; n < len(coords); n++ {
 		portalcode = portalcode + coords[n]
 	}

glyphbanner.go

@@ -7,6 +7,8 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/nfnt/resize"
+
 	gim "github.com/ozankasikci/go-image-merge"
 )
 
@@ -24,6 +26,8 @@ func CreateBanner(portalhex string, savename string, vopt int) {
 	var err error
 	var GlyphHex [12]int64
 	var glyphImg [12]string
+	var vert int
+	var horz int
 
 	// Setup temp dir
 	tempdir, err := ioutil.TempDir("", "nmslib-")
@@ -71,25 +75,27 @@ func CreateBanner(portalhex string, savename string, vopt int) {
 		{ImageFilePath: tempdir + "/" + glyphImg[8]}, {ImageFilePath: tempdir + "/" + glyphImg[9]},
 		{ImageFilePath: tempdir + "/" + glyphImg[10]}, {ImageFilePath: tempdir + "/" + glyphImg[11]},
 	}
-	if vopt == 1 {
-		// Merge images horizontally
-		rgba, err := gim.New(grids, 1, 12).Merge()
-		if err != nil {
-			panic(err)
-		}
-		// save the output to png
-		fmt.Printf("Saving %s to %s in vertical format\n", portalhex, savename)
-		file, err := os.Create(savename)
-		err = png.Encode(file, rgba)
-	} else {
-		// Merge images vertically
-		rgba, err := gim.New(grids, 12, 1).Merge()
-		if err != nil {
-			panic(err)
-		}
-		// save the output to png
-		fmt.Printf("Saving %s to %s\n", portalhex, savename)
-		file, err := os.Create(savename)
-		err = png.Encode(file, rgba)
+
+	if vopt == 1 { // set vertical rendering
+		vert, horz = 1, 12
+	} else { // set horizontal rendering (default)
+		vert, horz = 12, 1
+	}
+
+	// create new image from grids
+	rgba, err := gim.New(grids, vert, horz).Merge()
+	if err != nil {
+		panic(err)
+	}
+
+	// Resize banner 768x64
+	nuimg := resize.Resize(768, 64, rgba, resize.Lanczos3)
+
+	// save the output to png
+	fmt.Printf("Saving %s to %s\n", portalhex, savename)
+	file, err := os.Create(savename)
+	err = png.Encode(file, nuimg)
+	if err != nil {
+		fmt.Println(err)
 	}
 }

go.mod

@@ -2,4 +2,7 @@ module gitlab.com/bradley.richins/nmslib
 
 go 1.15
 
-require github.com/ozankasikci/go-image-merge v0.2.2
+require (
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
+	github.com/ozankasikci/go-image-merge v0.2.2
+)

go.sum

@@ -1,2 +1,4 @@
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/ozankasikci/go-image-merge v0.2.2 h1:K370BLLTIsamwjAeViiPntf7GiG3h9pXzDmxXCbN8/0=
 github.com/ozankasikci/go-image-merge v0.2.2/go.mod h1:NQ2aN0b21buFx3p+5x4dZrKuPSLh2uBukK7F30BrYTo=

lang.go

@@ -8,90 +8,184 @@ import (
 	"strings"
 )
 
-// KorvaxWord - set up structure of a word iteration
-type korvaxWord struct {
-	english   string
-	korvax    string
-	kwcaps    string
-	kwallcaps string
+/*
+Translate words
+*/
+type Translate struct {
+	word string
+}
+
+// trans - set up structure of a word iteration
+type trans0 struct {
+	english string // english word
+	word    string // no caps word
+	capword string // Capitalized word
+	acpword string // ALL CAPITALIZED WORD
 }
 
 /*
-Korvax2Eng - Translate a Korvax word to English
+Kor2Eng translate korvax word to english word
 */
-func Korvax2Eng(kvwrd string) string {
+func (t Translate) Kor2Eng() (returnstring string) {
+	csvlines := openCSV("korvax-lang.csv")
+	for range csvlines {
+		returnstring = (toEng(t, csvlines))
+	}
+	return
+}
+
+/*
+Eng2Kor translate english word to korvax word
+*/
+func (t Translate) Eng2Kor() (returnstring string) {
+	csvlines := openCSV("korvax-lang.csv")
+	for range csvlines {
+		returnstring = (toNMS(t, csvlines))
+	}
+	return
+}
+
+/*
+Gek2Eng translate Gek word to english word
+*/
+func (t Translate) Gek2Eng() (returnstring string) {
+	csvlines := openCSV("gek-lang.csv")
+	for range csvlines {
+		returnstring = (toEng(t, csvlines))
+	}
+	return
+}
+
+/*
+Eng2Gek translate english word to Gek word
+*/
+func (t Translate) Eng2Gek() (returnstring string) {
+	csvlines := openCSV("gek-lang.csv")
+	for range csvlines {
+		returnstring = (toNMS(t, csvlines))
+	}
+	return
+}
+
+/*
+Vyk2Eng translate vykeen word to english word
+*/
+func (t Translate) Vyk2Eng() (returnstring string) {
+	csvlines := openCSV("vykeen-lang.csv")
+	for range csvlines {
+		returnstring = (toEng(t, csvlines))
+	}
+	return
+}
+
+/*
+Eng2Vyk translate english word to vykeen word
+*/
+func (t Translate) Eng2Vyk() (returnstring string) {
+	csvlines := openCSV("vykeen-lang.csv")
+	for range csvlines {
+		returnstring = (toNMS(t, csvlines))
+	}
+	return
+}
+
+/*
+Atl2Eng translate Atlas word to english word
+*/
+func (t Translate) Atl2Eng() (returnstring string) {
+	csvlines := openCSV("atlas-lang.csv")
+	for range csvlines {
+		returnstring = (toEng(t, csvlines))
+	}
+	return
+}
+
+/*
+Eng2Atl translate english word to Atlas word
+*/
+func (t Translate) Eng2Atl() (returnstring string) {
+	csvlines := openCSV("atlas-lang.csv")
+	for range csvlines {
+		returnstring = (toNMS(t, csvlines))
+	}
+	return
+}
+
+func toEng(t Translate, csvlines [][]string) string {
+	returnstring := "*\\Kzzzzzzt\\*" // word not found default
+	for _, line := range csvlines {
+		lang := trans0{
+			english: strings.ToLower(line[0]),
+			word:    strings.ToLower(line[1]),
+			capword: strings.ToLower(line[2]),
+			acpword: strings.ToLower(line[3]),
+		}
+		// check translate struct for value
+		if strings.ToLower(t.word) == lang.word {
+			returnstring = lang.english
+		} else if strings.ToLower(t.word) == lang.capword {
+			returnstring = strings.Title(strings.ToLower(lang.english))
+		} else if strings.ToLower(t.word) == lang.acpword {
+			returnstring = strings.ToUpper(lang.english)
+		}
+	}
+	return returnstring
+}
+
+func toNMS(t Translate, csvlines [][]string) string {
+	returnstring := "*\\Kzzzzzzt\\*" // word not found default
+	for _, line := range csvlines {
+		lang := trans0{
+			english: line[0],
+			word:    line[1],
+			capword: line[2],
+			acpword: line[3],
+		}
+		if t.word == lang.english {
+			if lang.word != "" {
+				returnstring = lang.word
+			}
+		}
+		if t.word == strings.Title(strings.ToLower(lang.english)) {
+			if lang.capword != "" {
+				returnstring = strings.Title(strings.ToLower(lang.capword))
+			}
+		}
+		if t.word == strings.ToUpper(lang.english) {
+			if lang.acpword != "" {
+				returnstring = strings.ToUpper(lang.acpword)
+			}
+		}
+	}
+	return returnstring
+}
+
+func openCSV(lagcsv string) [][]string {
+	// create temp dir
 	tempdir, err := ioutil.TempDir("", "nmslib-")
 	if err != nil {
 		panic(err)
 	}
-	defer os.RemoveAll(tempdir)
+	defer os.RemoveAll(tempdir) // Clean up temp files
 
-	data, err := Asset("korvax-lang.csv")
+	// extract language file from resources.go
+	data, err := Asset(lagcsv)
 	if err != nil {
 		panic(err)
 	}
-	err = ioutil.WriteFile(tempdir+"/korvax-lang.csv", []byte(data), 0644)
-	csvFile, err := os.Open(tempdir + "/korvax-lang.csv")
+
+	// wirte extracted data to temp dir
+	err = ioutil.WriteFile(tempdir+"/"+lagcsv, []byte(data), 0644)
+	csvFile, err := os.Open(tempdir + "/" + lagcsv)
 	if err != nil {
 		fmt.Println(err)
 	}
-	defer csvFile.Close()
+	defer csvFile.Close() // close language file when finished
+
+	// read csv file from memory
 	csvlines, err := csv.NewReader(csvFile).ReadAll()
 	if err != nil {
 		fmt.Println(err)
 	}
-	for _, line := range csvlines {
-		klang := korvaxWord{
-			english:   line[0],
-			korvax:    line[1],
-			kwcaps:    line[2],
-			kwallcaps: line[3],
-		}
-		if kvwrd == klang.korvax {
-			return klang.english
-		} else if kvwrd == klang.korvax {
-			return strings.Title(strings.ToLower(klang.english))
-		} else if kvwrd == klang.kwallcaps {
-			return strings.ToUpper(klang.english)
-		}
-	}
-	return "*\\Kzzzzzzt\\*" // word not found default
-}
-
-/*
-Eng2Korvax - Convert (some) english words to Korvax
-*/
-func Eng2Korvax(enwrd string) string {
-	tempdir, err := ioutil.TempDir("", "nmslib")
-	if err != nil {
-		panic(err)
-	}
-	defer os.RemoveAll(tempdir)
-
-	data, err := Asset("korvax-lang.csv")
-	if err != nil {
-		panic(err)
-	}
-	err = ioutil.WriteFile(tempdir+"/korvax-lang.csv", []byte(data), 0644)
-	csvFile, err := os.Open(tempdir + "/korvax-lang.csv")
-	if err != nil {
-		fmt.Println(err)
-	}
-	defer csvFile.Close()
-	csvlines, err := csv.NewReader(csvFile).ReadAll()
-	if err != nil {
-		fmt.Println(err)
-	}
-	for _, line := range csvlines {
-		klang := korvaxWord{
-			english:   line[0],
-			korvax:    line[1],
-			kwcaps:    line[2],
-			kwallcaps: line[3],
-		}
-		if enwrd == klang.english {
-			return klang.korvax
-		}
-	}
-	return "*\\Kzzzzzzt\\*" // word not found default
+	return csvlines
 }

nmslib_test.go

@@ -15,64 +15,70 @@ func TestPortal2Galactic(t *testing.T) {
 	} else {
 		fmt.Printf("Testing P2gc(\"006afa556c30\"): got: %q, want: %q.\n", want, "042F:0079:0D55:006A")
 	}
+
+	want, err = P2gc("41EDF9554C2F")
+	if err != nil {
+		panic(err)
+	}
+	if want != "042E:0078:0D53:01ED" {
+		t.Errorf("Testing P2gc(\"41EDF9554C2F\"): got %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	} else {
+		fmt.Printf("Testing P2gc(\"41EDF9554C2F\"): got: %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	}
 }
 
 func TestGalactic2portal(t *testing.T) {
-	want, err := Gc2p("042F:0079:0D55:006A")
+	want, err := Gc2p("042F:0079:0D55:006A", 1)
 	if err != nil {
 		panic(err)
 	}
 	if want != "106AFA556C30" {
-		t.Errorf("Testing Gc2p(\"042F:0079:0D55:006A\"): got %q, want: %q.\n", want, "106AFA556C30")
+		t.Errorf("\nTesting Gc2p(\"042F:0079:0D55:006A\"): got %q, want: %q.\n", want, "106AFA556C30")
 	} else {
-		fmt.Printf("Testing Gc2p(\"042F:0079:0D55:006A\"): got: %q, want: %q.\n", want, "106AFA556C30")
+		fmt.Printf("\nTesting Gc2p(\"042F:0079:0D55:006A\"): got: %q, want: %q.\n", want, "106AFA556C30")
 	}
 
-	want, err = Gc2p("044B:0081:0D68:0096")
+	want, err = Gc2p("042E:0078:0D53:01ED", 4)
 	if err != nil {
 		panic(err)
 	}
-	if want != "109602569C4C" {
-		t.Errorf("Testing Gc2p(\"044B:0081:0D68:0096\"): got %q, want: %q.\n", want, "109602569C4C")
+	if want != "41EDF9554C2F" {
+		t.Errorf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got %q, want: %q.\n", want, "41EDF9554C2F")
 	} else {
-		fmt.Printf("Testing Gc2p(\"044B:0081:0D68:0096\"): got: %q, want: %q.\n", want, "109602569C4C")
+		fmt.Printf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got: %q, want: %q.\n", want, "41EDF9554C2F")
 	}
 }
 
 func TestCreateBanner(t *testing.T) {
-	fmt.Printf("Testing CreateBanner: ")
+	fmt.Printf("\nTesting CreateBanner: ")
 	CreateBanner("006afa556c30", "/tmp/Test.png", 0)
 }
 
-func TestKorvax2Eng(t *testing.T) {
-	want := Korvax2Eng("eapoluch")
-	if want != "emergency" {
-		t.Errorf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+func TestTranslate(t *testing.T) {
+	want := Translate{"Paka"}
+	if want.Atl2Eng() != "Awake" {
+		t.Errorf("\nTesting Translate{\"Paka\"}.Atl2Eng(): got %q, want: %q.\n", want.Atl2Eng(), "Awake")
 	} else {
-		fmt.Printf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+		fmt.Printf("\nTesting Translate{\"Paka\"}.Atl2Eng(): got %q, want: %q.\n", want.Atl2Eng(), "Awake")
+	}
+	want = Translate{"hofsos"}
+	if want.Gek2Eng() != "answer" {
+		t.Errorf("Testing Translate{\"hofsos\"}.Gek2Eng(): got %q, want: %q.\n", want.Gek2Eng(), "answer")
+	} else {
+		fmt.Printf("Testing Translate{\"hofsos\"}.Gek2Eng(): got %q, want: %q.\n", want.Gek2Eng(), "answer")
 	}
 
-	want = Korvax2Eng("notaword")
-	if want != "*\\Kzzzzzzt\\*" {
-		t.Errorf("Testing Korvax2eng(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
+	want = Translate{"Aqo"}
+	if want.Vyk2Eng() != "Foes" {
+		t.Errorf("Testing Translate{\"Aqo\"}.Vyk2Eng(): got %q, want: %q.\n", want.Vyk2Eng(), "Foes")
 	} else {
-		fmt.Printf("Testing Korvax2eng(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
+		fmt.Printf("Testing Translate{\"Aqo\"}.Vyk2Eng(): got %q, want: %q.\n", want.Vyk2Eng(), "Foes")
 	}
-}
-
-func TestEng2Korvax(t *testing.T) {
-	want := Eng2Korvax("emergency")
-	if want != "eapoluch" {
-		t.Errorf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
-	} else {
-		fmt.Printf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
-	}
-
-	want = Eng2Korvax("notaword")
-	if want != "*\\Kzzzzzzt\\*" {
-		t.Errorf("Testing Eng2Korvax(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
-	} else {
-		fmt.Printf("Testing Eng2Korvax(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
-	}
-	fmt.Printf("Testing: ")
+	want = Translate{"Alinichel"}
+	if want.Kor2Eng() != "Emergency" {
+		t.Errorf("Testing Translate{\"Alinichel\"}.Kor2Eng(): got %q, want: %q.\n", want.Kor2Eng(), "Emergency")
+	} else {
+		fmt.Printf("Testing Translate{\"Alinichel\"}.Kor2Eng(): got %q, want: %q.\n", want.Kor2Eng(), "Emergency")
+	}
+	fmt.Printf("\nTesting complete.\nStatus: ")
 }