Changeset 10539

Timestamp:

Apr 28, 2010, 11:03:38 AM (12 years ago)

Author:

livings124

Message:

when downloading the blocklist, don't explicitly overwrite an existing file

Location:

trunk/macosx

Files:

• BlocklistDownloader.h (modified) (1 diff)
• BlocklistDownloader.m (modified) (5 diffs)

trunk/macosx/BlocklistDownloader.h

@@ -40 +40 @@
     BlocklistDownloaderViewController * fViewController;
     
+    NSString * fDestination;
     NSUInteger fCurrentSize;
     long long fExpectedSize;

trunk/macosx/BlocklistDownloader.m

@@ -29 +29 @@
 
 #define LIST_URL @"http://update.transmissionbt.com/level1.gz"
-#define DESTINATION [NSTemporaryDirectory() stringByAppendingPathComponent: @"level1.gz"]
+#define FILE_NAME @"level1.gz"
 
 @interface BlocklistDownloader (Private)
@@ -80 +80 @@
 {
     [fDownload release];
+    [fDestination release];
     [super dealloc];
 }
@@ -93 +94 @@
     fDownloader = nil;
     [self release];
+}
+
+- (void) download: (NSURLDownload *) download didCreateDestination: (NSString *) path
+{
+    fDestination = [path retain];
 }
 
@@ -140 +146 @@
     
     fDownload = [[NSURLDownload alloc] initWithRequest: request delegate: self];
-    [fDownload setDestination: DESTINATION allowOverwrite: YES];
+    [fDownload setDestination: [NSTemporaryDirectory() stringByAppendingPathComponent: FILE_NAME] allowOverwrite: NO];
 }
 
@@ -150 +156 @@
     
     //process data
-    tr_blocklistSetContent([PrefsController handle], [DESTINATION UTF8String]);
+    NSAssert(fDestination != nil, @"the blocklist file destination has not been specified");
+    tr_blocklistSetContent([PrefsController handle], [fDestination UTF8String]);
     
     //delete downloaded file
-    [[NSFileManager defaultManager] removeItemAtPath: DESTINATION error: NULL];
+    [[NSFileManager defaultManager] removeItemAtPath: fDestination error: NULL];
     
     [fViewController setFinished];