jkl1337/duplicacy
1
0
Fork 0
mirror of https://github.com/jkl1337/duplicacy.git synced 2026-01-02 19:54:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug that caused a truncated file not to be restored correctly

Browse Source
This commit is contained in:
Gilbert Chen
2017-07-27 23:27:59 -04:00
parent c426bf5af2
commit db3e0946bb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/duplicacy_backupmanager.go
View File

@@ -1196,13 +1196,17 @@ func (manager *BackupManager) RestoreFile(chunkDownloader *ChunkDownloader, chun
fileHasher := manager.config.NewFileHasher() fileHasher := manager.config.NewFileHasher()
buffer := make([]byte, 64 * 1024) buffer := make([]byte, 64 * 1024)
err = nil err = nil
for i := entry.StartChunk; i <= entry.EndChunk; i++ { // We set to read one more byte so the file hash will be different if the file to be restored is a
// truncated portion of the existing file
for i := entry.StartChunk; i <= entry.EndChunk + 1; i++ {
hasher := manager.config.NewKeyedHasher(manager.config.HashKey) hasher := manager.config.NewKeyedHasher(manager.config.HashKey)
chunkSize := chunkDownloader.taskList[i].chunkLength chunkSize := 1 // the size of extra chunk beyond EndChunk
if i == entry.StartChunk { if i == entry.StartChunk {
chunkSize -= entry.StartOffset chunkSize -= entry.StartOffset
} else if i == entry.EndChunk { } else if i == entry.EndChunk {
chunkSize = entry.EndOffset chunkSize = entry.EndOffset
} else if i > entry.StartChunk && i < entry.EndChunk {
chunkSize = chunkDownloader.taskList[i].chunkLength
} }
count := 0 count := 0
for count < chunkSize { for count < chunkSize {