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

Update PR

Browse source 
* Update PR
This commit is contained in:
abraunegg 2023-09-03 15:05:01 +10:00
parent 54b3d52703
commit c659cb2040
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/monitor.d
View file

@ -406,8 +406,8 @@ final class Monitor {
remove(path);
cookieToPath.remove(cookie);
}
log.log("inotify events flushed");
// Debug Log that all inotify events are flushed
log.vdebug("inotify events flushed");
}
}
}

32
src/sync.d
View file

@ -5371,8 +5371,10 @@ class SyncEngine {
Thread.sleep(dur!"seconds"(30));
}
// re-try original request - retried for 429, 503, 504 - but loop back calling this function
log.vdebug("Retrying Function: ", thisFunctionName);
generateDeltaResponse(pathToQuery);
log.log("Retrying Query: rootData = generateDeltaResponseOneDriveApiInstance.getDriveIdRoot(searchItem.driveId)");
rootData = generateDeltaResponseOneDriveApiInstance.getDriveIdRoot(searchItem.driveId);
} else {
// Default operation if not 408,429,503,504 errors
// display what the error is
@ -5634,24 +5636,17 @@ class SyncEngine {
string nextLink;
for (;;) {
// query children
// query this level children
try {
thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink);
} catch (OneDriveException exception) {
writeln("EXCEPTION HANDLING NEEDED: thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink)");
writeln("CODING TO DO: EXCEPTION HANDLING NEEDED: thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink)");
}
// Was a valid JSON response for 'thisLevelChildren' provided?
if (thisLevelChildren.type() == JSONType.object) {
// process this level children
if (!childParentPath.empty) {
// We dont use childParentPath to log, as this poses an information leak risk.
@ -5695,13 +5690,14 @@ class SyncEngine {
} else break;
} else {
// driveData is an invalid JSON object
writeln("CODING TO DO: The query of OneDrive API to thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink) generated an invalid JSON response - thus we cant build our own /delta simulated response ... how to handle?");
// Must exit here
exit(-1);
// Invalid JSON response when querying this level children
log.vdebug("INVALID JSON response when attempting a retry of parent function - queryForChildren(driveId, idToQuery, childParentPath, pathForLogging)");
// retry thisLevelChildren = queryThisLevelChildren
log.vdebug("Thread sleeping for an additional 30 seconds");
Thread.sleep(dur!"seconds"(30));
log.vdebug("Retry this call thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink)");
thisLevelChildren = queryThisLevelChildren(driveId, idToQuery, nextLink);
}
}
// return response