deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-06-13 19:32:13 +02:00
Code Issues Projects Releases Wiki Activity

Update PR

Browse source 
Update PR
This commit is contained in:
abraunegg 2021-11-05 11:38:12 +11:00
parent 0728b1d7c8
commit 74235b7239
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/monitor.d
View file

@ -81,7 +81,8 @@ final class Monitor
{ {
// skip non existing/disappeared items // skip non existing/disappeared items
if (!exists(dirname)) { if (!exists(dirname)) {
log.vlog("Not adding non-existing/disappeared directory: ", dirname); // "Directory disappeared during upload: "
log.vlog(provideLanguageTranslation(languageIdentifier,218), dirname);
return; return;
} }
@ -127,7 +128,8 @@ final class Monitor
// Do we need to check for .nosync? Only if check_nosync is true // Do we need to check for .nosync? Only if check_nosync is true
if (check_nosync) { if (check_nosync) {
if (exists(buildNormalizedPath(dirname) ~ "/.nosync")) { if (exists(buildNormalizedPath(dirname) ~ "/.nosync")) {
log.vlog("Skipping watching path - .nosync found & --check-for-nosync enabled: ", buildNormalizedPath(dirname)); // "Skipping watching path - .nosync found & --check-for-nosync enabled: "
log.vlog(provideLanguageTranslation(languageIdentifier,320), buildNormalizedPath(dirname));
return; return;
} }
} }
@ -158,10 +160,14 @@ final class Monitor
// Need to check for: Failed to stat file in error message // Need to check for: Failed to stat file in error message
if (canFind(e.msg, "Failed to stat file")) { if (canFind(e.msg, "Failed to stat file")) {
// File system access issue // File system access issue
log.error("ERROR: The local file system returned an error with the following message:"); // "ERROR: The local file system returned an error with the following message:"
log.error(" Error Message: ", e.msg); log.error(provideLanguageTranslation(languageIdentifier,321));
log.error("ACCESS ERROR: Please check your UID and GID access to this file, as the permissions on this file is preventing this application to read it"); // " Error Message: "
log.error("\nFATAL: Exiting application to avoid deleting data due to local file system access issues\n"); log.error(provideLanguageTranslation(languageIdentifier,322), e.msg);
// "ACCESS ERROR: Please check your UID and GID access to this file, as the permissions on this file is preventing this application to read it"
log.error(provideLanguageTranslation(languageIdentifier,323));
// "\nFATAL: Exiting application to avoid deleting data due to local file system access issues\n"
log.error(provideLanguageTranslation(languageIdentifier,324));
// Must exit here // Must exit here
exit(-1); exit(-1);
} else { } else {
@ -178,10 +184,13 @@ final class Monitor
int wd = inotify_add_watch(fd, toStringz(pathname), mask); int wd = inotify_add_watch(fd, toStringz(pathname), mask);
if (wd < 0) { if (wd < 0) {
if (errno() == ENOSPC) { if (errno() == ENOSPC) {
log.log("The user limit on the total number of inotify watches has been reached."); // "The user limit on the total number of inotify watches has been reached.\nTo see the current max number of watches run:"
log.log("To see the current max number of watches run:"); log.log(provideLanguageTranslation(languageIdentifier,325));
// This line cannot be translated
log.log("sysctl fs.inotify.max_user_watches"); log.log("sysctl fs.inotify.max_user_watches");
log.log("To change the current max number of watches to 524288 run:"); // "To change the current max number of watches to 524288 run:"
log.log(provideLanguageTranslation(languageIdentifier,326));
// This line cannot be translated
log.log("sudo sysctl fs.inotify.max_user_watches=524288"); log.log("sudo sysctl fs.inotify.max_user_watches=524288");
} }
if (errno() == 13) { if (errno() == 13) {
@ -189,12 +198,14 @@ final class Monitor
// no misleading output that we could not add a watch due to permission denied // no misleading output that we could not add a watch due to permission denied
return; return;
} else { } else {
log.vlog("WARNING: inotify_add_watch failed - permission denied: ", pathname); // "WARNING: inotify_add_watch failed - permission denied: "
log.vlog(provideLanguageTranslation(languageIdentifier,327), pathname);
return; return;
} }
} }
// Flag any other errors // Flag any other errors
log.error("ERROR: inotify_add_watch failed: ", pathname); // "ERROR: inotify_add_watch failed: "
log.error(provideLanguageTranslation(languageIdentifier,328), pathname);
return; return;
} }
@ -211,7 +222,8 @@ final class Monitor
return; return;
} }
// Log that this is directory is being monitored // Log that this is directory is being monitored
log.vlog("Monitor directory: ", pathname); // "Monitoring this directory for local changes: "
log.vlog(provideLanguageTranslation(languageIdentifier,329), pathname);
} }
} }
@ -221,7 +233,8 @@ final class Monitor
assert(wd in wdToDirName); assert(wd in wdToDirName);
int ret = inotify_rm_watch(fd, wd); int ret = inotify_rm_watch(fd, wd);
if (ret < 0) throw new MonitorException("inotify_rm_watch failed"); if (ret < 0) throw new MonitorException("inotify_rm_watch failed");
log.vlog("Monitored directory removed: ", wdToDirName[wd]); // "Removed this directory from being monitored for local changes: "
log.vlog(provideLanguageTranslation(languageIdentifier,330), wdToDirName[wd]);
wdToDirName.remove(wd); wdToDirName.remove(wd);
} }
@ -234,7 +247,8 @@ final class Monitor
int ret = inotify_rm_watch(fd, wd); int ret = inotify_rm_watch(fd, wd);
if (ret < 0) throw new MonitorException("inotify_rm_watch failed"); if (ret < 0) throw new MonitorException("inotify_rm_watch failed");
wdToDirName.remove(wd); wdToDirName.remove(wd);
log.vlog("Monitored directory removed: ", dirname); // "Removed this directory from being monitored for local changes: "
log.vlog(provideLanguageTranslation(languageIdentifier,330), dirname);
} }
} }
} }

