Merge lp:~threeve/ubuntuone-ios-files/background-processing into lp:ubuntuone-ios-files

[Jason Foreman]

Do node loading and parsing in the background to avoid UI blocking.

[lp:~threeve/ubuntuone-ios-files/background-processing]

32. By Jason Foreman on 2011-12-09

Merge lp:~urbanape/ubuntuone-ios-files/background-processing

[Zachery Bir (urbanape)]

LAND, LAND

review: Approve

=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-12-07 14:26:35 +0000
+++ Files.xcodeproj/project.pbxproj	2011-12-09 20:00:29 +0000
@@ -640,6 +640,13 @@
 				96CC17E414180C5F00EFC1BA /* U1FilesClient.m */,
 				91B3F2D7141FC9BE00939B3C /* U1AutoUploadsManager.h */,
 				91A5E2DB142A70DF00EAAC2B /* U1AutoUploadsManager.m */,
+				910393E61475B118004DE69D /* U1AutoUploadOperation.h */,
+				910393E71475B118004DE69D /* U1AutoUploadOperation.m */,
+				91A007E8147559F200D0E5FF /* U1AssetRepresenationDataProvider.h */,
+				91A007E9147559F200D0E5FF /* U1AssetRepresenationDataProvider.m */,
+				916E0080143C9A390037F6D3 /* U1UploadsPoolViewController.h */,
+				916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */,
+				9190AAF31444CA0A0063614A /* U1UploadsPoolViewController.xib */,
 				969EF22613F8C10C00CEF6CB /* U1VolumesViewController.h */,
 				969EF22713F8C10C00CEF6CB /* U1VolumesViewController.m */,
 				969EF22813F8C10C00CEF6CB /* U1VolumesViewController.xib */,
@@ -654,20 +661,13 @@
 				960D4627140D8B4400B73177 /* U1FriendlyDateValueTransformer.m */,
 				91A5E2DD142B727500EAAC2B /* U1UploadOperation.h */,
 				91A5E2DE142B727500EAAC2B /* U1UploadOperation.m */,
-				910393E61475B118004DE69D /* U1AutoUploadOperation.h */,
-				910393E71475B118004DE69D /* U1AutoUploadOperation.m */,
 				965D7EB71429690C00E4754F /* U1NavigationBar.h */,
 				965D7EB81429690C00E4754F /* U1NavigationBar.m */,
 				96A169A21430D53600E4C990 /* U1LocalFileInfo.h */,
 				96A169A31430D53600E4C990 /* U1LocalFileInfo.m */,
-				916E0080143C9A390037F6D3 /* U1UploadsPoolViewController.h */,
-				916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */,
-				9190AAF31444CA0A0063614A /* U1UploadsPoolViewController.xib */,
 				91EC184B145B8E3A00DF31F4 /* U1SettingsViewController.h */,
 				91EC184C145B8E3A00DF31F4 /* U1SettingsViewController.m */,
 				91EC184D145B8E3B00DF31F4 /* U1SettingsViewController.xib */,
-				91A007E8147559F200D0E5FF /* U1AssetRepresenationDataProvider.h */,
-				91A007E9147559F200D0E5FF /* U1AssetRepresenationDataProvider.m */,
 				9623AE6014868F7000ACDF1C /* U1ReportingInputStream.h */,
 				9623AE6114868F7000ACDF1C /* U1ReportingInputStream.m */,
 				9172C86E148FA4F600FC7737 /* U1TopPinningLabel.h */,
@@ -1198,8 +1198,8 @@
 					armv6,
 					armv7,
 				);
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Canonical Group Limited";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Canonical Group Limited";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
@@ -1214,8 +1214,8 @@
 					"\"$(SRCROOT)/Dependencies/TestFlightSDK\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "AC4373DF-1FF8-4EA3-A098-888460CA563B";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "AC4373DF-1FF8-4EA3-A098-888460CA563B";
+				PROVISIONING_PROFILE = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm6 armv7";
 				WRAPPER_EXTENSION = app;

=== modified file 'Files/Files-Prefix.pch'
--- Files/Files-Prefix.pch	2011-10-26 03:39:52 +0000
+++ Files/Files-Prefix.pch	2011-12-09 20:00:29 +0000
@@ -15,14 +15,16 @@
 
 #import <Availability.h>
 
-#ifndef __IPHONE_3_0
-#warning "This project uses features only available in iPhone SDK 3.0 and later."
+#ifndef __IPHONE_4_0
+#warning "This project uses features only available in iPhone SDK 4.0 and later."
 #endif
 
 #ifdef __OBJC__
 
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
 #import "TestFlight.h"
 #import "NSDictionary+U1Additions.h"
 

=== modified file 'Files/U1AssetRepresenationDataProvider.h'
--- Files/U1AssetRepresenationDataProvider.h	2011-11-18 16:27:59 +0000
+++ Files/U1AssetRepresenationDataProvider.h	2011-12-09 20:00:29 +0000
@@ -14,9 +14,10 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <Foundation/Foundation.h>
-#import <AssetsLibrary/AssetsLibrary.h>
-#import "U1FilesClient.h"
+
+#import "U1FilesService.h"
+
 
 @interface U1AssetRepresenationDataProvider : NSObject <U1UploadDataProvider>
-@property (retain) ALAssetRepresentation *representation;
+@property (retain) NSURL *assetURL;
 @end

=== modified file 'Files/U1AssetRepresenationDataProvider.m'
--- Files/U1AssetRepresenationDataProvider.m	2011-11-18 16:27:59 +0000
+++ Files/U1AssetRepresenationDataProvider.m	2011-12-09 20:00:29 +0000
@@ -15,22 +15,61 @@
 
 #import "U1AssetRepresenationDataProvider.h"
 
+#import <AssetsLibrary/AssetsLibrary.h>
+#import <MobileCoreServices/MobileCoreServices.h>
+
+
 @implementation U1AssetRepresenationDataProvider
-
-@synthesize representation;
+{
+	ALAssetsLibrary *library;
+}
+
+@synthesize assetURL;
+
+- (id)init;
+{
+	self = [super init];
+	if (self == nil)
+		return nil;
+	library = [[ALAssetsLibrary alloc] init];
+	return self;
+}
 
 - (void)dealloc;
 {
-	[representation release];
+	[assetURL release];
+	[library release];
 	[super dealloc];
 }
 
