Basic file uploader implemetation. Does not wait for replication to finish.
diff --git a/client/client.go b/client/client.go
index 8c90a36..7a98d79 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,21 +1,41 @@
package client
-import "os"
+import (
+ "context"
+ "os"
-import "pcloud/api"
+ "pcloud/api"
+ "pcloud/chunk"
+)
type FileUploader struct {
- client api.MetadataStorageServerClient
+ client api.MetadataStorageClient
}
-func NewFileUploader(client api.MetadataStorageServerClient) *FileUploader {
- return FileUploader{client}
+func NewFileUploader(client api.MetadataStorageClient) *FileUploader {
+ return &FileUploader{client}
}
-func (fu *FileUploader) Upload(f *os.File) (n int64, err error) {
-
- buf := make([]byte, 1000)
- for {
- n, err := f.Read(buf)
+func (fu *FileUploader) Upload(f *os.File) {
+ info, err := f.Stat()
+ if err != nil {
+ return
}
+ resp, err := fu.client.CreateBlob(
+ context.Background(), &api.CreateBlobRequest{
+ SizeBytes: int32(info.Size()),
+ NumReplicas: 1})
+ if len(resp.Chunk) != 1 {
+ panic(resp)
+ }
+ if err != nil {
+ panic(err)
+ }
+ primaryListener := chunk.NewNonChangingPrimaryReplicaChangeListener(
+ resp.Chunk[0].ChunkId,
+ resp.Chunk[0].Server[0])
+ chunk.WriteToPrimary(
+ context.Background(),
+ chunk.NewReadOnlyFileChunk(f, 0, int(info.Size())),
+ primaryListener)
}
diff --git a/client/client_test.go b/client/client_test.go
new file mode 100644
index 0000000..21443d4
--- /dev/null
+++ b/client/client_test.go
@@ -0,0 +1,37 @@
+package client
+
+import (
+ "os"
+ "testing"
+
+ "google.golang.org/grpc"
+
+ "pcloud/api"
+ pt "pcloud/testing"
+)
+
+func TestUploadSmallFile(t *testing.T) {
+ env, err := pt.NewInMemoryEnv(1)
+ if err != nil {
+ t.Error(err)
+ }
+ defer env.Stop()
+
+ var opts []grpc.DialOption
+ opts = append(opts, grpc.WithInsecure())
+ opts = append(opts, grpc.WithBlock())
+ conn, err := grpc.Dial("unix:///tmp/pcloud/master", opts...)
+ if err != nil {
+ t.Error(err)
+ }
+ defer conn.Close()
+ client := api.NewMetadataStorageClient(conn)
+
+ uploader := NewFileUploader(client)
+ f, err := os.Open("testdata/foo")
+ if err != nil {
+ t.Error(err)
+ }
+ uploader.Upload(f)
+
+}
diff --git a/client/testdata/foo b/client/testdata/foo
new file mode 100644
index 0000000..257cc56
--- /dev/null
+++ b/client/testdata/foo
@@ -0,0 +1 @@
+foo