UPT: working listing page

Author: Jack Tang

Makefile

@@ -9,6 +9,9 @@ all: get
 get:
 	go get
 
+build:
+	go build cmd/tusc.go
+
 clean:
 	rm -rf tusc*
 

cmd/tusc.go

@@ -2,6 +2,7 @@ package main
 
 import (
   "github.com/jackhftang/tusc/internal"
+  "github.com/jackhftang/tusc/internal/util"
   "os"
 )
 
@@ -12,14 +13,14 @@ const usage = `Usage:
 
 func main() {
   if len(os.Args) < 2 {
-    internal.ExitWithMessages("No command", usage)
+    util.ExitWithMessages("No command", usage)
   }
   switch cmd := os.Args[1]; cmd {
   case "server", "s":
-    //internal.Server()
+    internal.Server()
   case "client", "c":
-    //internal.Client()
+    internal.Client()
   default:
-    internal.ExitWithMessages("Unknown command: "+cmd, usage)
+    util.ExitWithMessages("Unknown command: "+cmd, usage)
   }
 }

go.mod

@@ -3,17 +3,17 @@ module github.com/jackhftang/tusc
 go 1.12
 
 require (
-	cloud.google.com/go v0.43.0 // indirect
-	github.com/aws/aws-sdk-go v1.21.1 // indirect
 	github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
 	github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0
-	github.com/prometheus/client_golang v1.0.0 // indirect
-	github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0 // indirect
+	github.com/golang/mock v1.3.1 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/tus/tusd v0.0.0-20190712143443-30811b6579c5
-	github.com/vimeo/go-util v1.2.0 // indirect
 	golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
+	golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 // indirect
+	golang.org/x/text v0.3.2 // indirect
 	gopkg.in/Acconut/lockfile.v1 v1.1.0 // indirect
-	gopkg.in/h2non/gock.v1 v1.0.15 // indirect
 )

go.sum

@@ -5,6 +5,7 @@ import (
   "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"
 )
@@ -23,39 +24,44 @@ Options:
 `
 
 func Client() {
+  var err error
   arguments, _ := docopt.ParseDoc(clientUsage)
 
   file, _ := arguments.String("<file>")
   url, _ := arguments.String("<url>")
-  resume := getBool(arguments, "--resumable")
+  resume := util.GetBool(arguments, "--resumable")
 
+  // open file
   f, err := os.Open(file)
   if err != nil {
-    ExitWithMessages("Cannot open file: " + file)
+    util.ExitWithMessages("Cannot open file: " + file)
   }
   defer f.Close()
 
   // create the tus client
   var store tus.Store
   if resume {
-    path := getString(arguments, "--store")
+    path := util.GetString(arguments, "--store")
     store, err = leveldbstore.NewLeveldbStore(path)
     if err != nil {
-      ExitWithMessages("Cannot Open "+path, clientUsage)
+      util.ExitWithMessages("Cannot Open "+path, clientUsage)
     }
   }
 
   client, _ := tus.NewClient(url, &tus.Config{
-    ChunkSize:           getInt64(arguments, "--chuck-size"),
-    OverridePatchMethod: getBool(arguments, "--override-patch-method"),
+    ChunkSize:           util.GetInt64(arguments, "--chuck-size"),
+    OverridePatchMethod: util.GetBool(arguments, "--override-patch-method"),
     Resume:              resume,
     Store:               store,
     Header:              make(http.Header),
     HttpClient:          nil,
   })
 
   // create an upload from a file.
-  upload, _ := tus.NewUploadFromFile(f)
+  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
@@ -64,11 +70,14 @@ func Client() {
   } 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 {
-    ExitWithMessages("Upload incomplete")
+    util.ExitWithMessages("Upload incomplete")
   }
 }