From ceb28081d65574ff44630a349d8adc39dd7e9191 Mon Sep 17 00:00:00 2001
From: bel <bel@bel.bel>
Date: Sun, 5 Nov 2023 09:33:28 -0700
Subject: [PATCH] change NewFileTree arg from url to path

---
 replicator/driver.go        | 7 ++++++-
 replicator/filetree.go      | 9 ++-------
 replicator/filetree_test.go | 7 +------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/replicator/driver.go b/replicator/driver.go
index 1c6e3e2..fbb3ebe 100644
--- a/replicator/driver.go
+++ b/replicator/driver.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"path"
 )
 
 type (
@@ -28,7 +29,11 @@ type (
 func NewDriver(ctx context.Context, driver url.URL) (Driver, error) {
 	switch driver.Scheme {
 	case "filetree":
-		return NewFileTree(driver)
+		p := driver.Path
+		if driver.Host != "" {
+			p = path.Join(driver.Host, p)
+		}
+		return NewFileTree(p)
 	default:
 		return nil, fmt.Errorf("unknown driver spec %s", driver.String())
 	}
diff --git a/replicator/filetree.go b/replicator/filetree.go
index 4fa34b2..91230b2 100644
--- a/replicator/filetree.go
+++ b/replicator/filetree.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"io/fs"
 	"io/ioutil"
-	"net/url"
 	"os"
 	"path"
 	"path/filepath"
@@ -17,12 +16,8 @@ import (
 
 type FileTree string
 
-func NewFileTree(spec url.URL) (FileTree, error) {
-	p := spec.Path
-	if spec.Host != "" {
-		p = path.Join(spec.Host, p)
-	}
-	return FileTree(p), nil
+func NewFileTree(root string) (FileTree, error) {
+	return FileTree(root), nil
 }
 
 func (tree FileTree) Keys(ctx context.Context) (chan Key, *error) {
diff --git a/replicator/filetree_test.go b/replicator/filetree_test.go
index a8bb9f8..dd16853 100644
--- a/replicator/filetree_test.go
+++ b/replicator/filetree_test.go
@@ -1,17 +1,12 @@
 package replicator
 
 import (
-	"net/url"
 	"testing"
 )
 
 func TestFileTree(t *testing.T) {
 	d := t.TempDir()
-	u, err := url.Parse("filetree:///" + d)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tree, err := NewFileTree(*u)
+	tree, err := NewFileTree(d)
 	if err != nil {
 		t.Fatal(err)
 	}