-- (NSData *)serializeData;
+- (void)prepareDataStreamWithBlock:(void(^)(NSInputStream *dataStream, NSString *mimeType, NSUInteger length, NSError *error))block;
 {
-	Byte *buffer = (Byte*)malloc(self.representation.size);
-	NSUInteger length = [self.representation getBytes:buffer fromOffset:0 length:self.representation.size error:nil];
-	NSData *assetData = [NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
-	return assetData;
+	[library assetForURL:self.assetURL resultBlock:^(ALAsset *asset) {
+		
+		if (asset == nil)
+		{
+			if (block)
+			{
+				NSError *error = [NSError errorWithDomain:@"nonexistentAsset" code:1 userInfo:nil];
+				block(nil, nil, nil, error);
+			}
+		}
+		else
+		{
+			ALAssetRepresentation *representation = [asset defaultRepresentation];
+			uint8_t *buffer = (uint8_t*)malloc(representation.size);
+			NSUInteger length = [representation getBytes:buffer fromOffset:0 length:representation.size error:nil];
+			NSData *imageData = [NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
+			NSString *mimeType = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
+			NSInputStream *dataStream = [NSInputStream inputStreamWithData:imageData];
+			if (block)
+				block(dataStream, mimeType, length, nil);
+		}
+		
+	} failureBlock:^(NSError *error) {
+		if (block)
+			block(nil, nil, 0, error);
+	}];
 }
 
 @end

=== modified file 'Files/U1AutoUploadOperation.h'
--- Files/U1AutoUploadOperation.h	2011-11-18 16:28:43 +0000
+++ Files/U1AutoUploadOperation.h	2011-12-09 20:00:29 +0000
@@ -14,17 +14,22 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <Foundation/Foundation.h>
-#import "U1FilesClient.h"
+#import <CoreData/CoreData.h>
 
+@protocol U1UploadDataProvider;
 @class U1Asset;
 @class U1FolderNode;
 
+
 @interface U1AutoUploadOperation : NSOperation
 
 @property (retain) id<U1UploadDataProvider> dataProvider;
-@property (retain) U1Asset *u1asset;
-@property (retain) U1FolderNode *folder;
+
+@property (retain) NSManagedObjectID *assetID;
+@property (retain) NSManagedObjectID *folderID;
+
 @property (retain) NSString *filename;
 @property (retain) NSString *contentType;
 @property (atomic) NSOperationQueuePriority priority;
+
 @end

=== modified file 'Files/U1AutoUploadOperation.m'
--- Files/U1AutoUploadOperation.m	2011-12-06 20:53:05 +0000
+++ Files/U1AutoUploadOperation.m	2011-12-09 20:00:29 +0000
@@ -13,11 +13,14 @@
 //  You should have received a copy of the GNU Affero General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#import "U1AutoUploadOperation.h"
+
 #import "U1Asset.h"
-#import "U1AutoUploadOperation.h"
 #import "U1DataRepository.h"
 #import "U1FileNode.h"
 #import "U1FilesClient.h"
+#import "U1FilesService.h"
+
 
 @interface U1AutoUploadOperation ()
 @property (getter=isExecuting) BOOL executing;
@@ -26,9 +29,10 @@
 - (void)beginUpload;
 @end
 
+
 @implementation U1AutoUploadOperation
 
-@synthesize executing, finished, dataProvider, u1asset, folder, filename, contentType, priority;
+@synthesize executing, finished, dataProvider, assetID, folderID, filename, contentType, priority;
 
 - (BOOL)isConcurrent;
 {
@@ -64,32 +68,38 @@
 - (void)dealloc
 {
 	[dataProvider release];
-	[u1asset release];
-	[folder release];
 	[filename release];
 	[contentType release];
+	[assetID release];
+	[folderID release];
     [super dealloc];
 }
 
 - (void)beginUpload;
 {
-	dispatch_async(dispatch_get_main_queue(), ^(void) {
-		[[U1FilesClient sharedFilesClient] uploadContentDataProvider:dataProvider toFolder:self.folder withResourceName:self.filename withContentType:self.contentType withPriority:self.priority progressBlock:^(long long bytesUploaded, long long totalBytes) {
-		
+	U1DataRepository *dataRepository = [U1DataRepository sharedDataRepository];
+	[dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
+		
+		U1Asset *asset = (id)[context objectWithID:self.assetID];
+		U1FolderNode *folder = (id)[context objectWithID:self.folderID];
+		
+		[[U1FilesClient sharedFilesClient] uploadContentDataProvider:dataProvider toFolder:folder withResourceName:self.filename withContentType:self.contentType withPriority:self.priority progressBlock:^(long long bytesUploaded, long long totalBytes) {
+			
 		} completionBlock:^(U1FileNode *fileNode, NSError *error) {
 			if (error)
 			{
 				NSLog(@"auto-upload failed: %@", error);
 			}			
-
+			
 			dispatch_async(dispatch_get_main_queue(), ^(void) {
 				
-				self.u1asset.generation = self.u1asset.fileNode.generation;
-				[[U1DataRepository sharedDataRepository] save:NULL];
+				asset.generation = asset.fileNode.generation;
+				[dataRepository save:NULL];
 				[self finishExecuting];
 			});
 		}];
-	});
+		
+	}];
 }
 
 @end

=== modified file 'Files/U1AutoUploadsManager.h'
--- Files/U1AutoUploadsManager.h	2011-12-06 18:03:30 +0000
+++ Files/U1AutoUploadsManager.h	2011-12-09 20:00:29 +0000
@@ -29,8 +29,8 @@
 + (U1AutoUploadsManager *)sharedAutoUploadsManager;
 - (int)numberOfAssets;
 - (void)checkForNewAssets;
-- (U1Asset *)createU1AssetWithAsset:(ALAsset *)asset group:(ALAssetsGroup *)group URLString:(NSString *)urlString fileName:(NSString *)filename inFolder:(U1FolderNode *)folderNode;
 - (void)thumbnailForNode:(U1FileNode *)fileNode completionBlock:(void(^)(CGImageRef thumbnail))completionBlock;
 - (NSOperation*)queueAutoUploadForAsset:(U1Asset *)assetToUpload andRepresentation:(ALAssetRepresentation *)representation;
 - (int)pendingCount;
+- (U1Asset *)createU1AssetWithAsset:(ALAsset *)asset group:(ALAssetsGroup *)group URLString:(NSString *)urlString fileName:(NSString *)filename inFolder:(U1FolderNode *)folderNode context:(NSManagedObjectContext*)context;
 @end

=== modified file 'Files/U1AutoUploadsManager.m'
--- Files/U1AutoUploadsManager.m	2011-12-07 20:42:55 +0000
+++ Files/U1AutoUploadsManager.m	2011-12-09 20:00:29 +0000
@@ -29,9 +29,11 @@
 #import "U1FolderNode.h"
 #import "U1Volume.h"
 
+
 @interface U1AutoUploadsManager ()
 @property (retain) U1FilesClient *filesClient;
 @property (retain) NSOperationQueue *autoUploadPreparationQueue;
+@property (retain) NSManagedObjectID *autoUploadsFolderID;
 - (void)walkAssetsInLibrary;
 - (NSString *)generateFilenameForAsset:(ALAsset *)asset;
 - (void)processAssetBatch:(NSArray*)batch inGroup:(ALAssetsGroup *)group toArray:(NSMutableArray*)ops;
@@ -43,16 +45,16 @@
 - (void)volumesFetched:(NSNotification *)notification;
 @end
 
-static U1AutoUploadsManager *sharedAutoUploadsManager = nil;
 
 @implementation U1AutoUploadsManager
 
 @synthesize filesClient, dataRepository, assetsLibrary;
-@synthesize autoUploadPreparationQueue;
+@synthesize autoUploadPreparationQueue, autoUploadsFolderID;
 @synthesize remoteUploadFolder;
 
 + (U1AutoUploadsManager *)sharedAutoUploadsManager;
 {
+	static U1AutoUploadsManager *sharedAutoUploadsManager = nil;
 	if (sharedAutoUploadsManager == nil)
 	{
 		sharedAutoUploadsManager = [[U1AutoUploadsManager alloc] init];
@@ -86,6 +88,7 @@
 	[assetsLibrary release];
 	[autoUploadPreparationQueue release];
 	[remoteUploadFolder release];
+	[autoUploadsFolderID release];
     [super dealloc];
 }
 
@@ -169,6 +172,7 @@
 									 if (error == nil)
 									 {
 										 self.remoteUploadFolder = volume.rootFolder;
+										 self.autoUploadsFolderID = [volume.rootFolder objectID];
 										 [self fetchRemoteUploadFolderContents];
 									 }
 									 else
@@ -180,6 +184,7 @@
 		else
 		{
 			self.remoteUploadFolder = volume.rootFolder;
+			self.autoUploadsFolderID = [volume.rootFolder objectID];
 			[self fetchRemoteUploadFolderContents];
 		}
 	}
@@ -200,6 +205,7 @@
 										 if (resultsDataSourceType == U1DataSourceRemote)
 										 {
 											 [childrenResultsController performFetch:NULL];
+											 // TODO: this
 											 [self queuePreviousUploads];
 											 [self checkForNewAssets];
 										 }
@@ -218,49 +224,56 @@
 	
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	
-	if ([defaults boolForKey:@"auto_upload"]) {
-		[self.assetsLibrary enumerateGroupsWithTypes:ALAssetsGroupSavedPhotos
-										  usingBlock:^(ALAssetsGroup *group, BOOL *stop) {
-											  NSMutableArray *ops = [NSMutableArray array];
-											  __block NSMutableArray *batch = [[NSMutableArray alloc] initWithCapacity:50];
-											  [group enumerateAssetsUsingBlock:^(ALAsset *asset, NSUInteger index, BOOL *stop) {
-												  if (asset == nil)
-												  {
-													  return;
-												  }
-												  
-												  [batch addObject:asset];
+	if ([defaults boolForKey:@"auto_upload"])
+	{
+		dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
-												  if ([batch count] >= 50)
-												  {
-													  NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"defaultRepresentation.url.absoluteString" ascending:YES];
-													  [batch sortUsingDescriptors:[NSArray arrayWithObject:sortBy]];
-													  [self processAssetBatch:batch inGroup:group toArray:ops];
-													  [batch release];
-													  batch = [[NSMutableArray alloc] initWithCapacity:50];
-												  }
-											  }];
-											  if ([batch count] > 0) // Deal with last partial batch
-											  {
-												  NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"defaultRepresentation.url.absoluteString" ascending:YES];
-												  [batch sortUsingDescriptors:[NSArray arrayWithObject:sortBy]];
-												  [self processAssetBatch:batch inGroup:group toArray:ops];
-											  }
-											  [batch release];
-											  batch = nil;
-											  NSArray *sortedOps = [ops sortedArrayUsingDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES]]];
-											  [sortedOps enumerateObjectsUsingBlock:^(U1AutoUploadOperation *operation, NSUInteger idx, BOOL *stop) {
-												  [self.autoUploadPreparationQueue addOperation:operation];
-												  [[NSNotificationCenter defaultCenter] postNotificationName:@"uploadQueued" object:nil];
-											  }];
-											  [ops removeAllObjects];
-											  alreadyWalking = NO;
-										  }
-										failureBlock:^(NSError *error) {
-											NSLog(@"Some error happened: %@", error);
-										}];
+			[self.assetsLibrary enumerateGroupsWithTypes:ALAssetsGroupSavedPhotos usingBlock:^(ALAssetsGroup *group, BOOL *stop) {
+				
+				NSMutableArray *ops = [NSMutableArray array];
+				__block NSMutableArray *batch = [[NSMutableArray alloc] initWithCapacity:50];
+				[group enumerateAssetsUsingBlock:^(ALAsset *asset, NSUInteger index, BOOL *stop) {
+					
+					if (asset == nil)
+					{
+						return;
+					}
+					
+					[batch addObject:asset];
+					
+					if ([batch count] >= 50)
+					{
+						NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"defaultRepresentation.url.absoluteString" ascending:YES];
+						[batch sortUsingDescriptors:[NSArray arrayWithObject:sortBy]];
+						[self processAssetBatch:batch inGroup:group toArray:ops];
+						[batch release];
+						batch = [[NSMutableArray alloc] initWithCapacity:50];
+					}
+				}];
+				if ([batch count] > 0) // Deal with last partial batch
+				{
+					NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"defaultRepresentation.url.absoluteString" ascending:YES];
+					[batch sortUsingDescriptors:[NSArray arrayWithObject:sortBy]];
+					[self processAssetBatch:batch inGroup:group toArray:ops];
+				}
+				[batch release];
+				batch = nil;
+				
+				NSArray *sortedOps = [ops sortedArrayUsingDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES]]];
+				[sortedOps enumerateObjectsUsingBlock:^(U1AutoUploadOperation *operation, NSUInteger idx, BOOL *stop) {
+					[self.autoUploadPreparationQueue addOperation:operation];
+					[[NSNotificationCenter defaultCenter] postNotificationName:@"uploadQueued" object:nil];
+				}];
+				[ops removeAllObjects];
+				alreadyWalking = NO;
+			} failureBlock:^(NSError *error) {
+				NSLog(@"Some error happened: %@", error);
+			}];
+			
+		});
 		
 	}
