Revision: 4163
http://skim-app.svn.sourceforge.net/skim-app/?rev=4163&view=rev
Author: hofman
Date: 2008-07-09 07:36:32 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
Add convenience functions to create temporary folder.
Modified Paths:
--------------
trunk/Files_SKExtensions.h
trunk/Files_SKExtensions.m
trunk/SKPDFDocument.m
trunk/SKPSProgressController.m
Modified: trunk/Files_SKExtensions.h
===================================================================
--- trunk/Files_SKExtensions.h 2008-07-09 13:08:04 UTC (rev 4162)
+++ trunk/Files_SKExtensions.h 2008-07-09 14:36:32 UTC (rev 4163)
@@ -49,6 +49,8 @@
extern NSDate *SKFileModificationDateAtPath(NSString *path);
extern NSString *SKUniqueDirectoryCreating(NSString *basePath, BOOL create);
extern NSString *SKChewableItemsDirectory();
+extern NSString *SKUniqueTemporaryDirectory();
+extern NSString *SKUniqueChewableItemsDirectory();
extern OSErr FSDeleteContainerContents(const FSRef *container);
extern OSErr FSDeleteContainer(const FSRef *container);
Modified: trunk/Files_SKExtensions.m
===================================================================
--- trunk/Files_SKExtensions.m 2008-07-09 13:08:04 UTC (rev 4162)
+++ trunk/Files_SKExtensions.m 2008-07-09 14:36:32 UTC (rev 4163)
@@ -168,6 +168,14 @@
return chewableItemsDirectory;
}
+NSString *SKUniqueTemporaryDirectory() {
+ return SKUniqueDirectoryCreating(NSTemporaryDirectory(), YES);
+}
+
+NSString *SKUniqueChewableItemsDirectory() {
+ return SKUniqueDirectoryCreating(SKChewableItemsDirectory(), YES);
+}
+
// These are taken from MoreFilesX
struct FSDeleteContainerGlobals
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-07-09 13:08:04 UTC (rev 4162)
+++ trunk/SKPDFDocument.m 2008-07-09 14:36:32 UTC (rev 4163)
@@ -356,7 +356,7 @@
while (file = [fileEnum nextObject]) {
if ([ourExtensions containsObject:[[file pathExtension]
lowercaseString]] == NO) {
if (tmpPath == nil)
- tmpPath =
SKUniqueDirectoryCreating(NSTemporaryDirectory(), YES);
+ tmpPath = SKUniqueTemporaryDirectory();
[fm movePath:[path stringByAppendingPathComponent:file]
toPath:[tmpPath stringByAppendingPathComponent:file] handler:nil];
}
}
@@ -1002,7 +1002,7 @@
- (IBAction)emailArchive:(id)sender {
NSString *path = [[self fileURL] path];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path] &&
[self isDocumentEdited] == NO) {
- NSString *tmpDir =
SKUniqueDirectoryCreating(SKChewableItemsDirectory(), YES);
+ NSString *tmpDir = SKUniqueChewableItemsDirectory();
NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[[self
fileURL] path] lastPathComponent] stringByReplacingPathExtension:@"tgz"]];
if ([self saveArchiveToFile:tmpFile] == NO || [self
emailAttachmentFile:tmpFile] == NO)
NSBeep();
@@ -1076,7 +1076,7 @@
- (IBAction)emailDiskImage:(id)sender {
NSString *path = [[self fileURL] path];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path] &&
[self isDocumentEdited] == NO) {
- NSString *tmpDir =
SKUniqueDirectoryCreating(SKChewableItemsDirectory(), YES);
+ NSString *tmpDir = SKUniqueChewableItemsDirectory();
NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[[self
fileURL] path] lastPathComponent] stringByReplacingPathExtension:@"dmg"]];
[self saveDiskImageToFile:tmpFile email:YES];
} else {
Modified: trunk/SKPSProgressController.m
===================================================================
--- trunk/SKPSProgressController.m 2008-07-09 13:08:04 UTC (rev 4162)
+++ trunk/SKPSProgressController.m 2008-07-09 14:36:32 UTC (rev 4163)
@@ -347,7 +347,7 @@
NSString *dviFile = [info objectForKey:SKPSProgressDviFileKey];
NSString *commandPath = [info objectForKey:SKPSProgressDviToolPathKey];
NSString *commandName = [commandPath lastPathComponent];
- NSString *tmpDir = SKUniqueDirectoryCreating(NSTemporaryDirectory(), YES);
+ NSString *tmpDir = SKUniqueTemporaryDirectory();
BOOL outputPS = [commandName isEqualToString:@"dvips"];
NSString *outFile = [tmpDir stringByAppendingPathComponent:[[dviFile
lastPathComponent] stringByReplacingPathExtension:outputPS ? @"ps" : @"pdf"]];
NSArray *arguments = [commandName isEqualToString:@"dvipdf"] ? [NSArray
arrayWithObjects:dviFile, outFile, nil] : [NSArray arrayWithObjects:@"-o",
outFile, dviFile, nil];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
