Changeset 1197

Timestamp:

02/28/2010 04:03:40 PM (2 years ago)

Author:

gbooker

Message:

Added autorelease pools to reduce temporary memory usage and made sure containing directory exists on a file download.

Location:

trunk/SapphireFrappliance

Files:

• FRAppliance/SapphireURLLoader.m (modified) (3 diffs)
• MetaDataImporting/SapphireScraper.m (modified) (3 diffs)

trunk/SapphireFrappliance/FRAppliance/SapphireURLLoader.m

@@ -20 +20 @@
 
 #import "SapphireURLLoader.h"
+#import "NSFileManager-Extensions.h"
 
 #define MAX_WORKERS             10
@@ -85 +86 @@
         while((invoke = [invokeEnum nextObject]) != nil)
         {
+                NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
                 [invoke setArgument:&loadedObject atIndex:2];
                 [invoke invoke];
+                [pool drain];
         }
         [informers release];
@@ -403 +406 @@
 - (void)saveDataAtURL:(NSString *)url toFile:(NSString *)path
 {
+        [[NSFileManager defaultManager] constructPath:[path stringByDeletingLastPathComponent]];
         [self loadDataURL:url withTarget:self selector:@selector(saveData:toFile:) object:path];
 }

trunk/SapphireFrappliance/MetaDataImporting/SapphireScraper.m

@@ -571 +571 @@
 - (int)parseElement:(NSXMLElement *)element
 {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         NSArray *regexChildren = nil;
         NSString *value = nil;
@@ -602 +603 @@
         
         [self parseExpression:element withInput:input intoDest:result andAppend:append];
+        [pool drain];
         
         return result;
@@ -620 +622 @@
         }
         int dest = integerAttributeWithDefault(functionElement, @"dest", 1);
-        NSString *ret = scraperBuffers[dest - 1];
+        NSString *ret = [[scraperBuffers[dest - 1] retain] autorelease];
         if(booleanAttributeWithDefault(functionElement, @"clearbuffers", YES))
                 [self clearBuffers];