Move all backends into backend directory

backend/all/all.go

@@ -0,0 +1,26 @@
+package all
+
+import (
+	// Active file systems
+	_ "github.com/ncw/rclone/backend/amazonclouddrive"
+	_ "github.com/ncw/rclone/backend/azureblob"
+	_ "github.com/ncw/rclone/backend/b2"
+	_ "github.com/ncw/rclone/backend/box"
+	_ "github.com/ncw/rclone/backend/cache"
+	_ "github.com/ncw/rclone/backend/crypt"
+	_ "github.com/ncw/rclone/backend/drive"
+	_ "github.com/ncw/rclone/backend/dropbox"
+	_ "github.com/ncw/rclone/backend/ftp"
+	_ "github.com/ncw/rclone/backend/googlecloudstorage"
+	_ "github.com/ncw/rclone/backend/http"
+	_ "github.com/ncw/rclone/backend/hubic"
+	_ "github.com/ncw/rclone/backend/local"
+	_ "github.com/ncw/rclone/backend/onedrive"
+	_ "github.com/ncw/rclone/backend/pcloud"
+	_ "github.com/ncw/rclone/backend/qingstor"
+	_ "github.com/ncw/rclone/backend/s3"
+	_ "github.com/ncw/rclone/backend/sftp"
+	_ "github.com/ncw/rclone/backend/swift"
+	_ "github.com/ncw/rclone/backend/webdav"
+	_ "github.com/ncw/rclone/backend/yandex"
+)

backend/amazonclouddrive/amazonclouddrive_test.go

@@ -7,7 +7,7 @@ package amazonclouddrive_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/amazonclouddrive"
+	"github.com/ncw/rclone/backend/amazonclouddrive"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/azureblob/azureblob_test.go

@@ -10,7 +10,7 @@ package azureblob_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/azureblob"
+	"github.com/ncw/rclone/backend/azureblob"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/b2/api/types_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ncw/rclone/b2/api"
+	"github.com/ncw/rclone/backend/b2/api"
 	"github.com/ncw/rclone/fstest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

backend/b2/b2.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ncw/rclone/b2/api"
+	"github.com/ncw/rclone/backend/b2/api"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/pacer"
 	"github.com/ncw/rclone/rest"

backend/b2/b2_test.go

@@ -7,7 +7,7 @@ package b2_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/b2"
+	"github.com/ncw/rclone/backend/b2"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/b2/upload.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ncw/rclone/b2/api"
+	"github.com/ncw/rclone/backend/b2/api"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/rest"
 	"github.com/pkg/errors"

backend/box/box.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ncw/rclone/box/api"
+	"github.com/ncw/rclone/backend/box/api"
 	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/oauthutil"

backend/box/box_test.go

@@ -7,7 +7,7 @@ package box_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/box"
+	"github.com/ncw/rclone/backend/box"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/box/upload.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ncw/rclone/box/api"
+	"github.com/ncw/rclone/backend/box/api"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/rest"
 	"github.com/pkg/errors"

backend/cache/cache.go

@@ -16,7 +16,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/ncw/rclone/crypt"
+	"github.com/ncw/rclone/backend/crypt"
 	"github.com/ncw/rclone/fs"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"

backend/cache/cache_internal_test.go

@@ -19,14 +19,14 @@ import (
 	"os/exec"
 	//"strings"
 
-	"github.com/ncw/rclone/cache"
+	"github.com/ncw/rclone/backend/cache"
 	//"github.com/ncw/rclone/cmd/mount"
 	//_ "github.com/ncw/rclone/cmd/cmount"
 	//"github.com/ncw/rclone/cmd/mountlib"
-	_ "github.com/ncw/rclone/drive"
+	_ "github.com/ncw/rclone/backend/drive"
+	"github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest"
-	"github.com/ncw/rclone/local"
 	flag "github.com/spf13/pflag"
 	"github.com/stretchr/testify/require"
 )

backend/cache/cache_test.go

