mirror of
https://github.com/abraunegg/onedrive
synced 2024-05-19 14:16:36 +02:00
* Fix --dry-run logging output for faking downloading new files
This commit is contained in:
parent
af43b77100
commit
bac5d6f1a9
46
src/sync.d
46
src/sync.d
|
@ -969,6 +969,10 @@ final class SyncEngine
|
||||||
final switch (item.type) {
|
final switch (item.type) {
|
||||||
case ItemType.file:
|
case ItemType.file:
|
||||||
downloadFileItem(item, path);
|
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;
|
break;
|
||||||
case ItemType.dir:
|
case ItemType.dir:
|
||||||
case ItemType.remote:
|
case ItemType.remote:
|
||||||
|
@ -1312,6 +1316,7 @@ final class SyncEngine
|
||||||
foreach (i; idsFaked) {
|
foreach (i; idsFaked) {
|
||||||
if (i[1] == item.id) {
|
if (i[1] == item.id) {
|
||||||
log.vdebug("Matched faked dir which is 'supposed' to exist but not created due to --dry-run use");
|
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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1497,12 +1502,43 @@ final class SyncEngine
|
||||||
uploadCreateDir(path);
|
uploadCreateDir(path);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.vlog("The file has been deleted locally");
|
// File does not exist locally
|
||||||
if (noRemoteDelete) {
|
// If we are in a --dry-run situation - this file may never have existed as we never downloaded it
|
||||||
// do not process remote file delete
|
if (!dryRun) {
|
||||||
log.vlog("Skipping remote file delete as --upload-only & --no-remote-delete configured");
|
// 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 {
|
} 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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue