Merge pull request #2 from earthcube/master

Cruft removal

.github/workflows/release_nabu.yml

@@ -0,0 +1,34 @@
+name: Release Nabu binaries
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  releases-matrix:
+    name: Release Go Binary
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # build and publish in parallel: linux/amd64
+  #      goos: [linux, windows, darwin]
+   #     goarch: [amd64,arm]
+        goos: [linux]
+        goarch: [amd64]
+        exclude:
+          - goarch: "386"
+            goos: darwin
+    steps:
+      - uses: actions/checkout@v2
+ #     - name: Run tests
+ #       run: go test -v -p=1 -timeout=0 ./...
+      - uses: wangyoucao577/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          goos: ${{ matrix.goos }}
+          goarch: ${{ matrix.goarch }}
+          project_path: "./cmd/nabu"
+          binary_name: "nabu"
+          ldflags: "-s -w"
+          extra_files: README.md
+ #         extra_files: LICENSE README.md

cmd/nabu/main.go

@@ -79,8 +79,7 @@ func main() {
 	case "prefix":
 		fmt.Println("Load graphs from prefix to triplestore")
 		err = flows.ObjectAssembly(v1, mc)
-<<<<<<< HEAD
-=======
+
 		if err != nil {
 			log.Println(err)
 		}
@@ -95,14 +94,7 @@ func main() {
 	case "tika":
 		fmt.Println("Tika extract text from objects")
 		err = tika.SingleBuild(v1, mc)
->>>>>>> multiprefix
-		if err != nil {
-			log.Println(err)
-		}
 
-	case "prune":
-		fmt.Println("Prune graphs in triplestore not in object store")
-		err = prune.Snip(v1, mc)
 		if err != nil {
 			log.Println(err)
 		}
@@ -116,25 +108,14 @@ func main() {
 		}
 		log.Println(string(s))
 
-<<<<<<< HEAD
-	case "tika":
-		fmt.Println("Tika extract text from objects")
-		err = tika.SingleBuild(v1, mc)
-		if err != nil {
-			log.Println(err)
-		}
-
 	case "txtai":
 		fmt.Println("Index descriptions to txtai")
 		err = semsearch.ObjectAssembly(v1, mc)
 		if err != nil {
 			log.Println(err)
 		}
 
-    }
-=======
 	}
->>>>>>> multiprefix
 
 }
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gosuri/uiprogress v0.0.1
 	github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042
 	github.com/minio/minio-go v6.0.14+incompatible
-	github.com/minio/minio-go/v7 v7.0.10 // indirect
+	github.com/minio/minio-go/v7 v7.0.10
 	github.com/neuml/txtai.go v1.0.0
 	github.com/piprate/json-gold v0.3.0
 	github.com/schollz/progressbar v1.0.0

internal/prune/prune.go

@@ -20,7 +20,6 @@ import (
 
 //Snip removes graphs in TS not in object store
 func Snip(v1 *viper.Viper, mc *minio.Client) error {
-<<<<<<< HEAD
 
 	var pa []string
 	err := v1.UnmarshalKey("objects.prefix", &pa)
@@ -111,54 +110,7 @@ func graphList(v1 *viper.Viper, mc *minio.Client, prefix string) ([]string, erro
 		log.Println("response Status:", resp.Status)
 		log.Println("response Headers:", resp.Header)
 		log.Println("response Body:", string(body))
-=======
 
-	var pa []string
-	err := v1.UnmarshalKey("objects.prefix", &pa)
-	if err != nil {
-		log.Println(err)
-	}
-
-	fmt.Println(pa)
-
-	for p := range pa {
-
-		// do the object assembly
-		oa, err := ObjectList(v1, mc, pa[p])
-		if err != nil {
-			log.Println(err)
-			return err
-		}
-
-		// collect all the graphs from triple store
-		ga, err := graphList(v1, mc, pa[p])
-		if err != nil {
-			log.Println(err)
-			return err
-		}
-
-		objs := v1.GetStringMapString("objects")
-		// convert the object names to the URN pattern used in the graph
-		for x := range oa {
-			s := strings.TrimSuffix(oa[x], ".rdf")
-			s2 := strings.Replace(s, "/", ":", -1)
-			g := fmt.Sprintf("urn:%s:%s", objs["bucket"], s2)
-			oa[x] = g
-		}
-
-		//compare lists..   anything IN graph not in objects list should be removed
-		d := difference(ga, oa) // return array of items in ga that are NOT in oa
-
-		fmt.Printf("Graph items: %d  Object items: %d  difference: %d\n", len(ga), len(oa), len(d))
-
-		// For each in d will delete that graph
-		bar := progressbar.Default(int64(len(d)))
-		for x := range d {
-			log.Printf("Remove graph: %s\n", d[x])
-			flows.Drop(v1, d[x])
-			bar.Add(1)
-		}
->>>>>>> multiprefix
 	}
 
 	//fmt.Println("response Body:", string(body))
@@ -174,11 +126,8 @@ func graphList(v1 *viper.Viper, mc *minio.Client, prefix string) ([]string, erro
 	return ga, nil
 }
 
-<<<<<<< HEAD
 func graphListStatements(v1 *viper.Viper, mc *minio.Client, prefix string) ([]string, error) {
-=======
-func graphList(v1 *viper.Viper, mc *minio.Client, prefix string) ([]string, error) {
->>>>>>> multiprefix
+
 	ga := []string{}
 
 	spql := v1.GetStringMapString("sparql")

internal/triplestore/loadGraph.go

@@ -2,10 +2,10 @@ package triplestore
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/UFOKN/nabu/internal/graph"
 	"github.com/UFOKN/nabu/internal/objects"
-
 	"github.com/gosuri/uiprogress"
 	"github.com/minio/minio-go/v7"
 )
@@ -51,17 +51,14 @@ func DEPRECATEDLoadGraph(mc *minio.Client, srcbckt string, sue string) error {
 		}
 		// fmt.Println(nq)
 
-<<<<<<< HEAD:internal/triplestore/loadGraph.go
 		// BUG FIX HACK
 		// I typo-ed schema.org/AdditonalType as schema.org/AdditionType
 		// here I could do a simple find and replace to resolve that.   Then remove
 		// later when I hide my shame (it's been fixed in VaultWalker FYI)
 		nqhacked := strings.ReplaceAll(nq, "additionType", "additionalType")
 
 		_, err = BlazeUpdateNQ([]byte(nqhacked), sue) // TODO  add the above graph string to target a database on jena
-=======
-		_, err = triplestore.BlazeUpdateNQ([]byte(nq), sue) // TODO  add the above graph string to target a database on jena
->>>>>>> multiprefix:internal/flows/loadGraph.go
+
 		// _, err = triplestore.JenaUpdateNQ([]byte(nqhacked), sue) // TODO  add the above graph string to target a database on jena
 
 		if err != nil {