@@ -10,10 +10,10 @@ package cache_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/cache"
+	"github.com/ncw/rclone/backend/cache"
+	_ "github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	_ "github.com/ncw/rclone/local"
 )
 
 func TestSetup(t *testing.T) {

backend/crypt/cipher.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"unicode/utf8"
 
-	"github.com/ncw/rclone/crypt/pkcs7"
+	"github.com/ncw/rclone/backend/crypt/pkcs7"
 	"github.com/pkg/errors"
 
 	"golang.org/x/crypto/nacl/secretbox"

backend/crypt/cipher_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ncw/rclone/crypt/pkcs7"
+	"github.com/ncw/rclone/backend/crypt/pkcs7"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

backend/crypt/crypt2_test.go

@@ -7,10 +7,10 @@ package crypt_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/crypt"
+	"github.com/ncw/rclone/backend/crypt"
+	_ "github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	_ "github.com/ncw/rclone/local"
 )
 
 func TestSetup2(t *testing.T) {

backend/crypt/crypt3_test.go

@@ -7,10 +7,10 @@ package crypt_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/crypt"
+	"github.com/ncw/rclone/backend/crypt"
+	_ "github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	_ "github.com/ncw/rclone/local"
 )
 
 func TestSetup3(t *testing.T) {

backend/crypt/crypt_test.go

@@ -7,10 +7,10 @@ package crypt_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/crypt"
+	"github.com/ncw/rclone/backend/crypt"
+	_ "github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	_ "github.com/ncw/rclone/local"
 )
 
 func TestSetup(t *testing.T) {

backend/drive/drive_test.go

@@ -7,7 +7,7 @@ package drive_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/drive"
+	"github.com/ncw/rclone/backend/drive"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/dropbox/dbhash/dbhash_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ncw/rclone/dropbox/dbhash"
+	"github.com/ncw/rclone/backend/dropbox/dbhash"
 	"github.com/stretchr/testify/assert"
 )
 

backend/dropbox/dropbox_test.go

@@ -7,7 +7,7 @@ package dropbox_test
 import (
 	"testing"
 
-	"github.com/ncw/rclone/dropbox"
+	"github.com/ncw/rclone/backend/dropbox"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
 )

backend/ftp/ftp_test.go

@@ -7,9 +7,9 @@ package ftp_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/ftp"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/ftp"
 )
 
 func TestSetup(t *testing.T) {

backend/googlecloudstorage/googlecloudstorage_test.go

@@ -7,9 +7,9 @@ package googlecloudstorage_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/googlecloudstorage"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/googlecloudstorage"
 )
 
 func TestSetup(t *testing.T) {

backend/hubic/hubic.go

@@ -13,9 +13,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/ncw/rclone/backend/swift"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/swift"
 	swiftLib "github.com/ncw/swift"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"

backend/hubic/hubic_test.go

@@ -7,9 +7,9 @@ package hubic_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/hubic"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/hubic"
 )
 
 func TestSetup(t *testing.T) {

backend/local/local_test.go

@@ -7,9 +7,9 @@ package local_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/local"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/local"
 )
 
 func TestSetup(t *testing.T) {

backend/onedrive/onedrive.go

@@ -14,10 +14,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ncw/rclone/backend/onedrive/api"
 	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/onedrive/api"
 	"github.com/ncw/rclone/pacer"
 	"github.com/ncw/rclone/rest"
 	"github.com/pkg/errors"

backend/onedrive/onedrive_test.go

@@ -7,9 +7,9 @@ package onedrive_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/onedrive"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/onedrive"
 )
 
 func TestSetup(t *testing.T) {

backend/pcloud/pcloud.go

@@ -21,11 +21,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ncw/rclone/backend/pcloud/api"
 	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/oauthutil"
 	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/pcloud/api"
 	"github.com/ncw/rclone/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"

backend/pcloud/pcloud_test.go

@@ -7,9 +7,9 @@ package pcloud_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/pcloud"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/pcloud"
 )
 
 func TestSetup(t *testing.T) {

backend/qingstor/qingstor_test.go

@@ -10,9 +10,9 @@ package qingstor_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/qingstor"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/qingstor"
 )
 
 func TestSetup(t *testing.T) {

backend/s3/s3_test.go

@@ -7,9 +7,9 @@ package s3_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/s3"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/s3"
 )
 
 func TestSetup(t *testing.T) {

backend/sftp/sftp_test.go

@@ -7,9 +7,9 @@ package sftp_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/sftp"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/sftp"
 )
 
 func TestSetup(t *testing.T) {

backend/swift/swift_test.go

@@ -7,9 +7,9 @@ package swift_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/swift"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/swift"
 )
 
 func TestSetup(t *testing.T) {

backend/webdav/webdav.go

@@ -28,10 +28,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ncw/rclone/backend/webdav/api"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/pacer"
 	"github.com/ncw/rclone/rest"
-	"github.com/ncw/rclone/webdav/api"
 	"github.com/pkg/errors"
 )
 

backend/webdav/webdav_test.go

@@ -7,9 +7,9 @@ package webdav_test
 import (
 	"testing"
 
+	"github.com/ncw/rclone/backend/webdav"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest/fstests"
-	"github.com/ncw/rclone/webdav"
 )
 
 func TestSetup(t *testing.T) {