directory structure change to work with glide

glide has its own requirements. My previous workaround caused me some
code checkin errors. Need to fix this.

1 files changed, 0 insertions, 108 deletions

diff --git a/go/weed/upload.go b/go/weed/upload.go
deleted file mode 100644
index df0e359b9..000000000
--- a/go/weed/upload.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/chrislusf/seaweedfs/go/operation"
-	"github.com/chrislusf/seaweedfs/go/security"
-)
-
-var (
-	upload UploadOptions
-)
-
-type UploadOptions struct {
-	server      *string
-	dir         *string
-	include     *string
-	replication *string
-	collection  *string
-	ttl         *string
-	maxMB       *int
-	secretKey   *string
-}
-
-func init() {
-	cmdUpload.Run = runUpload // break init cycle
-	cmdUpload.IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information")
-	upload.server = cmdUpload.Flag.String("server", "localhost:9333", "SeaweedFS master location")
-	upload.dir = cmdUpload.Flag.String("dir", "", "Upload the whole folder recursively if specified.")
-	upload.include = cmdUpload.Flag.String("include", "", "pattens of files to upload, e.g., *.pdf, *.html, ab?d.txt, works together with -dir")
-	upload.replication = cmdUpload.Flag.String("replication", "", "replication type")
-	upload.collection = cmdUpload.Flag.String("collection", "", "optional collection name")
-	upload.ttl = cmdUpload.Flag.String("ttl", "", "time to live, e.g.: 1m, 1h, 1d, 1M, 1y")
-	upload.maxMB = cmdUpload.Flag.Int("maxMB", 0, "split files larger than the limit")
-	upload.secretKey = cmdUpload.Flag.String("secure.secret", "", "secret to encrypt Json Web Token(JWT)")
-}
-
-var cmdUpload = &Command{
-	UsageLine: "upload -server=localhost:9333 file1 [file2 file3]\n         weed upload -server=localhost:9333 -dir=one_directory -include=*.pdf",
-	Short:     "upload one or a list of files",
-	Long: `upload one or a list of files, or batch upload one whole folder recursively.
-
-  If uploading a list of files:
-  It uses consecutive file keys for the list of files.
-  e.g. If the file1 uses key k, file2 can be read via k_1
-
-  If uploading a whole folder recursively:
-  All files under the folder and subfolders will be uploaded, each with its own file key.
-  Optional parameter "-include" allows you to specify the file name patterns.
-
-  If any file has a ".gz" extension, the content are considered gzipped already, and will be stored as is.
-  This can save volume server's gzipped processing and allow customizable gzip compression level.
-  The file name will strip out ".gz" and stored. For example, "jquery.js.gz" will be stored as "jquery.js".
-
-  If "maxMB" is set to a positive number, files larger than it would be split into chunks and uploaded separatedly.
-  The list of file ids of those chunks would be stored in an additional chunk, and this additional chunk's file id would be returned.
-
-  `,
-}
-
-func runUpload(cmd *Command, args []string) bool {
-	secret := security.Secret(*upload.secretKey)
-	if len(cmdUpload.Flag.Args()) == 0 {
-		if *upload.dir == "" {
-			return false
-		}
-		filepath.Walk(*upload.dir, func(path string, info os.FileInfo, err error) error {
-			if err == nil {
-				if !info.IsDir() {
-					if *upload.include != "" {
-						if ok, _ := filepath.Match(*upload.include, filepath.Base(path)); !ok {
-							return nil
-						}
-					}
-					parts, e := operation.NewFileParts([]string{path})
-					if e != nil {
-						return e
-					}
-					results, e := operation.SubmitFiles(*upload.server, parts,
-						*upload.replication, *upload.collection,
-						*upload.ttl, *upload.maxMB, secret)
-					bytes, _ := json.Marshal(results)
-					fmt.Println(string(bytes))
-					if e != nil {
-						return e
-					}
-				}
-			} else {
-				fmt.Println(err)
-			}
-			return err
-		})
-	} else {
-		parts, e := operation.NewFileParts(args)
-		if e != nil {
-			fmt.Println(e.Error())
-		}
-		results, _ := operation.SubmitFiles(*upload.server, parts,
-			*upload.replication, *upload.collection,
-			*upload.ttl, *upload.maxMB, secret)
-		bytes, _ := json.Marshal(results)
-		fmt.Println(string(bytes))
-	}
-	return true
-}