Update notification handling for specific skipped scenarios (#2153)

* Update skip notification handling for the following scenarios:
  * Invalid Name (Microsoft Naming Convention)
  * Invalid Name (Contains an invalid whitespace item)
  * Invalid Name (Contains HTML ASCII Code)
  * Invalid Item (Invalid symbolic link)
This commit is contained in:
abraunegg 2022-09-26 07:40:22 +10:00 committed by GitHub
parent 7a5cf8dd46
commit e2ed2d2b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3540,19 +3540,19 @@ final class SyncEngine
// Restriction and limitations about windows naming files
if (!isValidName(path)) {
log.log("Skipping item - invalid name (Microsoft Naming Convention): ", path);
log.logAndNotify("Skipping item - invalid name (Microsoft Naming Convention): ", path);
return;
}
// Check for bad whitespace items
if (!containsBadWhiteSpace(path)) {
log.log("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
log.logAndNotify("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
return;
}
// Check for HTML ASCII Codes as part of file name
if (!containsASCIIHTMLCodes(path)) {
log.log("Skipping item - invalid name (Contains HTML ASCII Code): ", path);
log.logAndNotify("Skipping item - invalid name (Contains HTML ASCII Code): ", path);
return;
}
@ -4244,7 +4244,7 @@ final class SyncEngine
if (relativeLinkTest) {
log.vdebug("Not skipping item - symbolic link is a 'relative link' to target ('", relativeLink, "') which can be supported: ", path);
} else {
log.log("Skipping item - invalid symbolic link: ", path);
log.logAndNotify("Skipping item - invalid symbolic link: ", path);
return;
}
}
@ -4252,19 +4252,19 @@ final class SyncEngine
// Restriction and limitations about windows naming files
if (!isValidName(path)) {
log.log("Skipping item - invalid name (Microsoft Naming Convention): ", path);
log.logAndNotify("Skipping item - invalid name (Microsoft Naming Convention): ", path);
return;
}
// Check for bad whitespace items
if (!containsBadWhiteSpace(path)) {
log.log("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
log.logAndNotify("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
return;
}
// Check for HTML ASCII Codes as part of file name
if (!containsASCIIHTMLCodes(path)) {
log.log("Skipping item - invalid name (Contains HTML ASCII Code): ", path);
log.logAndNotify("Skipping item - invalid name (Contains HTML ASCII Code): ", path);
return;
}
@ -5862,26 +5862,26 @@ final class SyncEngine
}
// skip unexisting symbolic links
else if (!exists(readLink(to))) {
log.log("Skipping item - invalid symbolic link: ", to);
log.logAndNotify("Skipping item - invalid symbolic link: ", to);
return;
}
}
// Restriction and limitations about windows naming files
if (!isValidName(to)) {
log.log("Skipping item - invalid name (Microsoft Naming Convention): ", to);
log.logAndNotify("Skipping item - invalid name (Microsoft Naming Convention): ", to);
return;
}
// Check for bad whitespace items
if (!containsBadWhiteSpace(to)) {
log.log("Skipping item - invalid name (Contains an invalid whitespace item): ", to);
log.logAndNotify("Skipping item - invalid name (Contains an invalid whitespace item): ", to);
return;
}
// Check for HTML ASCII Codes as part of file name
if (!containsASCIIHTMLCodes(to)) {
log.log("Skipping item - invalid name (Contains HTML ASCII Code): ", to);
log.logAndNotify("Skipping item - invalid name (Contains HTML ASCII Code): ", to);
return;
}