+	
 }
 
 - (void)processAssetBatch:(NSArray*)batch inGroup:(ALAssetsGroup *)group toArray:(NSMutableArray*)ops;
@@ -270,16 +283,19 @@
 	// instead of dealing with a single asset, loop over our batch
 	NSMutableArray *URLs = [batch valueForKeyPath:@"defaultRepresentation.url.absoluteString"];
 
-	
 	[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
-		NSPredicate *p = [NSPredicate predicateWithFormat:@"url in %@ and (fileNode.parent = %@ OR fileNode = nil)", URLs, self.remoteUploadFolder];
+
+		U1FolderNode *autoUploadsFolder = (id)[context objectWithID:self.autoUploadsFolderID];
+		NSMutableSet *assetsToUpload = [NSMutableSet set];
+
+		NSPredicate *p = [NSPredicate predicateWithFormat:@"url in %@ and (fileNode.parent = %@ OR fileNode = nil)", URLs, autoUploadsFolder];
 		NSError *error = nil;
 		NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"url" ascending:YES];
-		NSArray *existingU1Assets = [[self.dataRepository resultsForEntityClass:[U1Asset class]
-															 matchingPredicate:p
-														   withSortDescriptors:[NSArray arrayWithObject:sortBy]
-																		 error:&error] retain];
-
+		NSArray *existingU1Assets = [self.dataRepository resultsForEntityClass:[U1Asset class]
+																	  inContext:context
+																  withPredicate:p
+																sortDescriptors:[NSArray arrayWithObject:sortBy]
+																		  error:&error];
 		
 		// If batch's asset isn't in existingU1Assets or existingU1Asset's generation is nil, we upload it.
 		
@@ -320,22 +336,25 @@
 				
 				if (canUpload) {
 					shouldUpload = YES;
-					assetToUpload = [self createU1AssetWithAsset:asset group:group URLString:url fileName:nil inFolder:self.remoteUploadFolder];
+					assetToUpload = [self createU1AssetWithAsset:asset group:group URLString:url fileName:nil inFolder:autoUploadsFolder context:context];
 				}
 			}
-			// Check shouldUpload flag
 			if (shouldUpload)
 			{
-				NSOperation *op = [self queueAutoUploadForAsset:assetToUpload andRepresentation:[asset defaultRepresentation]];
-				if (op)
-					[ops addObject:op];
-
-			}
-		}];
-
-		[self.dataRepository save:NULL];
-		
-		
+				[assetsToUpload addObject:assetToUpload];
+			}
+		}];
+
+		[context save:NULL];
+
+		[assetsToUpload enumerateObjectsUsingBlock:^(U1Asset *u1asset, BOOL *stop) {
+			
+			NSOperation *op = [self queueAutoUploadForAsset:u1asset andRepresentation:nil];
+			if (op)
+			{
+				[ops addObject:op];
+			}
+		}];
 	}];
 
 	
