deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix Operation not permitted FileException Error (#2958)

Browse source 
* Ensure that setTimes() function is is matched with a try block so that exceptions can be caught when timestamps cannot be set correctly due to file system operations not being permitted (reference #2954)
This commit is contained in:
abraunegg 2024-11-09 09:25:46 +11:00 • committed by GitHub
commit 0c01a759c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/sync.d
View file

@ -2601,7 +2601,12 @@ class SyncEngine {
// set the correct time on the downloaded file
if (!dryRun) {
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ newItemPath, ["debug"]);}
setTimes(newItemPath, itemModifiedTime, itemModifiedTime);
try {
setTimes(newItemPath, itemModifiedTime, itemModifiedTime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
}
} catch (FileException e) {
// display the error message
@ -2765,7 +2770,12 @@ class SyncEngine {
if (verboseLogging) {addLogEntry("The source of the incorrect timestamp was the local file - correcting timestamp locally due to --resync", ["verbose"]);}
// Fix the local file timestamp
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ path, ["debug"]);}
setTimes(path, item.mtime, item.mtime);
try {
setTimes(path, item.mtime, item.mtime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
} else {
// The source of the out-of-date timestamp was OneDrive and this needs to be corrected to avoid always generating a hash test if timestamp is different
if (verboseLogging) {addLogEntry("The source of the incorrect timestamp was OneDrive online - correcting timestamp online", ["verbose"]);}
@ -2784,14 +2794,24 @@ class SyncEngine {
if (verboseLogging) {addLogEntry("The source of the incorrect timestamp was the local file - correcting timestamp locally due to --download-only", ["verbose"]);}
// Fix the local file timestamp
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ path, ["debug"]);}
setTimes(path, item.mtime, item.mtime);
try {
setTimes(path, item.mtime, item.mtime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
}
} else if (!dryRun) {
// The source of the out-of-date timestamp was the local file and this needs to be corrected to avoid always generating a hash test if timestamp is different
if (verboseLogging) {addLogEntry("The source of the incorrect timestamp was the local file - correcting timestamp locally", ["verbose"]);}
// Fix the local file timestamp
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ path, ["debug"]);}
setTimes(path, item.mtime, item.mtime);
try {
setTimes(path, item.mtime, item.mtime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
}
return false;
} else {
@ -3401,7 +3421,12 @@ class SyncEngine {
// Remote file, remote values need to be used, we may not even have permission to change timestamp, update local file
if (verboseLogging) {addLogEntry("The local item has the same hash value as the item online, however file is a OneDrive Business Shared File - correcting local timestamp", ["verbose"]);}
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ localFilePath, ["debug"]);}
setTimes(localFilePath, dbItem.mtime, dbItem.mtime);
try {
setTimes(localFilePath, dbItem.mtime, dbItem.mtime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
}
}
} else {
@ -3409,7 +3434,12 @@ class SyncEngine {
if (verboseLogging) {addLogEntry("The local item has the same hash value as the item online - correcting local timestamp due to --download-only being used to ensure local file matches timestamp online", ["verbose"]);}
if (!dryRun) {
if (debugLogging) {addLogEntry("Calling setTimes() for this file: " ~ localFilePath, ["debug"]);}
setTimes(localFilePath, dbItem.mtime, dbItem.mtime);
try {
setTimes(localFilePath, dbItem.mtime, dbItem.mtime);
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
}
}
}
}