FIX: wrong usage message

Author: Jack Tang

cmd/tusc.go

@@ -1,26 +1,27 @@
 package main
 
 import (
-  "github.com/jackhftang/tusc/internal"
-  "github.com/jackhftang/tusc/internal/util"
-  "os"
+	"github.com/jackhftang/tusc/internal/client"
+	"github.com/jackhftang/tusc/internal/server"
+	"github.com/jackhftang/tusc/internal/util"
+	"os"
 )
 
 const usage = `Usage:
   tusc (server|s) [options]
-  tusc (client|c) <file> [<url>] [options]
+  tusc (client|c) <url> <file> [options]
   tusc --help`
 
 func main() {
-  if len(os.Args) < 2 {
-    util.ExitWithMessages("No command", usage)
-  }
-  switch cmd := os.Args[1]; cmd {
-  case "server", "s":
-    internal.Server()
-  case "client", "c":
-    internal.Client()
-  default:
-    util.ExitWithMessages("Unknown command: "+cmd, usage)
-  }
+	if len(os.Args) < 2 {
+		util.ExitWithMessages("No command", usage)
+	}
+	switch cmd := os.Args[1]; cmd {
+	case "server", "s":
+		server.Server()
+	case "client", "c":
+		client.Client()
+	default:
+		util.ExitWithMessages("Unknown command: "+cmd, usage)
+	}
 }

internal/client.go

@@ -0,0 +1,90 @@
+package client
+
+import (
+	"fmt"
+	"github.com/docopt/docopt-go"
+	"github.com/eventials/go-tus"
+	"github.com/eventials/go-tus/leveldbstore"
+	"github.com/jackhftang/tusc/internal/util"
+	"net/http"
+	"os"
+)
+
+const clientUsage = `tusc client
+
+Usage:
+  tusc (client|c) <url> <file> [options]
+  tusc (client|c) --help
+
+Options:
+  -r --resumable            Save meta data for resumable uploads  
+  --store PATH              Path to save meta data for resume [default: ./.tusc]
+  --chuck-size BYTE         Size of chucks of file [default: 2097152]
+  --override-patch-method   Sending a POST request instead of PATCH [default: false]
+`
+
+type ClientConf struct {
+	file   string
+	url    string
+	resume bool
+}
+
+func Client() {
+	var err error
+
+	var conf ClientConf
+	arguments, _ := docopt.ParseDoc(clientUsage)
+	conf.file, _ = arguments.String("<file>")
+	conf.url, _ = arguments.String("<url>")
+	conf.resume = util.GetBool(arguments, "--resumable")
+
+	// open file
+	f, err := os.Open(conf.file)
+	if err != nil {
+		util.ExitWithMessages("Cannot open file: " + conf.file)
+	}
+	defer f.Close()
+
+	// create the tus client
+	var store tus.Store
+	if conf.resume {
+		path := util.GetString(arguments, "--store")
+		store, err = leveldbstore.NewLeveldbStore(path)
+		if err != nil {
+			util.ExitWithMessages("Cannot Open "+path, clientUsage)
+		}
+	}
+
+	client, _ := tus.NewClient(conf.url, &tus.Config{
+		ChunkSize:           util.GetInt64(arguments, "--chuck-size"),
+		OverridePatchMethod: util.GetBool(arguments, "--override-patch-method"),
+		Resume:              conf.resume,
+		Store:               store,
+		Header:              make(http.Header),
+		HttpClient:          nil,
+	})
+
+	// create an upload from a file.
+	var upload *tus.Upload
+	if upload, err = tus.NewUploadFromFile(f); err != nil {
+		util.ExitWithMessages("Cannot create upload from file: " + f.Name())
+	}
+
+	// create the uploader.
+	var uploader *tus.Uploader
+	if conf.resume {
+		uploader, err = client.CreateOrResumeUpload(upload)
+	} else {
+		uploader, err = client.CreateUpload(upload)
+	}
+	if err != nil {
+		util.ExitWithMessages("Failed to upload", err.Error())
+	}
+
+	fmt.Println(uploader.Url())
+
+	// start the uploading process.
+	if err = uploader.Upload(); err != nil {
+		util.ExitWithMessages("Upload incomplete", err.Error())
+	}
+}

internal/client/client.go

@@ -1,4 +1,4 @@
-package internal
+package server
 
 import (
 	"fmt"