@@ -344,54 +363,91 @@
 - (void)queuePreviousUploads;
 {
 	// We should poll our data repository for all U1Assets which have generation=nil. They *should* all have U1FileNodes associated with them. If the U1FileNode's parent equals our autoUploadsManager's remoteUploadFolder, then it's an auto-upload, and we let the LAM handle it. Otherwise, kick it off immediately to the FilesClient and get it back in the queue.
-		NSPredicate *p = [NSPredicate predicateWithFormat:@"generation = %@", nil];
-		NSError *error = nil;
-		NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES];
-		NSArray *previouslyQueuedU1Assets = [self.dataRepository resultsForEntityClass:[U1Asset class]
-																	 matchingPredicate:p
-																   withSortDescriptors:[NSArray arrayWithObject:sortBy]
-																				 error:&error];
-		[previouslyQueuedU1Assets enumerateObjectsUsingBlock:^(U1Asset *u1asset, NSUInteger idx, BOOL *stop) {
-			if (u1asset.fileNode.parent == self.remoteUploadFolder)
-			{
-				[self.assetsLibrary assetForURL:[NSURL URLWithString:u1asset.url]
-									resultBlock:^(ALAsset *asset) {
+	NSPredicate *p = [NSPredicate predicateWithFormat:@"generation = %@", nil];
+	NSError *error = nil;
+	NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES];
+	NSArray *previouslyQueuedU1Assets = [self.dataRepository resultsForEntityClass:[U1Asset class]
+																 matchingPredicate:p
+															   withSortDescriptors:[NSArray arrayWithObject:sortBy]
+																			 error:&error];
+	__block NSMutableArray *assetsDeletedFromLibrary = [NSMutableArray array];
+
+	[previouslyQueuedU1Assets enumerateObjectsUsingBlock:^(U1Asset *u1asset, NSUInteger idx, BOOL *stop) {
+		if (u1asset.fileNode.parent == self.remoteUploadFolder)
+		{
+			[self.assetsLibrary assetForURL:[NSURL URLWithString:u1asset.url]
+								resultBlock:^(ALAsset *asset) {
+									if (asset == nil)
+									{
+										NSLog(@"In the results block, but asset is nil!");
+										[assetsDeletedFromLibrary addObject:u1asset];
+									}
+									else
+									{
 										ALAssetRepresentation *rep = [asset defaultRepresentation];
 										// Belongs to LAM, could punt and let it get picked up by checkForNewAssets
 										NSOperation *op = [self queueAutoUploadForAsset:u1asset andRepresentation:rep];
 										if (op)
+										{
 											[self.autoUploadPreparationQueue addOperation:op];
-									} failureBlock:^(NSError *error) {
-										NSLog(@"Error: %@", error);
-										// TODO: delete asset
-									}];
-			}
-			else
+										}
+									}
+								} failureBlock:^(NSError *error) {
+									NSLog(@"Error: %@", error);
+									[assetsDeletedFromLibrary addObject:u1asset];
+								}];
+		}
+		else
+		{
+			NSURL *imageURL = [NSURL URLWithString:u1asset.url];
+			
+			[self.assetsLibrary assetForURL:imageURL
+								resultBlock:^(ALAsset *asset) {
+									if (asset == nil)
+									{
+										NSLog(@"In the results block, but asset is nil!");
+										[assetsDeletedFromLibrary addObject:u1asset];
+									}
+									else
+									{
+										ALAssetRepresentation *representation = [asset defaultRepresentation];
+										NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
+										
+										U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
+										provider.assetURL = imageURL;
+										
+										[self.filesClient uploadContentDataProvider:provider
+																		   toFolder:u1asset.fileNode.parent
+																   withResourceName:u1asset.filename
+																	withContentType:mimetype
+																	   withPriority:NSOperationQueuePriorityVeryHigh
+																	  progressBlock:^(long long bytesUploaded, long long totalBytes) {}
+																	completionBlock:^(U1FileNode *updatedNode, NSError *error) {
+																		u1asset.generation = updatedNode.generation;
+																	}];
+									}
+								} failureBlock:^(NSError *error) {
+									NSLog(@"Error: %@", error);
+									[assetsDeletedFromLibrary addObject:u1asset];
+								}];
+		}
+	}];
+	
+	// Iterate over the assetsDeletedFromLibrary, and clean them up.
+	[self.dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		for (int i = 0; i < [assetsDeletedFromLibrary count]; i++)
+		{
+			U1Asset *assetToBeDeleted = [assetsDeletedFromLibrary objectAtIndex:i];
+			U1FileNode *placeholderNode = assetToBeDeleted.fileNode;
+			[context deleteObject:assetToBeDeleted];
+			if (placeholderNode.generation == nil)
 			{
-				NSURL *imageURL = [NSURL URLWithString:u1asset.url];
-				
-				[self.assetsLibrary assetForURL:imageURL
-							   resultBlock:^(ALAsset *asset) {
-								   ALAssetRepresentation *representation = [asset defaultRepresentation];
-								   NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
-								   
-								   U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
-								   provider.representation = representation;
-								   
-								   [self.filesClient uploadContentDataProvider:provider
-																	  toFolder:u1asset.fileNode.parent
-															  withResourceName:u1asset.filename
-															   withContentType:mimetype
-																  withPriority:NSOperationQueuePriorityVeryHigh
-																 progressBlock:^(long long bytesUploaded, long long totalBytes) {}
-															   completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-																   u1asset.generation = updatedNode.generation;
-															   }];
-							   } failureBlock:^(NSError *error) {
-								   NSLog(@"Error: %@", error);
-							   }];
+				[context deleteObject:placeholderNode];
 			}
-		}];
+			[self.dataRepository save:NULL];
+		}
+		[assetsDeletedFromLibrary release];
+	}];
 }
 
 - (NSString *)remoteUploadFolderPath;
@@ -421,47 +477,41 @@
 	return filename;
 }
 
