Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow bit-identical add -copy #264

Merged
merged 1 commit into from Nov 21, 2017
Merged

allow bit-identical add -copy #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion duplicacy/duplicacy_main.go
View file
Open in desktop
Expand Up @@ -367,6 +367,7 @@ func configRepository(context *cli.Context, init bool) {
}

var otherConfig *duplicacy.Config
var bitCopy bool
if context.String("copy") != "" {

otherPreference := duplicacy.FindPreference(context.String("copy"))
Expand Down Expand Up @@ -395,14 +396,16 @@ func configRepository(context *cli.Context, init bool) {
duplicacy.LOG_ERROR("STORAGE_NOT_CONFIGURED",
"The storage to copy the configuration from has not been initialized")
}

bitCopy = context.Bool("bit")
}

iterations := context.Int("iterations")
if iterations == 0 {
iterations = duplicacy.CONFIG_DEFAULT_ITERATIONS
}
duplicacy.ConfigStorage(storage, iterations, compressionLevel, averageChunkSize, maximumChunkSize,
minimumChunkSize, storagePassword, otherConfig)
minimumChunkSize, storagePassword, otherConfig, bitCopy)
}

duplicacy.Preferences = append(duplicacy.Preferences, preference)
Expand Down Expand Up @@ -1603,6 +1606,10 @@ func main() {
Usage: "make the new storage compatible with an existing one to allow for copy operations",
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",
ArgsUsage: "<storage name> <snapshot id> <storage url>",
Expand Down
12 changes: 9 additions & 3 deletions src/duplicacy_config.go
View file
Open in desktop
Expand Up @@ -143,7 +143,7 @@ func (config *Config) Print() {
}

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{
CompressionLevel: compressionLevel,
Expand Down Expand Up @@ -182,6 +182,12 @@ func CreateConfigFromParameters(compressionLevel int, averageChunkSize int, maxi

config.ChunkSeed = copyFrom.ChunkSeed
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)
Expand Down Expand Up @@ -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
// is enabled.
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")
if err != nil {
Expand All @@ -485,7 +491,7 @@ func ConfigStorage(storage Storage, iterations int, compressionLevel int, averag
}

config := CreateConfigFromParameters(compressionLevel, averageChunkSize, maximumChunkSize, minimumChunkSize, len(password) > 0,
copyFrom)
copyFrom, bitCopy)
if config == nil {
return false
}
Expand Down