Release 0.2.0 (#2)

* enpass move to separate module
* gopassstore in separate module

.github/workflows/go.yml

@@ -31,7 +31,7 @@ jobs:
         uses: goreleaser/[email protected]
         with:
           version: latest
-          args: release --clean
+          args: release --clean --skip-validate
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
           GOPATH: /home/runner/go

.gitignore

@@ -1,2 +1,3 @@
 /enpass2gopass
 /.vscode
+app

attachment.go → enpass/attachment.go

@@ -1,9 +1,11 @@
-package main
+package enpass
 
 import (
 	"encoding/base64"
 	"net/http"
 	"strings"
+
+	"github.com/revengel/enpass2gopass/utils"
 )
 
 // Attachment -
@@ -83,7 +85,7 @@ func (a Attachment) GetName() string {
 
 // GetLabelName -
 func (a Attachment) GetLabelName() string {
-	return transliterate(a.Name)
+	return utils.Transliterate(a.Name)
 }
 
 // GetNameOriginal -

data.go → enpass/data.go

@@ -1,10 +1,12 @@
-package main
+package enpass
 
 import (
 	"encoding/json"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/revengel/enpass2gopass/utils"
 )
 
 // Data -
@@ -23,13 +25,13 @@ type FolderItem struct {
 func (d Data) GetFoldersMap() FoldersMap {
 	out := make(map[string]string)
 	for _, folder := range d.Folders {
-		out[folder.UUID] = transliterate(folder.Title)
+		out[folder.UUID] = utils.Transliterate(folder.Title)
 	}
 	return out
 }
 
-// loadind data from json file
-func loadData(dataPath string) (d Data, err error) {
+// LoadData - loadind data from json file
+func LoadData(dataPath string) (d Data, err error) {
 	absPath, err := filepath.Abs(dataPath)
 	if err != nil {
 		return

field.go → enpass/field.go

@@ -1,4 +1,6 @@
-package main
+package enpass
+
+import "github.com/revengel/enpass2gopass/utils"
 
 // Field -
 type Field struct {
@@ -41,7 +43,7 @@ func (f Field) CheckTypes(in []string) bool {
 
 // GetLabel -
 func (f Field) GetLabel() string {
-	return transliterate(f.Label)
+	return utils.Transliterate(f.Label)
 }
 
 // GetValue -

folder.go → enpass/folder.go

@@ -1,4 +1,4 @@
-package main
+package enpass
 
 // FoldersMap -
 type FoldersMap map[string]string
@@ -14,8 +14,8 @@ func (f FoldersMap) GetFolder(id string) string {
 // GetFolders -
 func (f FoldersMap) GetFolders(ids []string) (out []string) {
 	for _, id := range ids {
-		if f := f.GetFolder(id); id != "" {
-			out = append(out, f)
+		if fv := f.GetFolder(id); id != "" && fv != "" {
+			out = append(out, fv)
 		}
 	}
 	return out

item.go → enpass/item.go

@@ -1,8 +1,10 @@
-package main
+package enpass
 
 import (
 	"fmt"
 	"strings"
+
+	"github.com/revengel/enpass2gopass/utils"
 )
 
 // DataItem -
@@ -44,7 +46,7 @@ func (i DataItem) GetCategory() string {
 
 // GetCategoryPath -
 func (i DataItem) GetCategoryPath() string {
-	return transliterate(i.Category)
+	return utils.Transliterate(i.Category)
 }
 
 // GetTitle -
@@ -54,7 +56,7 @@ func (i DataItem) GetTitle() string {
 
 // GetTitlePath -
 func (i DataItem) GetTitlePath() string {
-	return transliterate(i.Title)
+	return utils.Transliterate(i.Title)
 }
 
 // GetSubtitle -
@@ -68,19 +70,19 @@ func (i DataItem) GetNote() string {
 }
 
 // GetFolders -
-func (i DataItem) GetFolders() []string {
+func (i DataItem) GetFolders(foldersMap FoldersMap) []string {
 	return foldersMap.GetFolders(i.Folders)
 }
 
 // GetFirstFolder -
-func (i DataItem) GetFirstFolder() string {
-	if fs := i.GetFolders(); len(fs) > 0 {
+func (i DataItem) GetFirstFolder(foldersMap FoldersMap) string {
+	if fs := i.GetFolders(foldersMap); len(fs) > 0 {
 		return fs[0]
 	}
 	return ""
 }
 
 // GetFoldersStr -
-func (i DataItem) GetFoldersStr() string {
-	return fmt.Sprintf("[%s]", strings.Join(i.GetFolders(), ", "))
+func (i DataItem) GetFoldersStr(foldersMap FoldersMap) string {
+	return fmt.Sprintf("[%s]", strings.Join(i.GetFolders(foldersMap), ", "))
 }

go.mod

@@ -1,4 +1,4 @@
-module enpass2gopass
+module github.com/revengel/enpass2gopass
 
 go 1.20