Revision: 28916
http://sourceforge.net/p/bibdesk/svn/28916
Author: hofman
Date: 2024-05-16 17:34:04 +0000 (Thu, 16 May 2024)
Log Message:
-----------
get template file type from main page URL
Modified Paths:
--------------
trunk/bibdesk/BDSKGroup+Scripting.m
trunk/bibdesk/BDSKTemplate.h
trunk/bibdesk/BDSKTemplate.m
trunk/bibdesk/BibDocument+Scripting.m
Modified: trunk/bibdesk/BDSKGroup+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKGroup+Scripting.m 2024-05-16 17:13:14 UTC (rev 28915)
+++ trunk/bibdesk/BDSKGroup+Scripting.m 2024-05-16 17:34:04 UTC (rev 28916)
@@ -172,7 +172,7 @@
} else if ([templateStyle isKindOfClass:[NSString class]] ) {
template = [BDSKTemplate templateForStyle:templateStyle];
} else if ([templateStyle isKindOfClass:[NSURL class]] ) {
- template = [BDSKTemplate templateWithName:@""
mainPageURL:templateStyle fileType:[templateStyle pathExtension] ?: [fileURL
pathExtension] ?: @"txt"];
+ template = [BDSKTemplate templateWithName:@""
mainPageURL:templateStyle];
} else if ([templateString isKindOfClass:[NSString class]] ) {
template = [BDSKTemplate templateWithString:templateString
fileType:[fileURL pathExtension] ?: @"txt"];
} else if ([templateAttrString isKindOfClass:[NSAttributedString class]] )
{
Modified: trunk/bibdesk/BDSKTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTemplate.h 2024-05-16 17:13:14 UTC (rev 28915)
+++ trunk/bibdesk/BDSKTemplate.h 2024-05-16 17:34:04 UTC (rev 28916)
@@ -86,7 +86,7 @@
// export templates
+ (BDSKTemplate *)templateForStyle:(NSString *)styleName;
-+ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL fileType:(NSString *)fileType;
++ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL;
+ (BDSKTemplate *)templateWithString:(NSString *)string fileType:(NSString
*)fileType;
+ (BDSKTemplate *)templateWithAttributedString:(NSAttributedString
*)attributedString fileType:(NSString *)fileType;
Modified: trunk/bibdesk/BDSKTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTemplate.m 2024-05-16 17:13:14 UTC (rev 28915)
+++ trunk/bibdesk/BDSKTemplate.m 2024-05-16 17:34:04 UTC (rev 28916)
@@ -197,17 +197,17 @@
// RTF template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rtfExportTemplate.rtf" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RTF
template", @"template name") mainPageURL:fileURL fileType:@"rtf"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RTF
template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// RTFD template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rtfdExportTemplate.rtfd" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RTFD
template", @"template name") mainPageURL:fileURL fileType:@"rtfd"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RTFD
template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// HTML template
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlExportTemplate.html" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default HTML
template", @"template name") mainPageURL:fileURL fileType:@"html"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default HTML
template", @"template name") mainPageURL:fileURL];
// a user could potentially have templates for multiple BibTeX types; we
could add all of those, as well
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlItemExportTemplate.html" isDirectory:NO];
[template addChildWithURL:fileURL role:BDSKTemplateDefaultItemString];
@@ -217,17 +217,17 @@
// RSS template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rssExportTemplate.rss" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RSS
template", @"template name") mainPageURL:fileURL fileType:@"rss"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default RSS
template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// Doc template
fileURL = [templatesURL
URLByAppendingPathComponent:@"docExportTemplate.doc" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default Doc
template", @"template name") mainPageURL:fileURL fileType:@"doc"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default Doc
template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// Preview template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rtfPreviewTemplate.rtf" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default
preview template", @"template name") mainPageURL:fileURL fileType:@"rtf"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default
preview template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
return itemNodes;
@@ -243,17 +243,17 @@
// Citation template
fileURL = [templatesURL
URLByAppendingPathComponent:@"citeServiceTemplate.txt" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Citation
Service template", @"template name") mainPageURL:fileURL fileType:@"txt"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Citation
Service template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// Text template
fileURL = [templatesURL
URLByAppendingPathComponent:@"textServiceTemplate.txt" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"Text Service
template", @"template name") mainPageURL:fileURL fileType:@"txt"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"Text Service
template", @"template name") mainPageURL:fileURL];
[itemNodes addObject:template];
// RTF template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rtfServiceTemplate.rtf" isDirectory:NO];
- template = [BDSKTemplate templateWithName:NSLocalizedString(@"RTF Service
template", @"template name") mainPageURL:fileURL fileType:@"rtf"];
+ template = [BDSKTemplate templateWithName:NSLocalizedString(@"RTF Service
template", @"template name") mainPageURL:fileURL];
[template setValue:NSLocalizedString(@"RTF Service template", @"template
name") forKey:BDSKTemplateNameString];
fileURL = [templatesURL URLByAppendingPathComponent:@"rtfServiceTemplate
default item.rtf" isDirectory:NO];
[template addChildWithURL:fileURL role:BDSKTemplateDefaultItemString];
@@ -349,7 +349,7 @@
return;
NSMutableArray *mutableTemplates = [templates mutableCopy];
- [mutableTemplates insertObject:[BDSKTemplate templateWithName:defaultName
mainPageURL:[self defaultPreviewTemplateURL] fileType:@"rtf"] atIndex:idx];
+ [mutableTemplates insertObject:[BDSKTemplate templateWithName:defaultName
mainPageURL:[self defaultPreviewTemplateURL]] atIndex:idx];
[self setExportTemplates:mutableTemplates];
}
@@ -425,11 +425,11 @@
return [[self serviceTemplates] lastObject];
}
-+ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL fileType:(NSString *)fileType;
++ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL;
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
[template setValue:name forKey:BDSKTemplateNameString];
- [template setValue:fileType forKey:BDSKTemplateRoleString];
+ [template setValue:[[fileURL pathExtension] lowercaseString]
forKey:BDSKTemplateRoleString];
[template addChildWithURL:fileURL role:BDSKTemplateMainPageString];
return template;
}
Modified: trunk/bibdesk/BibDocument+Scripting.m
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.m 2024-05-16 17:13:14 UTC (rev
28915)
+++ trunk/bibdesk/BibDocument+Scripting.m 2024-05-16 17:34:04 UTC (rev
28916)
@@ -937,7 +937,7 @@
} else if ([templateStyle isKindOfClass:[NSString class]] ) {
template = [BDSKTemplate templateForStyle:templateStyle];
} else if ([templateStyle isKindOfClass:[NSURL class]] ) {
- template = [BDSKTemplate templateWithName:@""
mainPageURL:templateStyle fileType:[templateStyle pathExtension] ?: [fileURL
pathExtension] ?: @"txt"];
+ template = [BDSKTemplate templateWithName:@""
mainPageURL:templateStyle];
} else if ([templateString isKindOfClass:[NSString class]] ) {
template = [BDSKTemplate templateWithString:templateString
fileType:[fileURL pathExtension] ?: @"txt"];
} else if ([templateAttrString isKindOfClass:[NSAttributedString class]] )
{
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
