small refactoring

wdfs/chain.go → dav_ipfs/chain.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"github.com/ipfs/go-ipfs-api"

wdfs/files.go → dav_ipfs/files.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"encoding/xml"

wdfs/filesys.go → dav_ipfs/filesys.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"fmt"

wdfs/locations.go → dav_ipfs/locations.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"encoding/xml"

wdfs/locksys.go → dav_ipfs/locksys.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"fmt"

wdfs/projection/fs_sys.go → dav_ipfs/projection/fs_sys.go

@@ -1,9 +1,9 @@
-package projection //import "github.com/kpmy/mipfs/wdfs/projection"
+package projection //import "github.com/kpmy/mipfs/dav_ipfs/projection"
 
 import (
 	"fmt"
+	"github.com/kpmy/mipfs/dav_ipfs"
 	"github.com/kpmy/mipfs/ipfs_api"
-	"github.com/kpmy/mipfs/wdfs"
 	"github.com/streamrail/concurrent-map"
 	"golang.org/x/net/webdav"
 	"io"
@@ -259,8 +259,8 @@ func NewPS(get func() string, set func(string), active bool) (fs webdav.FileSyst
 			pr.root = hash
 			set(hash)
 		}
-		xs := wdfs.NewFS(pr.get, pr.set)
-		ls = wdfs.NewLS(xs)
+		xs := dav_ipfs.NewFS(pr.get, pr.set)
+		ls = dav_ipfs.NewLS(xs)
 		pr.inner = xs
 
 		pr.cache = cmap.New()
@@ -270,8 +270,8 @@ func NewPS(get func() string, set func(string), active bool) (fs webdav.FileSyst
 
 		fs = pr
 	} else {
-		xs := wdfs.NewFS(get, set)
-		ls = wdfs.NewLS(xs)
+		xs := dav_ipfs.NewFS(get, set)
+		ls = dav_ipfs.NewLS(xs)
 		fs = xs
 	}
 	return

wdfs/projection/simple_chain.go → dav_ipfs/projection/simple_chain.go

@@ -1,4 +1,4 @@
-package projection
+package projection //import "github.com/kpmy/mipfs/dav_ipfs/projection"
 
 import "strings"
 

wdfs/props.go → dav_ipfs/props.go

@@ -1,4 +1,4 @@
-package wdfs
+package dav_ipfs
 
 import (
 	"bytes"

dav_multiuser_cmd/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/abbot/go-http-auth"
+	"github.com/kpmy/mipfs/dav_ipfs"
 	"github.com/kpmy/mipfs/ipfs_api"
-	"github.com/kpmy/mipfs/wdfs"
 	. "github.com/kpmy/ypk/tc"
 	"github.com/peterbourgon/diskv"
 	"github.com/tv42/zbase32"
@@ -35,7 +35,7 @@ func main() {
 
 	log.Println("ipfs api at", ipfs_api.Addr)
 	if _, err := ipfs_api.Shell().ID(); err == nil {
-		Assert(ipfs_api.Shell().Pin(wdfs.EmptyDirHash) == nil && ipfs_api.Shell().Pin(wdfs.EmptyFileHash) == nil, 40)
+		Assert(ipfs_api.Shell().Pin(dav_ipfs.EmptyDirHash) == nil && ipfs_api.Shell().Pin(dav_ipfs.EmptyFileHash) == nil, 40)
 	} else {
 		log.Fatal(err)
 	}

dav_multiuser_cmd/userfs.go

@@ -4,9 +4,9 @@ import (
 	"bufio"
 	"bytes"
 	"github.com/abbot/go-http-auth"
+	"github.com/kpmy/mipfs/dav_ipfs"
+	"github.com/kpmy/mipfs/dav_ipfs/projection"
 	"github.com/kpmy/mipfs/ipfs_api"
-	"github.com/kpmy/mipfs/wdfs"
-	"github.com/kpmy/mipfs/wdfs/projection"
 	. "github.com/kpmy/ypk/tc"
 	"github.com/streamrail/concurrent-map"
 	"github.com/tv42/zbase32"
@@ -35,7 +35,7 @@ type pin struct {
 	pin  bool
 }
 
-var importantHash map[string]string = map[string]string{wdfs.EmptyDirHash: "empty unixfs dir", wdfs.EmptyFileHash: "empty unixfs file"}
+var importantHash map[string]string = map[string]string{dav_ipfs.EmptyDirHash: "empty unixfs dir", dav_ipfs.EmptyFileHash: "empty unixfs file"}
 
 func writeRoot(ch chan string, user string) {
 	pinCh := make(chan pin, 1024)
@@ -96,20 +96,20 @@ func handler() http.Handler {
 			rootWr := make(chan string, 1024)
 			go writeRoot(rootWr, user)
 
-			defaultRoot := wdfs.EmptyDirHash
+			defaultRoot := dav_ipfs.EmptyDirHash
 			if r, err := KV.Read(user + ".root"); err == nil && len(r) > 0 {
 				defaultRoot = string(r)
 				found := make(chan string)
 				go func() {
 					if _, err := ipfs_api.Shell().BlockGet(defaultRoot); err != nil {
-						defaultRoot = wdfs.EmptyDirHash
+						defaultRoot = dav_ipfs.EmptyDirHash
 					}
 					found <- defaultRoot
 				}()
 				select {
 				case <-found:
 				case <-time.After(10 * time.Second):
-					defaultRoot = wdfs.EmptyDirHash
+					defaultRoot = dav_ipfs.EmptyDirHash
 				}
 			} else {
 				KV.Write(user+".root", []byte(defaultRoot))

ip2p_test/link_test.go

@@ -0,0 +1,28 @@
+package ip2p_test
+
+import (
+	"context"
+	"fmt"
+	"github.com/ipfs/go-ipfs-util"
+	"github.com/ipfs/go-libp2p-peer"
+	"github.com/ipfs/go-libp2p-peerstore"
+	"github.com/jbenet/go-multiaddr"
+	"log"
+	"testing"
+	"time"
+
+	"net"
+)
+
+func TestLink(t *testing.T) {
+	addr, _ := multiaddr.NewMultiaddr("/ip4/0.0.0.0/tcp/7001")
+	ps := peerstore.NewPeerstore()
+	id := peer.ID(util.Hash([]byte(fmt.Sprint(time.Now().UnixNano()))))
+	ctx := context.Background()
+	sw, _ := swarm.NewNetwork(ctx, []multiaddr.Multiaddr{addr}, id, ps, nil)
+	h := basichost.New(sw)
+	h.SetStreamHandler("/echo/0.0.1", func(s net.Stream) {
+		log.Println("new stream")
+	})
+	time.Sleep(1 * time.Second)
+}