Revision: 15806
http://sourceforge.net/p/skim-app/code/15806
Author: hofman
Date: 2025-11-17 17:43:12 +0000 (Mon, 17 Nov 2025)
Log Message:
-----------
archived data can contain date
Modified Paths:
--------------
trunk/SkimNotes/SKNDocument.m
trunk/SkimNotes/SKNUtilities.m
trunk/SkimNotes/skimnotes.m
Modified: trunk/SkimNotes/SKNDocument.m
===================================================================
--- trunk/SkimNotes/SKNDocument.m 2025-11-17 17:37:35 UTC (rev 15805)
+++ trunk/SkimNotes/SKNDocument.m 2025-11-17 17:43:12 UTC (rev 15806)
@@ -127,7 +127,7 @@
[ws type:docType conformsToType:SKNSkimNotesDocumentType]) {
data = [[SKNSkimReader sharedReader] SkimNotesAtURL:absoluteURL];
if (data) {
- @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSColor class], [NSFont class],
[NSAttributedString class], [NSImage class], nil] fromData:data error:NULL]; }
+ @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSDate class], [NSColor class], [NSFont
class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
@catch (id e) {}
if (array == nil)
array = [NSPropertyListSerialization propertyListWithData:data
options:NSPropertyListImmutable format:NULL error:NULL];
@@ -143,7 +143,7 @@
[ws type:docType conformsToType:SKNSkimNotesDocumentType]) {
data = [[SKNXPCSkimReader sharedReader] SkimNotesAtURL:absoluteURL];
if (data) {
- @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSColor class], [NSFont class],
[NSAttributedString class], [NSImage class], nil] fromData:data error:NULL]; }
+ @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSDate class], [NSColor class], [NSFont
class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
@catch (id e) {}
if (array == nil)
array = [NSPropertyListSerialization propertyListWithData:data
options:NSPropertyListImmutable format:NULL error:NULL];
@@ -158,7 +158,7 @@
[[SKNXPCSkimReader sharedReader] readSkimNotesAtURL:absoluteURL
reply:(NSData *data){
if (data) {
NSArray *arr = nil;
- @try { arr = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSColor class],
[NSFont class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
+ @try { arr = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSDate class],
[NSColor class], [NSFont class], [NSAttributedString class], [NSImage class],
nil] fromData:data error:NULL]; }
@catch (id e) {}
if (arr == nil)
arr = [NSPropertyListSerialization
propertyListWithData:data options:NSPropertyListImmutable format:NULL
error:NULL];
@@ -227,7 +227,7 @@
}
if (data) {
if ([data length]) {
- @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSColor class], [NSFont class],
[NSAttributedString class], [NSImage class], nil] fromData:data error:NULL]; }
+ @try { array = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [NSDictionary class], [NSString class],
[NSNumber class], [NSData class], [NSDate class], [NSColor class], [NSFont
class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
@catch (id e) {}
if (array == nil)
array = [NSPropertyListSerialization propertyListWithData:data
options:NSPropertyListImmutable format:NULL error:NULL];
Modified: trunk/SkimNotes/SKNUtilities.m
===================================================================
--- trunk/SkimNotes/SKNUtilities.m 2025-11-17 17:37:35 UTC (rev 15805)
+++ trunk/SkimNotes/SKNUtilities.m 2025-11-17 17:43:12 UTC (rev 15806)
@@ -248,7 +248,7 @@
} else
#endif
{
- @try { noteDicts = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSColor class],
[NSFont class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
+ @try { noteDicts = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSDate class],
[NSColor class], [NSFont class], [NSAttributedString class], [NSImage class],
nil] fromData:data error:NULL]; }
@catch (id e) {}
}
if ([noteDicts isKindOfClass:[NSArray class]] == NO) {
Modified: trunk/SkimNotes/skimnotes.m
===================================================================
--- trunk/SkimNotes/skimnotes.m 2025-11-17 17:37:35 UTC (rev 15805)
+++ trunk/SkimNotes/skimnotes.m 2025-11-17 17:43:12 UTC (rev 15806)
@@ -580,7 +580,7 @@
} else
#endif
{
- @try { inNotes = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSColor class],
[NSFont class], [NSAttributedString class], [NSImage class], nil] fromData:data
error:NULL]; }
+ @try { inNotes = [NSKeyedUnarchiver
unarchivedObjectOfClasses:[NSSet setWithObjects:[NSArray class], [NSDictionary
class], [NSString class], [NSNumber class], [NSData class], [NSDate class],
[NSColor class], [NSFont class], [NSAttributedString class], [NSImage class],
nil] fromData:data error:NULL]; }
@catch (id e) {}
}
if (inNotes == nil) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit