jgaunt/duplicacy
1
0
Fork 0
mirror of https://github.com/gilbertchen/duplicacy synced 2025-12-10 05:13:17 +00:00
Code Issues Releases Wiki Activity

allow bit-identical add -copy

Browse Source
This commit is contained in:
Mark Lowne
2017-11-11 16:26:44 +01:00
parent 91d31f4091
commit 1dcb3a05fc
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
duplicacy/duplicacy_main.go
View File

@@ -367,6 +367,7 @@ func configRepository(context *cli.Context, init bool) {
} }
var otherConfig *duplicacy.Config var otherConfig *duplicacy.Config
var bitCopy bool
if context.String("copy") != "" { if context.String("copy") != "" {
otherPreference := duplicacy.FindPreference(context.String("copy")) otherPreference := duplicacy.FindPreference(context.String("copy"))
@@ -395,6 +396,8 @@ func configRepository(context *cli.Context, init bool) {
duplicacy.LOG_ERROR("STORAGE_NOT_CONFIGURED", duplicacy.LOG_ERROR("STORAGE_NOT_CONFIGURED",
"The storage to copy the configuration from has not been initialized") "The storage to copy the configuration from has not been initialized")
} }
bitCopy = context.Bool("bit")
} }
iterations := context.Int("iterations") iterations := context.Int("iterations")
@@ -402,7 +405,7 @@ func configRepository(context *cli.Context, init bool) {
iterations = duplicacy.CONFIG_DEFAULT_ITERATIONS iterations = duplicacy.CONFIG_DEFAULT_ITERATIONS
} }
duplicacy.ConfigStorage(storage, iterations, compressionLevel, averageChunkSize, maximumChunkSize, duplicacy.ConfigStorage(storage, iterations, compressionLevel, averageChunkSize, maximumChunkSize,
minimumChunkSize, storagePassword, otherConfig) minimumChunkSize, storagePassword, otherConfig, bitCopy)
} }
duplicacy.Preferences = append(duplicacy.Preferences, preference) duplicacy.Preferences = append(duplicacy.Preferences, preference)
@@ -1603,6 +1606,10 @@ func main() {
Usage: "make the new storage compatible with an existing one to allow for copy operations", Usage: "make the new storage compatible with an existing one to allow for copy operations",
Argument: "<storage name>", Argument: "<storage name>",
}, },
cli.BoolFlag{
Name: "bit",
Usage: "(when using -copy) make the new storage bit-identical to also allow rsync etc.",
},
}, },
Usage: "Add an additional storage to be used for the existing repository", Usage: "Add an additional storage to be used for the existing repository",
ArgsUsage: "<storage name> <snapshot id> <storage url>", ArgsUsage: "<storage name> <snapshot id> <storage url>",

12
src/duplicacy_config.go
View File

@@ -143,7 +143,7 @@ func (config *Config) Print() {
} }
func CreateConfigFromParameters(compressionLevel int, averageChunkSize int, maximumChunkSize int, mininumChunkSize int, func CreateConfigFromParameters(compressionLevel int, averageChunkSize int, maximumChunkSize int, mininumChunkSize int,
isEncrypted bool, copyFrom *Config) (config *Config) { isEncrypted bool, copyFrom *Config, bitCopy bool) (config *Config) {
config = &Config{ config = &Config{
CompressionLevel: compressionLevel, CompressionLevel: compressionLevel,
@@ -182,6 +182,12 @@ func CreateConfigFromParameters(compressionLevel int, averageChunkSize int, maxi
config.ChunkSeed = copyFrom.ChunkSeed config.ChunkSeed = copyFrom.ChunkSeed
config.HashKey = copyFrom.HashKey config.HashKey = copyFrom.HashKey
if bitCopy {
config.IDKey = copyFrom.IDKey
config.ChunkKey = copyFrom.ChunkKey
config.FileKey = copyFrom.FileKey
}
} }
config.chunkPool = make(chan *Chunk, runtime.NumCPU()*16) config.chunkPool = make(chan *Chunk, runtime.NumCPU()*16)
@@ -471,7 +477,7 @@ func UploadConfig(storage Storage, config *Config, password string, iterations i
// it simply creates a file named 'config' that stores various parameters as well as a set of keys if encryption // it simply creates a file named 'config' that stores various parameters as well as a set of keys if encryption
// is enabled. // is enabled.
func ConfigStorage(storage Storage, iterations int, compressionLevel int, averageChunkSize int, maximumChunkSize int, func ConfigStorage(storage Storage, iterations int, compressionLevel int, averageChunkSize int, maximumChunkSize int,
minimumChunkSize int, password string, copyFrom *Config) bool { minimumChunkSize int, password string, copyFrom *Config, bitCopy bool) bool {
exist, _, _, err := storage.GetFileInfo(0, "config") exist, _, _, err := storage.GetFileInfo(0, "config")
if err != nil { if err != nil {
@@ -485,7 +491,7 @@ func ConfigStorage(storage Storage, iterations int, compressionLevel int, averag
} }
config := CreateConfigFromParameters(compressionLevel, averageChunkSize, maximumChunkSize, minimumChunkSize, len(password) > 0, config := CreateConfigFromParameters(compressionLevel, averageChunkSize, maximumChunkSize, minimumChunkSize, len(password) > 0,
copyFrom) copyFrom, bitCopy)
if config == nil { if config == nil {
return false return false
} }