-- (U1Asset *)createU1AssetWithAsset:(ALAsset *)asset group:(ALAssetsGroup *)group URLString:(NSString *)urlString fileName:(NSString *)filename inFolder:(U1FolderNode *)folderNode;
+- (U1Asset *)createU1AssetWithAsset:(ALAsset *)asset group:(ALAssetsGroup *)group URLString:(NSString *)urlString fileName:(NSString *)filename inFolder:(U1FolderNode *)folderNode context:(NSManagedObjectContext*)context;
 {
-	__block U1Asset *newAsset = nil;
-	__block NSString *newFilename = filename;
-	
-	// TODO: temporary, create node if doesn't exist
-	[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
-		newAsset = [U1Asset insertInManagedObjectContext:context];
-		newAsset.groupId = [group valueForProperty: ALAssetsGroupPropertyPersistentID];
-		newAsset.url = urlString;
-		if (filename == nil)
-		{
-			newFilename = [self generateFilenameForAsset:asset];
-		}
-		newAsset.filename = newFilename;
-		NSString *resourcePath = [folderNode.resourcePath stringByAppendingPathComponent:newFilename];
-		NSString *contentPath = [folderNode.contentPath stringByAppendingPathComponent:newFilename];
-
-		__block BOOL found = NO;
-		__block U1FileNode *node = nil;
-
-		[folderNode.children enumerateObjectsUsingBlock:^(U1FileNode *childNode, BOOL *stop) {
-			if ([childNode.name isEqualToString:newFilename]) {
-				found = YES;
-				newAsset.generation = childNode.generation;
-				newAsset.fileNode = childNode;
-				*stop = YES;
-			}
-		}];
-		// Now we have an asset. We need to check to see if a corresponding FileNode is in our remoteUploadFolderChildren, and use it if it is.
-		if (!found)
-		{
-			node = [U1FileNode insertInManagedObjectContext:context];
-			node.resourcePath = resourcePath;
-			node.kind = @"file";
-			node.parent = folderNode;
-			node.contentPath = contentPath;
-			node.asset = newAsset;
+	U1Asset *newAsset = [U1Asset insertInManagedObjectContext:context];
+	newAsset.groupId = [group valueForProperty: ALAssetsGroupPropertyPersistentID];
+	newAsset.url = urlString;
+	if (filename == nil)
+	{
+		filename = [self generateFilenameForAsset:asset];
+	}
+	newAsset.filename = filename;
+	NSString *resourcePath = [folderNode.resourcePath stringByAppendingPathComponent:filename];
+	NSString *contentPath = [folderNode.contentPath stringByAppendingPathComponent:filename];
+	
+	__block BOOL found = NO;
+	__block U1FileNode *node = nil;
+	
+	[folderNode.children enumerateObjectsUsingBlock:^(U1FileNode *childNode, BOOL *stop) {
+		if ([childNode.name isEqualToString:filename]) {
+			found = YES;
+			newAsset.generation = childNode.generation;
+			newAsset.fileNode = childNode;
+			*stop = YES;
 		}
 	}];
-
+	// Now we have an asset. We need to check to see if a corresponding FileNode is in our remoteUploadFolderChildren, and use it if it is.
+	if (!found)
+	{
+		node = [U1FileNode insertInManagedObjectContext:context];
+		node.resourcePath = resourcePath;
+		node.kind = @"file";
+		node.parent = folderNode;
+		node.contentPath = contentPath;
+		node.asset = newAsset;
+	}
+	
 	return newAsset;
 }
 
@@ -477,15 +527,16 @@
 	if ((![self isPending:assetToUpload.filename]) && (assetToUpload.generation == nil))
 	{
 		U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
-		provider.representation = representation;
+		provider.assetURL = [NSURL URLWithString:assetToUpload.url];
 		
 		// Let's create an operation!
 		U1AutoUploadOperation *operation = [[U1AutoUploadOperation alloc] init];
 		operation.dataProvider = provider;
-		operation.u1asset = assetToUpload;
-		operation.folder = self.remoteUploadFolder;
+		operation.assetID = [assetToUpload objectID];
+		operation.folderID = [self.remoteUploadFolder objectID];
 		operation.filename = assetToUpload.filename;
-		operation.contentType = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[provider.representation UTI], kUTTagClassMIMEType);
+		// TODO:
+//		operation.contentType = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[provider.representation UTI], kUTTagClassMIMEType);
 		operation.priority = NSOperationQueuePriorityNormal;
 		return [operation autorelease];
 	}

=== modified file 'Files/U1DataRepository.h'
--- Files/U1DataRepository.h	2011-09-23 18:35:34 +0000
+++ Files/U1DataRepository.h	2011-12-09 20:00:29 +0000
@@ -26,10 +26,12 @@
 
 - (U1Node*)nodeWithResourcePath:(NSString*)resourcePath;
 
-//- (void)fetchResultsForEntityClass:(Class)entityClass matchingPredicate:(NSPredicate*)predicate withSortDescriptors:(NSArray*)sortDescriptors completionBlock:(void(^)(NSArray *results, NSError *error))completionBlock;
-
 - (NSArray*)resultsForEntityClass:(Class)entityClass matchingPredicate:(NSPredicate*)predicate withSortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
 
+- (NSArray*)resultsForEntityClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
+
+- (void)dispatchBlockWithMainContext:(void(^)(NSManagedObjectContext *context))block;
+
 - (void)dispatchBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
 
 - (void)dispatchAsyncBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;

=== modified file 'Files/U1DataRepository.m'
--- Files/U1DataRepository.m	2011-10-25 23:36:04 +0000
+++ Files/U1DataRepository.m	2011-12-09 20:00:29 +0000
@@ -27,7 +27,7 @@
 @property (nonatomic, retain) NSManagedObjectContext *mainContext;
 @property (nonatomic, retain) NSPersistentStoreCoordinator *storeCoordinator;
 
-- (NSArray*)fetchEntitiesForClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
+- (NSArray*)resultsForEntityClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
 
 @end
 
@@ -101,22 +101,17 @@
 	NSParameterAssert(resourcePath);
 
 	NSPredicate *p = [NSPredicate predicateWithFormat:@"resourcePath = %@", resourcePath];
-	NSArray *nodes = [self fetchEntitiesForClass:[U1Node class] inContext:self.mainContext withPredicate:p sortDescriptors:nil error:NULL];
+	NSArray *nodes = [self resultsForEntityClass:[U1Node class] inContext:self.mainContext withPredicate:p sortDescriptors:nil error:NULL];
 	U1Node *node = [nodes lastObject];
 	return node;
 }
 
-//- (void)fetchResultsForEntityClass:(Class)entityClass matchingPredicate:(NSPredicate*)predicate withSortDescriptors:(NSArray*)sortDescriptors completionBlock:(void(^)(NSArray *results, NSError *error))completionBlock;
-//{
-//	
-//}
-
 - (NSArray*)resultsForEntityClass:(Class)entityClass matchingPredicate:(NSPredicate*)predicate withSortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
 {
-	return [self fetchEntitiesForClass:entityClass inContext:self.mainContext withPredicate:predicate sortDescriptors:sortDescriptors error:error];
+	return [self resultsForEntityClass:entityClass inContext:self.mainContext withPredicate:predicate sortDescriptors:sortDescriptors error:error];
 }
 
-- (NSArray*)fetchEntitiesForClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
+- (NSArray*)resultsForEntityClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
 {
 	NSParameterAssert(class != nil);
 	NSParameterAssert(context != nil);
@@ -129,7 +124,7 @@
 	return results;
 }
 
-- (void)dispatchBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
+- (void)dispatchBlockWithMainContext:(void(^)(NSManagedObjectContext *context))block;
 {
 	NSParameterAssert(block != NULL);
 	if (![NSThread isMainThread])
@@ -146,6 +141,22 @@
 	}
 }
 
+- (void)dispatchBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
+{
+	NSParameterAssert(block != NULL);
+	
+	NSManagedObjectContext *context = [[NSManagedObjectContext alloc] init];
+	id observation = [[[NSNotificationCenter defaultCenter] addObserverForName:NSManagedObjectContextDidSaveNotification object:context queue:nil usingBlock:^(NSNotification *note) {
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[self.mainContext mergeChangesFromContextDidSaveNotification:note];
+		});
+	}] retain];
+	[context setPersistentStoreCoordinator:self.storeCoordinator];
+	block(context);
+	[context release];
+	[observation release];
+}
+
 - (void)dispatchAsyncBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
 {
 	NSParameterAssert(block != NULL);
@@ -153,10 +164,16 @@
 	typeof(block) contextBlock = [block copy];
 	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
 		NSManagedObjectContext *context = [[NSManagedObjectContext alloc] init];
+		id observation = [[[NSNotificationCenter defaultCenter] addObserverForName:NSManagedObjectContextDidSaveNotification object:context queue:nil usingBlock:^(NSNotification *note) {
+			dispatch_async(dispatch_get_main_queue(), ^{
+				[self.mainContext mergeChangesFromContextDidSaveNotification:note];
+			});
+		}] retain];
 		[context setPersistentStoreCoordinator:self.storeCoordinator];
 		contextBlock(context);
 		[contextBlock release];
 		[context release];
+		[observation release];
 	});
 }
 

