Tobias FrölichandGitHub
1a529e9d5d
### Purpose This closes #9400 by always expanding tildes when parent/subdir checks are done. ### Testing I tested this by creating folders with paths to parent or subdirectories of the default folder that include a tilde in their path as shown in the attached screenshots. With this change, overlap will be detected regardless of wether or not tildes are used in other folder paths. ### Screenshots Default Folder:  Newly created folder (parent directory in this case)  --------- Signed-off-by: tobifroe <froeltob@pm.me>
58 lines
3.0 KiB
JavaScript
58 lines
3.0 KiB
JavaScript
angular.module('syncthing.core')
|
|
.directive('pathIsSubDir', function () {
|
|
return {
|
|
require: 'ngModel',
|
|
link: function (scope, elm, attrs, ctrl) {
|
|
ctrl.$validators.folderPathErrors = function (viewValue) {
|
|
// This function checks whether ydir is a subdirectory of xdir,
|
|
// e.g. it would return true if xdir = "/home/a", ydir = "/home/a/b".
|
|
// Tildes in both xdir and ydir are expanded for comparison
|
|
// so that e.g. xdir = "home/a/", ydir = "~/b" will return true.
|
|
function isSubDir(xdir, ydir) {
|
|
var tildeExpansionRegex = new RegExp(`^~${scope.system.pathSeparator}|^~/`);
|
|
xdir = xdir.replace(tildeExpansionRegex, `${scope.system.tilde}${scope.system.pathSeparator}`);
|
|
ydir = ydir.replace(tildeExpansionRegex, `${scope.system.tilde}${scope.system.pathSeparator}`);
|
|
var xdirArr = xdir.split(scope.system.pathSeparator);
|
|
var ydirArr = ydir.split(scope.system.pathSeparator);
|
|
if (xdirArr.slice(-1).pop() === "") {
|
|
xdirArr = xdirArr.slice(0, -1);
|
|
}
|
|
if (xdirArr.length > ydirArr.length) {
|
|
return false;
|
|
}
|
|
return xdirArr.map(function (e, i) {
|
|
return xdirArr[i] === ydirArr[i];
|
|
}).every(function (e) { return e });
|
|
}
|
|
|
|
scope.folderPathErrors.isSub = false;
|
|
scope.folderPathErrors.isParent = false;
|
|
scope.folderPathErrors.otherID = "";
|
|
scope.folderPathErrors.otherLabel = "";
|
|
if (!viewValue) {
|
|
return true;
|
|
}
|
|
for (var folderID in scope.folders) {
|
|
if (folderID === scope.currentFolder.id) {
|
|
continue;
|
|
}
|
|
if (isSubDir(scope.folders[folderID].path, viewValue)) {
|
|
scope.folderPathErrors.otherID = folderID;
|
|
scope.folderPathErrors.otherLabel = scope.folders[folderID].label;
|
|
scope.folderPathErrors.isSub = true;
|
|
break;
|
|
}
|
|
if (viewValue !== "" &&
|
|
isSubDir(viewValue, scope.folders[folderID].path)) {
|
|
scope.folderPathErrors.otherID = folderID;
|
|
scope.folderPathErrors.otherLabel = scope.folders[folderID].label;
|
|
scope.folderPathErrors.isParent = true;
|
|
break;
|
|
}
|
|
}
|
|
return true;
|
|
};
|
|
}
|
|
};
|
|
});
|