Revision: 28383
http://sourceforge.net/p/bibdesk/svn/28383
Author: hofman
Date: 2023-10-02 15:24:39 +0000 (Mon, 02 Oct 2023)
Log Message:
-----------
bitmap compare ignored error mask rather than full equality
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2023-10-02 14:33:56 UTC (rev 28382)
+++ trunk/bibdesk/BDSKFiler.m 2023-10-02 15:24:39 UTC (rev 28383)
@@ -378,7 +378,7 @@
statusFlag = BDSKCannotResolveAliasErrorMask;
}else if([resolvedNewURL checkResourceIsReachableAndReturnError:NULL]){
if([resolvedURL checkResourceIsReachableAndReturnError:NULL]){
- if(ignoredFlag == BDSKTargetFileExistsErrorMask){
+ if((ignoredFlag & BDSKTargetFileExistsErrorMask) != 0){
NSURL *backupURL = [self
desktopFileURLWithBasename:[resolvedNewURL lastPathComponent]];
if(NO == [self moveItemAtURL:resolvedNewURL toURL:backupURL
ignoring:0 error:NULL] &&
[resolvedNewURL
checkResourceIsReachableAndReturnError:NULL] &&
@@ -399,7 +399,7 @@
}
statusFlag = BDSKTargetFileExistsErrorMask;
}
- }else if(ignoredFlag == (BDSKSourceFileDoesNotExistErrorMask |
BDSKTargetFileExistsErrorMask)){
+ }else if((ignoredFlag & BDSKSourceFileDoesNotExistErrorMask) != 0){
ignoreMove = YES;
}else{
status = NSLocalizedString(@"Original file does not exist, file
exists at target location.", @"AutoFile error message");
@@ -409,7 +409,7 @@
}else if(NO == [resolvedURL checkResourceIsReachableAndReturnError:NULL]){
status = NSLocalizedString(@"Original file does not exist.",
@"AutoFile error message");
statusFlag = BDSKSourceFileDoesNotExistErrorMask;
- }else if(ignoredFlag != BDSKCannotMoveFileErrorMask && NO == [self
isDeletableFileAtPath:[resolvedURL path]]){
+ }else if((ignoredFlag & BDSKCannotMoveFileErrorMask) == 0 && NO == [self
isDeletableFileAtPath:[resolvedURL path]]){
status = NSLocalizedString(@"Unable to move read-only file.",
@"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.", @"AutoFile fix");
statusFlag = BDSKCannotMoveFileErrorMask;
@@ -449,7 +449,7 @@
statusFlag = BDSKCannotMoveFileErrorMask;
}else{
if(![self removeItemAtURL:resolvedURL error:NULL]){
- if (ignoredFlag != BDSKCannotRemoveFileErrorMask){
+ if ((ignoredFlag & BDSKCannotRemoveFileErrorMask) ==
0){
status = NSLocalizedString(@"Unable to remove
original.", @"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.",
@"AutoFile fix");
statusFlag = BDSKCannotRemoveFileErrorMask;
@@ -467,7 +467,7 @@
}
}
}else if([resolvedNewURL
checkResourceIsReachableAndReturnError:NULL]){ // error remove original file
- if(ignoredFlag != BDSKCannotRemoveFileErrorMask){
+ if((ignoredFlag & BDSKCannotRemoveFileErrorMask) == 0){
status = NSLocalizedString(@"Unable to remove original
file.", @"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.", @"AutoFile
fix");
statusFlag = BDSKCannotRemoveFileErrorMask;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