=== modified file 'Files/U1FilesClient.h'
--- Files/U1FilesClient.h	2011-12-01 17:37:53 +0000
+++ Files/U1FilesClient.h	2011-12-09 20:00:29 +0000
@@ -22,10 +22,8 @@
 
 extern NSString * const U1FilesClientNodeStatusChangedNotification;
 
+@protocol U1UploadDataProvider;
 
-@protocol U1UploadDataProvider <NSObject>
-- (NSData *)serializeData;
-@end
 
 typedef enum U1DataSourceType {
 	U1DataSourceLocal,

=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-12-06 20:53:05 +0000
+++ Files/U1FilesClient.m	2011-12-09 20:00:29 +0000
@@ -117,7 +117,7 @@
 	__block NSFetchedResultsController *cloudFoldersResultsController = nil;
 	__block U1Volume *rootVolume = nil; // vestigial
 	
-	[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+	[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 		
 		NSFetchRequest *request = [[NSFetchRequest alloc] init];
 		[request setEntity:[U1Volume entityInManagedObjectContext:context]];
@@ -142,7 +142,7 @@
 	
 	[self.filesService volumeInfoWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
 		
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			
 			NSMutableArray *fetchedVolumes = [NSMutableArray array];
 			for (NSDictionary *volumeInfo in volumeInfos)
@@ -193,7 +193,7 @@
 	__block U1FolderNode *node = [(id)[self.dataRepository nodeWithResourcePath:nodePath] retain];
 	__block NSFetchedResultsController *resultsController = nil;
 
-	[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+	[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 
 		if (!node)
 		{
@@ -237,17 +237,24 @@
 		
 		[node updatePropertiesFromJSONDictionary:nodeInfo];
 		
+		NSManagedObjectID *nodeID = [node objectID];
+		
 		NSArray *childInfos = [nodeInfo objectForKey:@"children"];
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
 			
+			U1FolderNode *folderNode = (id)[context objectWithID:nodeID];
 			NSMutableSet *orphans = [NSMutableSet set];
-			[orphans unionSet:node.children];
+			[orphans unionSet:folderNode.children];
 			
+			NSUInteger batchCounter = 0;
 			for (NSDictionary *childInfo in childInfos)
 			{
 				NSString *childResourcePath = [childInfo objectForKey:@"resource_path"];
 				NSString *kind = [childInfo objectForKey:@"kind"];
-				U1Node *childNode = [self.dataRepository nodeWithResourcePath:childResourcePath];
+				NSError *error = nil;
+				NSPredicate *p = [NSPredicate predicateWithFormat:@"resourcePath = %@", childResourcePath];
+				NSArray *results = [self.dataRepository resultsForEntityClass:[U1Node class] inContext:context withPredicate:p sortDescriptors:nil error:&error];
+				U1Node *childNode = [results lastObject];
 				if (!childNode)
 				{
 					if ([@"file" isEqualToString:kind])
@@ -257,8 +264,14 @@
 				}
 				
 				[childNode updatePropertiesFromJSONDictionary:childInfo];
-				childNode.parent = node;
+				childNode.parent = folderNode;
 				[orphans removeObject:childNode];
+				
+				if (++batchCounter > 100)
+				{
+					[context save:NULL];
+					batchCounter = 0;
+				}
 			}
 			
 			for (U1Node *orphan in orphans)
@@ -270,13 +283,15 @@
 			}
 			
 			[context save:NULL];
+
+			dispatch_async(dispatch_get_main_queue(), ^(void) {
+				resultsBlock(node, resultsController, U1DataSourceRemote);
+				[resultsController release];
+				[node release];
+			});
+		
 		}];
 
-		dispatch_async(dispatch_get_main_queue(), ^(void) {
-			resultsBlock(node, resultsController, U1DataSourceRemote);
-			[resultsController release];
-			[node release];
-		});
 		
 	}];
 	return nil;
@@ -288,7 +303,7 @@
 	
 	if (!node)
 	{
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			node = [[U1FileNode insertInManagedObjectContext:context] retain];
 			node.resourcePath = nodePath;
 			[context save:NULL];
@@ -333,7 +348,7 @@
 	return [self.filesService deleteNodeAtResourcePath:node.resourcePath completionBlock:^(NSError *error) {
 		if (!error)
 		{
-			[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+			[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 				[context deleteObject:node];
 				[context save:NULL];
 			}];
@@ -348,7 +363,7 @@
 	U1FileNode *node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
 	if (!node)
 	{
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			U1FileNode *newNode = [U1FileNode insertInManagedObjectContext:context];
 			newNode.resourcePath = resourcePath;
 			newNode.kind = @"file";
@@ -429,7 +444,7 @@
 	U1FolderNode *node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
 	if (!node)
 	{
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			U1FolderNode *newNode = [U1FolderNode insertInManagedObjectContext:context];
 			newNode.resourcePath = resourcePath;
 			newNode.kind = @"directory";
@@ -452,7 +467,7 @@
 - (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(U1Volume *volume, NSError *error))completionBlock;
 {
 	return [self.filesService createVolumeAtPath:folderPath completionBlock:^(NSDictionary *volumeInfo, NSError *error) {
-		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			U1Volume *volume = [U1Volume insertInManagedObjectContext:context];
 			if (!error)
 			{

=== modified file 'Files/U1FilesService.h'
--- Files/U1FilesService.h	2011-11-01 01:17:53 +0000
+++ Files/U1FilesService.h	2011-12-09 20:00:29 +0000
@@ -18,6 +18,11 @@
 @class U1Node, U1FileNode, U1FolderNode;
 
 
+@protocol U1UploadDataProvider <NSObject>
+- (void)prepareDataStreamWithBlock:(void(^)(NSInputStream *dataStream, NSString *mimeType, NSUInteger length, NSError *error))block;
+@end
+
+
 @interface U1FilesService : NSObject
 
 + (U1FilesService *)sharedFilesService;
@@ -28,7 +33,7 @@
 - (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
 - (id)contentForNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesReceived, long long bytesExpected))progressBlock completionBlock:(void(^)(NSURL *contentURL))completionBlock;
 - (id)uploadContentAtURL:(NSURL*)contentURL forNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(U1FileNode *updatedNode, NSError *error))completionBlock;
-- (id)uploadContentData:(NSData*)contentData forNode:(U1FileNode*)node withContentType:(NSString*)contentType progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
+- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node withContentType:(NSString*)contentType progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
 - (id)moveNodeAtResourcePath:(NSString*)resourcePath toPath:(NSString*)newPath withCompletionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
 - (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlock:(void(^)(NSError *error))completionBlock;
 - (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;

=== modified file 'Files/U1FilesService.m'
--- Files/U1FilesService.m	2011-12-06 18:38:47 +0000
+++ Files/U1FilesService.m	2011-12-09 20:00:29 +0000
@@ -196,20 +196,28 @@
 	return nil;
 }
 
-- (id)uploadContentData:(NSData*)contentData forNode:(U1FileNode*)node withContentType:(NSString*)contentType progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
+- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node withContentType:(NSString*)contentType progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
 {
 	NSString *contentPath = node.contentPath;
 	NSURL *requestURL = [NSURL URLWithString:[[U1FilesServiceAPIContentRoot stringByAppendingPathComponent:contentPath] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
 	
-	
-	U1ReportingInputStream *stream = [[U1ReportingInputStream alloc] initWithData:contentData];
-	stream.progressBlock = progressBlock;
-	
-	[self execute:@"PUT" toURL:requestURL withParameters:nil requestBody:stream contentType:contentType contentLength:[contentData length] parseResponseBody:YES completionBlock:^(id results, NSError *error) {
-		
-		completionBlock(results, error);
+	[contentData prepareDataStreamWithBlock:^(NSInputStream *dataStream, NSString *mimeType, NSUInteger length, NSError *error) {
+		
+		if (error)
+		{
+			completionBlock(nil, error);
+			return;
+		}
+		
+		U1ReportingInputStream *stream = [U1ReportingInputStream inputStreamWithSourceStream:dataStream];
+		stream.progressBlock = progressBlock;
+		stream.dataLength = length;
+		[self execute:@"PUT" toURL:requestURL withParameters:nil requestBody:stream contentType:mimeType contentLength:length parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+			
+			completionBlock(results, error);
+		}];
 	}];
-	
+
 	return nil;
 }
 
@@ -350,30 +358,33 @@
 	[request release];
 	
 	[httpOperation setCompletionBlock:^(void) {
+			
+		id result = nil;
+		NSHTTPURLResponse *response = httpOperation.response;
+		NSError *error = httpOperation.error;
+		
+		if ([response statusCode] == 401)
+		{
+			dispatch_async(dispatch_get_main_queue(), ^(void) {
+				[[U1AccountManager sharedAccountManager] removeCredentials];
+			});
+			return;
+		}
+		
+		if (!error &&
+			![[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 100)] containsIndex:[response statusCode]])
+		{
+			// TODO: semantic error messages
+			error = [NSError errorWithDomain:@"U1FilesServiceErrorDomain" code:[response statusCode] userInfo:nil];
+		}
+		if (!error && parseResponseBody)
+		{
+			NSData *data = [collector data];
+			result = [data objectFromJSONDataWithParseOptions:JKParseOptionNone error:&error];
+		}
+		
 		dispatch_async(dispatch_get_main_queue(), ^(void) {
-			
-			id result = nil;
-			NSHTTPURLResponse *response = httpOperation.response;
-			NSError *error = httpOperation.error;
-			
-			if ([response statusCode] == 401)
-			{
-				[[U1AccountManager sharedAccountManager] removeCredentials];
-				return;
-			}
-			
-			if (!error &&
-				![[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 100)] containsIndex:[response statusCode]])
-			{
-				// TODO: semantic error messages
-				error = [NSError errorWithDomain:@"U1FilesServiceErrorDomain" code:[response statusCode] userInfo:nil];
-			}
-			if (!error && parseResponseBody)
-			{
-				NSData *data = [collector data];
-				result = [data objectFromJSONDataWithParseOptions:JKParseOptionNone error:&error];
-			}
-			
+
 			if (completionBlock)
 				completionBlock(result, error);
 			

=== modified file 'Files/U1FolderItemCell.m'
--- Files/U1FolderItemCell.m	2011-12-01 17:37:53 +0000
+++ Files/U1FolderItemCell.m	2011-12-09 20:00:29 +0000
@@ -19,6 +19,11 @@
 #import "U1ViewNibLoader.h"
 
 
+@interface U1FolderItemCell ()
++ (UINib*)cellNib;
+@end
+
+
 @implementation U1FolderItemCell
 
 @synthesize iconImageView, nameLabel, detailLabel, uploadIndicator, uploadProgressView;
@@ -29,11 +34,21 @@
 	U1FolderItemCell *cell = (id)[tableView dequeueReusableCellWithIdentifier:NSStringFromClass(self)];
 	if (!cell)
 	{
-		cell = [U1ViewNibLoader viewFromNib:NSStringFromClass(self)];
+		cell = [U1ViewNibLoader viewFromUINib:[U1FolderItemCell cellNib]];
 	}
 	return cell;
 }
 
++ (UINib*)cellNib;
+{
+	static UINib *cellNib;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		cellNib = [[UINib nibWithNibName:NSStringFromClass(self) bundle:nil] retain];
+	});
+	return cellNib;
+}
+
 - (void)dealloc
 {
 	[iconImageView release];

=== modified file 'Files/U1FolderItemCell.xib'
--- Files/U1FolderItemCell.xib	2011-12-01 17:37:53 +0000
+++ Files/U1FolderItemCell.xib	2011-12-09 20:00:29 +0000
@@ -101,7 +101,7 @@
 								<string key="NSFrame">{{52, 28}, {234, 17}}</string>
 								<reference key="NSSuperview" ref="604950473"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSNextKeyView" ref="23474122"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -134,6 +134,7 @@
 								<string key="NSFrame">{{293, 17}, {20, 20}}</string>
 								<reference key="NSSuperview" ref="604950473"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<bool key="IBUIHidesWhenStopped">NO</bool>
@@ -145,6 +146,7 @@
 								<string key="NSFrame">{{52, 32}, {234, 9}}</string>
 								<reference key="NSSuperview" ref="604950473"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="587955385"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<object class="NSColor" key="IBUIProgressTintColor">

=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-12-07 18:23:32 +0000
+++ Files/U1FolderViewController.m	2011-12-09 20:00:29 +0000
@@ -253,12 +253,13 @@
 					   NSString *filename = [NSString stringWithFormat:@"%@ %@.%@", assetType, [dateFormatter stringFromDate:assetDate], ext];
 					   [dateFormatter release];
 					   
-					   U1Asset *u1asset = [autoUploadsManager createU1AssetWithAsset:asset group:nil URLString:[imageURL absoluteString] fileName:filename inFolder:self.node];
+					   // TODO: fix!
+					   U1Asset *u1asset = [autoUploadsManager createU1AssetWithAsset:asset group:nil URLString:[imageURL absoluteString] fileName:filename inFolder:self.node context:nil];
 					   
 					   if (u1asset.generation == nil) // Prevent duplicate uploading to the same folder
 					   {
 						   U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
-						   provider.representation = representation;
+						   provider.assetURL = [NSURL URLWithString:[u1asset url]];
 						   dispatch_async(dispatch_get_main_queue(), ^(void) {
 							   [self.filesClient uploadContentDataProvider:provider
 																  toFolder:self.node
@@ -271,7 +272,7 @@
 															   if (error)
 															   {
 																   // TODO: remove direct access to data repository
-																   [[U1DataRepository sharedDataRepository] dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+																   [[U1DataRepository sharedDataRepository] dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 																	   [context deleteObject:u1asset.fileNode];
 																   }];
 															   }

=== modified file 'Files/U1ReportingInputStream.h'
--- Files/U1ReportingInputStream.h	2011-11-30 21:42:52 +0000
+++ Files/U1ReportingInputStream.h	2011-12-09 20:00:29 +0000
@@ -19,8 +19,9 @@
 @interface U1ReportingInputStream : NSProxy
 
 @property (copy) void (^progressBlock)(long long, long long);
+@property long long dataLength;
 
-+ (NSInputStream*)inputStreamWithData:(NSData*)data;
-- (id)initWithData:(NSData*)data;
++ (U1ReportingInputStream*)inputStreamWithSourceStream:(NSInputStream*)sourceStream;
+- (id)initWithSourceStream:(NSInputStream*)sourceStream;
 
 @end

=== modified file 'Files/U1ReportingInputStream.m'
--- Files/U1ReportingInputStream.m	2011-11-30 21:42:52 +0000
+++ Files/U1ReportingInputStream.m	2011-12-09 20:00:29 +0000
@@ -23,22 +23,20 @@
 
 @implementation U1ReportingInputStream
 {
-	NSUInteger contentLength;
 	NSUInteger readSoFar;
 }
 
-@synthesize progressBlock;
+@synthesize progressBlock, dataLength;
 @synthesize targetStream;
 
-+ (NSInputStream *)inputStreamWithData:(NSData *)data;
++ (U1ReportingInputStream *)inputStreamWithSourceStream:(NSInputStream*)sourceStream;
 {
-	return [[[self alloc] initWithData:data] autorelease];
+	return [[[self alloc] initWithSourceStream:sourceStream] autorelease];
 }
 
-- (id)initWithData:(NSData *)theData;
+- (id)initWithSourceStream:(NSInputStream*)sourceStream;
 {
-	targetStream = [[NSInputStream alloc] initWithData:theData];
-	contentLength = [theData length];
+	targetStream = [sourceStream retain];
 	return self;
 }
 
@@ -54,7 +52,7 @@
 	NSInteger read = [self.targetStream read:buffer maxLength:len];
 	readSoFar += read;
 	if (self.progressBlock)
-		self.progressBlock(readSoFar, contentLength); 
+		self.progressBlock(readSoFar, self.dataLength); 
 	return read;
 }
 

=== modified file 'Files/U1UploadOperation.m'
--- Files/U1UploadOperation.m	2011-12-06 20:53:05 +0000
+++ Files/U1UploadOperation.m	2011-12-09 20:00:29 +0000
@@ -85,9 +85,7 @@
 
 		U1FilesService *filesService = [U1FilesService sharedFilesService];
 		fileInfo.uploading = YES;
-		NSData *uploadData = [self.dataProvider serializeData];
-
-		[filesService uploadContentData:uploadData forNode:self.fileNode withContentType:self.mimetype progressBlock:^(long long uploaded, long long totalLength) {
+		[filesService uploadContentData:self.dataProvider forNode:self.fileNode withContentType:self.mimetype progressBlock:^(long long uploaded, long long totalLength) {
 			
 			dispatch_async(dispatch_get_main_queue(), ^{
 				[self.fileInfo setUploadPercentage:((double)uploaded / (double)totalLength)];
@@ -107,7 +105,26 @@
 			if (filesServiceError != nil)
 			{
 				self.error = filesServiceError;
-				[self beginUpload];
+				if ([filesServiceError.domain isEqualToString:@"nonexistentAsset"])
+				{
+					// Asset is gone, delete U1Asset and potentially the Node, and stop running
+					U1DataRepository *dataRepository = [U1DataRepository sharedDataRepository];
+					[dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+						U1Asset *assetToBeDeleted = self.fileNode.asset;
+						[context deleteObject:assetToBeDeleted];
+						if (self.fileNode.generation == nil)
+						{
+							[context deleteObject:self.fileNode];
+						}
+						[dataRepository save:NULL];
+					}];
+					[self finishExecuting];
+				}
+				else
+				{
+					// File upload timed out or something else, so reschedule
+					[self beginUpload];
+				}
 			}
 			else
 			{

=== modified file 'Files/U1UploadsPoolViewController.m'
--- Files/U1UploadsPoolViewController.m	2011-12-06 18:36:40 +0000
+++ Files/U1UploadsPoolViewController.m	2011-12-09 20:00:29 +0000
@@ -275,7 +275,7 @@
 
 - (void)loadCurrentUploads;
 {
-	[[U1DataRepository sharedDataRepository] dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+	[[U1DataRepository sharedDataRepository] dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 		
 		NSFetchRequest *request = [[NSFetchRequest alloc] init];
 		[request setEntity:[U1Asset entityInManagedObjectContext:context]];

=== modified file 'Files/U1Volume.m'
--- Files/U1Volume.m	2011-10-26 04:40:14 +0000
+++ Files/U1Volume.m	2011-12-09 20:00:29 +0000
@@ -41,7 +41,7 @@
 	if (rootFolder == nil)
 	{
 		// Upload
-		[dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		[dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			
 			U1FolderNode *rootFolder = [U1FolderNode insertInManagedObjectContext:context];
 			rootFolder.resourcePath = self.nodePath;

=== modified file 'Files/iPhone/en.lproj/MainWindow_iPhone.xib'
--- Files/iPhone/en.lproj/MainWindow_iPhone.xib	2011-11-18 17:53:03 +0000
+++ Files/iPhone/en.lproj/MainWindow_iPhone.xib	2011-12-09 20:00:29 +0000
@@ -45,10 +45,11 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIWindow" id="380026005">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">1316</int>
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
+				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -68,12 +69,12 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUINavigationController" key="IBUISelectedViewController" id="941272465">
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="463875161">
-						<string key="IBUITitle">Uploads</string>
+				<object class="IBUINavigationController" key="IBUISelectedViewController" id="175250829">
+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="1047769425">
+						<string key="IBUITitle">Files</string>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">upload.png</string>
+							<string key="NSResourceName">folder.png</string>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -85,7 +86,7 @@
 					</object>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					<bool key="IBUIHorizontal">NO</bool>
-					<object class="IBUINavigationBar" key="IBUINavigationBar" id="499706903">
+					<object class="IBUINavigationBar" key="IBUINavigationBar" id="131246382">
 						<nil key="NSNextResponder"/>
 						<int key="NSvFlags">256</int>
 						<string key="NSFrameSize">{0, 0}</string>
@@ -100,12 +101,12 @@
 					</object>
 					<object class="NSMutableArray" key="IBUIViewControllers">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="IBUIViewController" id="743143347">
-							<object class="IBUINavigationItem" key="IBUINavigationItem" id="374575231">
+						<object class="IBUIViewController" id="852027692">
+							<object class="IBUINavigationItem" key="IBUINavigationItem" id="570921376">
 								<string key="IBUITitle">Root View Controller</string>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
-							<reference key="IBUIParentViewController" ref="941272465"/>
+							<reference key="IBUIParentViewController" ref="175250829"/>
 							<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 								<int key="IBUIInterfaceOrientation">1</int>
 								<int key="interfaceOrientation">1</int>
@@ -117,12 +118,13 @@
 				</object>
 				<object class="NSMutableArray" key="IBUIViewControllers">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUINavigationController" id="175250829">
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="1047769425">
-							<string key="IBUITitle">Files</string>
+					<reference ref="175250829"/>
+					<object class="IBUINavigationController" id="941272465">
+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="463875161">
+							<string key="IBUITitle">Uploads</string>
 							<object class="NSCustomResource" key="IBUIImage">
 								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">folder.png</string>
+								<string key="NSResourceName">upload.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -134,7 +136,7 @@
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<bool key="IBUIHorizontal">NO</bool>
-						<object class="IBUINavigationBar" key="IBUINavigationBar" id="131246382">
+						<object class="IBUINavigationBar" key="IBUINavigationBar" id="499706903">
 							<nil key="NSNextResponder"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrameSize">{0, 0}</string>
@@ -149,12 +151,12 @@
 						</object>
 						<object class="NSMutableArray" key="IBUIViewControllers">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUIViewController" id="852027692">
-								<object class="IBUINavigationItem" key="IBUINavigationItem" id="570921376">
+							<object class="IBUIViewController" id="743143347">
+								<object class="IBUINavigationItem" key="IBUINavigationItem" id="374575231">
 									<string key="IBUITitle">Root View Controller</string>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								</object>
-								<reference key="IBUIParentViewController" ref="175250829"/>
+								<reference key="IBUIParentViewController" ref="941272465"/>
 								<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 									<int key="IBUIInterfaceOrientation">1</int>
 									<int key="interfaceOrientation">1</int>
@@ -164,7 +166,6 @@
 							</object>
 						</object>
 					</object>
-					<reference ref="941272465"/>
 					<object class="IBUINavigationController" id="631281359">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="460599548">
 							<string key="IBUITitle">Settings</string>