diff --git a/cmd/all/all.go b/cmd/all/all.go index 63442520f..9ce59e76b 100644 --- a/cmd/all/all.go +++ b/cmd/all/all.go @@ -18,7 +18,6 @@ import ( _ "github.com/rclone/rclone/cmd/copyurl" _ "github.com/rclone/rclone/cmd/cryptcheck" _ "github.com/rclone/rclone/cmd/cryptdecode" - _ "github.com/rclone/rclone/cmd/dbhashsum" _ "github.com/rclone/rclone/cmd/dedupe" _ "github.com/rclone/rclone/cmd/delete" _ "github.com/rclone/rclone/cmd/deletefile" diff --git a/cmd/dbhashsum/dbhashsum.go b/cmd/dbhashsum/dbhashsum.go deleted file mode 100644 index 5fa7fddce..000000000 --- a/cmd/dbhashsum/dbhashsum.go +++ /dev/null @@ -1,51 +0,0 @@ -package dbhashsum - -import ( - "context" - - "github.com/rclone/rclone/backend/dropbox" - "github.com/rclone/rclone/cmd" - "github.com/rclone/rclone/cmd/hashsum" - "github.com/rclone/rclone/fs" - "github.com/rclone/rclone/fs/operations" - "github.com/spf13/cobra" -) - -func init() { - cmd.Root.AddCommand(commandDefinition) - cmdFlags := commandDefinition.Flags() - hashsum.AddHashFlags(cmdFlags) -} - -var commandDefinition = &cobra.Command{ - Use: "dbhashsum remote:path", - Short: `Produces a Dropbox hash file for all the objects in the path.`, - Long: ` -Produces a Dropbox hash file for all the objects in the path. The -hashes are calculated according to [Dropbox content hash -rules](https://www.dropbox.com/developers/reference/content-hash). -The output is in the same format as md5sum and sha1sum. - -By default, the hash is requested from the remote. If Dropbox hash is -not supported by the remote, no hash will be returned. With the -download flag, the file will be downloaded from the remote and -hashed locally enabling Dropbox hash for any remote. -`, - Hidden: true, - Run: func(command *cobra.Command, args []string) { - cmd.CheckArgs(1, 1, command, args) - fsrc := cmd.NewFsSrc(args) - fs.Logf(nil, `"rclone dbhashsum" is deprecated, use "rclone hashsum %v %s" instead`, dropbox.DbHashType, args[0]) - cmd.Run(false, false, command, func() error { - if hashsum.HashsumOutfile == "" { - return operations.HashLister(context.Background(), dropbox.DbHashType, hashsum.OutputBase64, hashsum.DownloadFlag, fsrc, nil) - } - output, close, err := hashsum.GetHashsumOutput(hashsum.HashsumOutfile) - if err != nil { - return err - } - defer close() - return operations.HashLister(context.Background(), dropbox.DbHashType, hashsum.OutputBase64, hashsum.DownloadFlag, fsrc, output) - }) - }, -} diff --git a/cmd/hashsum/hashsum.go b/cmd/hashsum/hashsum.go index a176f19d9..ce397611c 100644 --- a/cmd/hashsum/hashsum.go +++ b/cmd/hashsum/hashsum.go @@ -15,7 +15,7 @@ import ( "github.com/spf13/pflag" ) -// Global hashsum flags for reuse in md5sum, sha1sum, and dbhashsum +// Global hashsum flags for reuse in hashsum, md5sum, sha1sum var ( OutputBase64 = false DownloadFlag = false @@ -28,7 +28,7 @@ func init() { AddHashFlags(cmdFlags) } -// AddHashFlags is a convenience function to add the command flags OutputBase64 and DownloadFlag to hashsum, md5sum, sha1sum, and dbhashsum +// AddHashFlags is a convenience function to add the command flags OutputBase64 and DownloadFlag to hashsum, md5sum, sha1sum func AddHashFlags(cmdFlags *pflag.FlagSet) { flags.BoolVarP(cmdFlags, &OutputBase64, "base64", "", OutputBase64, "Output base64 encoded hashsum") flags.StringVarP(cmdFlags, &HashsumOutfile, "output-file", "", HashsumOutfile, "Output hashsums to a file rather than the terminal")