1
0
Эх сурвалжийг харах

поменял зависимость от ypk на github.com/kpmy/ypk, дружелюбность к go get
добавил многопоточное демо, там будет красивый фиктивный отчет

kpmy 10 жил өмнө
parent
commit
0d55bec986

+ 1 - 0
demo/clean.bat

@@ -0,0 +1 @@
+del *.odf 

+ 37 - 0
demo/report.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/kpmy/ypk/assert"
+	"odf/generators"
+	"odf/mappers"
+	"odf/model"
+	_ "odf/model/stub" // необходимо
+	"odf/xmlns"
+	"os"
+	"runtime"
+	"strconv"
+	"sync"
+)
+
+func do(wg *sync.WaitGroup, suffix string) {
+	assert.For(suffix != "", 20)
+	output, _ := os.OpenFile("test-"+suffix+".odf", os.O_CREATE|os.O_WRONLY, 0666)
+	m := model.ModelFactory()
+	fm := &mappers.Formatter{}
+	fm.ConnectTo(m)
+	fm.MimeType = xmlns.MimeText
+	fm.Init()
+	generators.Generate(m, nil, output, fm.MimeType)
+	assert.For(output.Close() == nil, 20)
+	wg.Done()
+}
+
+func main() {
+	runtime.GOMAXPROCS(4)
+	wg := &sync.WaitGroup{}
+	for i := 0; i < 100; i++ {
+		go do(wg, strconv.Itoa(i))
+		wg.Add(1)
+	}
+	wg.Wait()
+}

+ 2 - 2
generators/gen.go

@@ -4,13 +4,13 @@ import (
 	"archive/zip"
 	"bytes"
 	"encoding/xml"
+	"github.com/kpmy/ypk/assert"
+	"github.com/kpmy/ypk/halt"
 	"io"
 	"odf/model"
 	"odf/xmlns"
 	"odf/xmlns/office"
 	"odf/xmlns/urn"
-	"ypk/assert"
-	"ypk/halt"
 )
 
 type Embeddable interface {

+ 1 - 1
mappers/attr.go

@@ -1,6 +1,7 @@
 package mappers
 
 import (
+	"github.com/kpmy/ypk/halt"
 	"odf/mappers/attr"
 	"odf/model"
 	"odf/xmlns/office"
@@ -8,7 +9,6 @@ import (
 	"odf/xmlns/svg"
 	"odf/xmlns/text"
 	"strconv"
-	"ypk/halt"
 )
 
 type Attr struct {

+ 1 - 1
mappers/attr/base.go

@@ -1,8 +1,8 @@
 package attr
 
 import (
+	"github.com/kpmy/ypk/assert"
 	"odf/model"
-	"ypk/assert"
 )
 
 var New func(name model.LeafName) model.Leaf

+ 1 - 1
mappers/fmt.go

@@ -1,13 +1,13 @@
 package mappers
 
 import (
+	"github.com/kpmy/ypk/assert"
 	"odf/mappers/attr"
 	"odf/model"
 	"odf/xmlns"
 	"odf/xmlns/office"
 	"odf/xmlns/text"
 	"reflect"
-	"ypk/assert"
 )
 
 var New func(name model.LeafName) model.Leaf

+ 1 - 1
model/stub/simple_nodes.go

@@ -2,11 +2,11 @@ package stub
 
 import (
 	"encoding/xml"
+	"github.com/kpmy/ypk/assert"
 	"odf/model"
 	"odf/xmlns"
 	"odf/xmlns/office"
 	"odf/xmlns/urn"
-	"ypk/assert"
 )
 
 type root struct {

+ 2 - 2
model/stub/simple_riders.go

@@ -1,11 +1,11 @@
 package stub
 
 import (
+	"github.com/kpmy/ypk/assert"
+	"github.com/kpmy/ypk/halt"
 	"odf/model"
 	"odf/xmlns"
 	"reflect"
-	"ypk/assert"
-	"ypk/halt"
 )
 
 type sr struct {

+ 1 - 1
model/stub/simple_tree.go

@@ -6,8 +6,8 @@ package stub
 
 import (
 	"encoding/xml"
+	"github.com/kpmy/ypk/assert"
 	"odf/model"
-	"ypk/assert"
 )
 
 type sn struct {

+ 1 - 1
odf_test.go

@@ -1,6 +1,7 @@
 package odf
 
 import (
+	"github.com/kpmy/ypk/assert"
 	"odf/generators"
 	"odf/mappers"
 	"odf/mappers/attr"
@@ -9,7 +10,6 @@ import (
 	"odf/xmlns"
 	"os"
 	"testing"
-	"ypk/assert"
 )
 
 func TestModel(t *testing.T) {