12
src/translations.d
View file

@ -471,7 +471,17 @@ void initialise_EN_AU(){
JSONValue([ "317": "OneDrive returned a 'HTTP 412 - Precondition Failed' when attempting file time stamp update - gracefully handling error" ]), JSONValue([ "317": "OneDrive returned a 'HTTP 412 - Precondition Failed' when attempting file time stamp update - gracefully handling error" ]),
JSONValue([ "318": "OneDrive returned a 'HTTP 412 - Precondition Failed' when attempting to move the file - gracefully handling error" ]), JSONValue([ "318": "OneDrive returned a 'HTTP 412 - Precondition Failed' when attempting to move the file - gracefully handling error" ]),
JSONValue([ "319": "Skipping item - OneDrive returned a 'HTTP 400 - Bad Request' when attempting to query if file exists" ]), JSONValue([ "319": "Skipping item - OneDrive returned a 'HTTP 400 - Bad Request' when attempting to query if file exists" ]),
JSONValue([ "320": "Skipping watching path - .nosync found & --check-for-nosync enabled: " ]),
JSONValue([ "321": "ERROR: The local file system returned an error with the following message:" ]),
JSONValue([ "322": " Error Message: " ]),
JSONValue([ "323": "ACCESS ERROR: Please check your UID and GID access to this file, as the permissions on this file is preventing this application to read it" ]),
JSONValue([ "324": "\nFATAL: Exiting application to avoid deleting data due to local file system access issues\n" ]),
JSONValue([ "325": "The user limit on the total number of inotify watches has been reached.\nTo see the current max number of watches run:" ]),
JSONValue([ "326": "To change the current max number of watches to 524288 run:" ]),
JSONValue([ "327": "WARNING: inotify_add_watch failed - permission denied: " ]),
JSONValue([ "328": "ERROR: inotify_add_watch failed: " ]),
JSONValue([ "329": "Monitoring this directory for local changes: " ]),
JSONValue([ "330": "Removed this directory from being monitored for local changes: " ]),
]); ]);