From 39a136dc508d3a4c7ec8f1e480d847a707e8d816 Mon Sep 17 00:00:00 2001
From: netbenix <netbenix@codenoodles.de>
Date: Sat, 27 Aug 2022 19:08:57 +0200
Subject: [PATCH] fix(Compile): Fixed error "<module> is not in GOROOT"

---
 Commands/SearchCommand.go       |  2 +-
 ProtoHandler/PackageMetadata.go | 45 ++++++++++++++++++---------------
 ProtoHandler/ProtoWrapper.go    | 11 ++++----
 go.mod                          |  7 +++--
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/Commands/SearchCommand.go b/Commands/SearchCommand.go
index 253a244..1597495 100644
--- a/Commands/SearchCommand.go
+++ b/Commands/SearchCommand.go
@@ -3,8 +3,8 @@ package Commands
 import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v2"
+	proto "lotus-pm.net/proto"
 	"lpm-cli/Lotus"
-	proto "lpm-cli/Proto/lpm/go"
 	"lpm-cli/ProtoHandler"
 	"os"
 )
diff --git a/ProtoHandler/PackageMetadata.go b/ProtoHandler/PackageMetadata.go
index 4dc901e..8648b73 100644
--- a/ProtoHandler/PackageMetadata.go
+++ b/ProtoHandler/PackageMetadata.go
@@ -1,34 +1,33 @@
 package ProtoHandler
 
 import (
+	proto "lotus-pm.net/proto"
 	"lpm-cli/Lotus"
-	proto "lpm-cli/Proto/lpm/go"
 )
 
-type Package struct{
+type Package struct {
 	PackageMetadata PackageMetadata
-	Register Lotus.Registry
+	Register        Lotus.Registry
 }
 
 type PackageMetadata struct {
-	Publisher string
-	Name string
-	Version string
-	Description string
-	Tags []string
-	Labels map[string]string
-	PackageSize uint64
-	Checksums Checksums
-	Platform string
+	Publisher    string
+	Name         string
+	Version      string
+	Description  string
+	Tags         []string
+	Labels       map[string]string
+	PackageSize  uint64
+	Checksums    Checksums
+	Platform     string
 	Architecture string
 	Dependencies []Dependency
 }
 
-
 func fillDependencies(protoDependency []*proto.Dependency) []Dependency {
 	dependencies := make([]Dependency, len(protoDependency))
 
-	for i, dep := range protoDependency{
+	for i, dep := range protoDependency {
 		dependencies[i].ID = dep.GetId()
 		dependencies[i].VersionFilter = dep.GetVersionFilter()
 	}
@@ -39,12 +38,16 @@ func fillDependencies(protoDependency []*proto.Dependency) []Dependency {
 func fillChecksums(checksum []*proto.Checksum) Checksums {
 	checksums := Checksums{}
 
-	for i, chk := range checksum{
-		switch checksum[i].Algorithm{
-			case 0: checksums.MD5 = chk.Checksum
-			case 1: checksums.SHA1 = chk.Checksum
-			case 2: checksums.SHA256 = chk.Checksum
-			case 3: checksums.SHA512 = chk.Checksum
+	for i, chk := range checksum {
+		switch checksum[i].Algorithm {
+		case 0:
+			checksums.MD5 = chk.Checksum
+		case 1:
+			checksums.SHA1 = chk.Checksum
+		case 2:
+			checksums.SHA256 = chk.Checksum
+		case 3:
+			checksums.SHA512 = chk.Checksum
 		}
 	}
 
@@ -63,4 +66,4 @@ func (pkgMeta *PackageMetadata) FillMetadata(protoData *proto.PackageMetadata) {
 	pkgMeta.Platform = protoData.Platform
 	pkgMeta.Architecture = protoData.Architecture
 	pkgMeta.Dependencies = fillDependencies(protoData.GetDependencies())
-}
\ No newline at end of file
+}
diff --git a/ProtoHandler/ProtoWrapper.go b/ProtoHandler/ProtoWrapper.go
index 1096025..659fd62 100644
--- a/ProtoHandler/ProtoWrapper.go
+++ b/ProtoHandler/ProtoWrapper.go
@@ -3,8 +3,8 @@ package ProtoHandler
 import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
+	proto "lotus-pm.net/proto"
 	"lpm-cli/Lotus"
-	proto "lpm-cli/Proto/lpm/go"
 	"time"
 )
 
@@ -22,25 +22,24 @@ func (protoWrap ProtoWrapper) CreateConnection(address string) *grpc.ClientConn
 
 func (protoWrap ProtoWrapper) CreateRegistryClient(conn *grpc.ClientConn) (proto.LpmRegistryClient, context.Context, context.CancelFunc) {
 	lrc := proto.NewLpmRegistryClient(conn)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second * 10)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 
 	return lrc, ctx, cancel
 }
 
-
 func (protoWrap ProtoWrapper) ParsePackages(res *proto.SearchResponse, reg Lotus.Registry) []Package {
 	var packages []Package
 	for _, pkg := range res.GetPackages() {
 		var tmpMeta PackageMetadata
 		tmpMeta.FillMetadata(pkg)
-		packages = append(packages, Package {
+		packages = append(packages, Package{
 			PackageMetadata: tmpMeta,
 			Register: Lotus.Registry{
 				Register: reg.Register,
-				Address: reg.Address,
+				Address:  reg.Address,
 			},
 		})
 	}
 
 	return packages
-}
\ No newline at end of file
+}
diff --git a/go.mod b/go.mod
index 14d27dc..82dbee6 100644
--- a/go.mod
+++ b/go.mod
@@ -2,22 +2,25 @@ module lpm-cli
 
 go 1.19
 
+replace lotus-pm.net/proto => ./proto/lpm/go
+
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/sirupsen/logrus v1.8.1
 	github.com/urfave/cli/v2 v2.3.0
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
 	google.golang.org/grpc v1.42.0
-	google.golang.org/protobuf v1.27.1
+	lotus-pm.net/proto v0.0.0-00010101000000-000000000000
 )
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
 	golang.org/x/text v0.3.0 // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 )