Revision: 30014
http://sourceforge.net/p/bibdesk/svn/30014
Author: hofman
Date: 2026-02-18 16:54:52 +0000 (Wed, 18 Feb 2026)
Log Message:
-----------
comine conditions, don't use !
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2026-02-18 15:45:23 UTC (rev 30013)
+++ trunk/bibdesk/BDSKFiler.m 2026-02-18 16:54:52 UTC (rev 30014)
@@ -438,19 +438,15 @@
pathContent = [[[[resolvedURL
URLByDeletingLastPathComponent] URLByAppendingPathComponent:pathContent
isDirectory:NO] URLByStandardizingPath] path];
pathContent = [pathContent
relativePathFromPath:[[resolvedNewURL path] stringByDeletingLastPathComponent]];
}
- if(![fm createSymbolicLinkAtURL:resolvedNewURL
withDestinationURL:[NSURL fileURLWithPath:pathContent isDirectory:NO]
error:NULL]){
+ if(NO == [fm createSymbolicLinkAtURL:resolvedNewURL
withDestinationURL:[NSURL fileURLWithPath:pathContent isDirectory:NO]
error:NULL]){
status = NSLocalizedString(@"Unable to move symbolic
link.", @"AutoFile error message");
statusFlag = BDSKFilerErrorCannotMoveFile;
- }else{
- if(![fm removeItemAtURL:resolvedURL error:NULL]){
- if ((ignoredError & BDSKFilerErrorCannotRemoveFile) ==
0){
- status = NSLocalizedString(@"Unable to remove
original.", @"AutoFile error message");
- fix = NSLocalizedString(@"Copy original file.",
@"AutoFile fix");
- statusFlag = BDSKFilerErrorCannotRemoveFile;
- //cleanup: remove new file
- [fm removeItemAtURL:resolvedNewURL error:NULL];
- }
- }
+ }else if(NO == [fm removeItemAtURL:resolvedURL error:NULL] &&
(ignoredError & BDSKFilerErrorCannotRemoveFile) == 0){
+ status = NSLocalizedString(@"Unable to remove original.",
@"AutoFile error message");
+ fix = NSLocalizedString(@"Copy original file.", @"AutoFile
fix");
+ statusFlag = BDSKFilerErrorCannotRemoveFile;
+ //cleanup: remove new file
+ [fm removeItemAtURL:resolvedNewURL error:NULL];
}
}else if([fm moveItemAtURL:resolvedURL toURL:resolvedNewURL
error:NULL]){
if([[resolvedURL pathExtension]
isCaseInsensitiveEqual:@"pdf"]){
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
