deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-08 00:36:41 +02:00
Code Issues Projects Releases Wiki Activity

Fix dry run reports "Deleting item from one drive" for remotely created file (Issue #489) (#490)

Browse source 
* Fix --dry-run logging output for faking downloading new files
This commit is contained in:
abraunegg 2019-05-09 19:52:39 +10:00 committed by GitHub
parent af43b77100
commit bac5d6f1a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/sync.d
View file

@ -969,6 +969,10 @@ final class SyncEngine
final switch (item.type) {
case ItemType.file:
downloadFileItem(item, path);
if (dryRun) {
// we dont download the file, but we need to track that we 'faked it'
idsFaked ~= [item.driveId, item.id];
}
break;
case ItemType.dir:
case ItemType.remote:
@ -1312,6 +1316,7 @@ final class SyncEngine
foreach (i; idsFaked) {
if (i[1] == item.id) {
log.vdebug("Matched faked dir which is 'supposed' to exist but not created due to --dry-run use");
log.vlog("The directory has not changed");
return;
}
}
@ -1497,12 +1502,43 @@ final class SyncEngine
uploadCreateDir(path);
}
} else {
log.vlog("The file has been deleted locally");
if (noRemoteDelete) {
// do not process remote file delete
log.vlog("Skipping remote file delete as --upload-only & --no-remote-delete configured");
// File does not exist locally
// If we are in a --dry-run situation - this file may never have existed as we never downloaded it
if (!dryRun) {
// Not --dry-run situation
log.vlog("The file has been deleted locally");
if (noRemoteDelete) {
// do not process remote file delete
log.vlog("Skipping remote file delete as --upload-only & --no-remote-delete configured");
} else {
uploadDeleteItem(item, path);
}
} else {
uploadDeleteItem(item, path);
// We are in a --dry-run situation, file appears to have deleted locally - this file may never have existed as we never downloaded it ..
// Check if path does not exist in database
if (!itemdb.selectByPath(path, defaultDriveId, item)) {
// file not found in database
log.vlog("The file has been deleted locally");
if (noRemoteDelete) {
// do not process remote file delete
log.vlog("Skipping remote file delete as --upload-only & --no-remote-delete configured");
} else {
uploadDeleteItem(item, path);
}
} else {
// file was found in the database
// Did we 'fake create it' as part of --dry-run ?
foreach (i; idsFaked) {
if (i[1] == item.id) {
log.vdebug("Matched faked file which is 'supposed' to exist but not created due to --dry-run use");
log.vlog("The file has not changed");
return;
}
}
// item.id did not match a 'faked' download new file creation
log.vlog("The file has been deleted locally");
uploadDeleteItem(item, path);
}
}
}
}