Merge lp:~urbanape/ubuntuone-ios-files/auto-upload-pics into lp:ubuntuone-ios-files

[Zachery Bir]

This branch adds rough auto-upload of the user's photo library (only photos, no video).

It provides no feedback or controls to cancel the operation yet, and is very, very chatty.

[Zachery Bir (urbanape)]

Also, this branch Singletonizes a bunch of the classes we use.

[lp:~urbanape/ubuntuone-ios-files/auto-upload-pics]

36. By Zachery Bir on 2011-10-03

Renamed to match the new bundle version

37. By Zachery Bir on 2011-10-03

Renamed data model

38. By Zachery Bir on 2011-10-03

Updated bundle version

39. By Zachery Bir on 2011-10-03

No longer a private property

40. By Zachery Bir on 2011-10-03

Using a FilesClient, rather than the bare FilesService

41. By Zachery Bir on 2011-10-03

Move the static variable outside the implementation, and close an errant code block

42. By Zachery Bir on 2011-10-03

Uncomment the icon block

43. By Zachery Bir on 2011-10-04

Updates to make build more better good.

[Jason Foreman (threeve)]

I've ended up un-singletonizing (just the bits about overriding retain/release) in a later changeset, but otherwise looks good.

review: Approve

=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-09-27 14:36:00 +0000
+++ Files.xcodeproj/project.pbxproj	2011-10-04 14:38:28 +0000
@@ -7,6 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		91A5E2DC142A70DF00EAAC2B /* U1LocalAssetsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91A5E2DB142A70DF00EAAC2B /* U1LocalAssetsManager.m */; };
+		91A5E2DF142B727600EAAC2B /* U1AssetUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91A5E2DE142B727500EAAC2B /* U1AssetUploadOperation.m */; };
+		91B3F2D5141E87F900939B3C /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B3F2D4141E87F900939B3C /* AssetsLibrary.framework */; };
+		91B3F2DC141FDFAB00939B3C /* _U1Asset.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F2DB141FDFAB00939B3C /* _U1Asset.m */; };
+		91B3F2DF141FDFBE00939B3C /* U1Asset.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F2DE141FDFBE00939B3C /* U1Asset.m */; };
 		960D46131409E0E100B73177 /* PullRefreshTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D46001409E09F00B73177 /* PullRefreshTableViewController.m */; };
 		960D46141409E0F000B73177 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 960D45FB1409E09F00B73177 /* arrow.png */; };
 		960D46161409E10200B73177 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 960D46151409E10200B73177 /* QuartzCore.framework */; };
@@ -116,6 +121,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		91A5E2DB142A70DF00EAAC2B /* U1LocalAssetsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalAssetsManager.m; sourceTree = "<group>"; };
+		91A5E2DD142B727500EAAC2B /* U1AssetUploadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1AssetUploadOperation.h; sourceTree = "<group>"; };
+		91A5E2DE142B727500EAAC2B /* U1AssetUploadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1AssetUploadOperation.m; sourceTree = "<group>"; };
+		91B3F2D4141E87F900939B3C /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
+		91B3F2D7141FC9BE00939B3C /* U1LocalAssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1LocalAssetsManager.h; sourceTree = "<group>"; };
+		91B3F2DA141FDFAB00939B3C /* _U1Asset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _U1Asset.h; sourceTree = "<group>"; };
+		91B3F2DB141FDFAB00939B3C /* _U1Asset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _U1Asset.m; sourceTree = "<group>"; };
+		91B3F2DD141FDFBE00939B3C /* U1Asset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1Asset.h; sourceTree = "<group>"; };
+		91B3F2DE141FDFBE00939B3C /* U1Asset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1Asset.m; sourceTree = "<group>"; };
 		960D45FA1409E09F00B73177 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
 		960D45FB1409E09F00B73177 /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = "<group>"; };
 		960D45FD1409E09F00B73177 /* DemoTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoTableViewController.h; sourceTree = "<group>"; };
@@ -194,6 +208,7 @@
 		96A1699F1430C9C900E4C990 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		96A169A21430D53600E4C990 /* U1LocalFileInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1LocalFileInfo.h; sourceTree = "<group>"; };
 		96A169A31430D53600E4C990 /* U1LocalFileInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalFileInfo.m; sourceTree = "<group>"; };
+		96A56430143265B4007A1A93 /* U1Files 1.0-3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "U1Files 1.0-3.xcdatamodel"; sourceTree = "<group>"; };
 		96CC17C71417E5E400EFC1BA /* U1Files.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = U1Files.xcdatamodel; sourceTree = "<group>"; };
 		96CC17CB1417EA0700EFC1BA /* _U1FileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _U1FileNode.h; sourceTree = "<group>"; };
 		96CC17CC1417EA0700EFC1BA /* _U1FileNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _U1FileNode.m; sourceTree = "<group>"; };
@@ -292,6 +307,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				91B3F2D5141E87F900939B3C /* AssetsLibrary.framework in Frameworks */,
 				96CC17D81417EA2B00EFC1BA /* CoreData.framework in Frameworks */,
 				96733B12140DFD6D0074D545 /* Security.framework in Frameworks */,
 				960D46161409E10200B73177 /* QuartzCore.framework in Frameworks */,
@@ -350,6 +366,8 @@
 				96CC17CA1417E9E500EFC1BA /* Generated */,
 				96CC17DF1418091100EFC1BA /* Parsers */,
 				96CC17C61417E5E400EFC1BA /* U1Files.xcdatamodeld */,
+				91B3F2DD141FDFBE00939B3C /* U1Asset.h */,
+				91B3F2DE141FDFBE00939B3C /* U1Asset.m */,
 				96CC17D91417EBF500EFC1BA /* U1Volume.h */,
 				96CC17DA1417EBF500EFC1BA /* U1Volume.m */,
 				960D4629140D99DB00B73177 /* U1Node.h */,
@@ -407,6 +425,8 @@
 		96CC17CA1417E9E500EFC1BA /* Generated */ = {
 			isa = PBXGroup;
 			children = (
+				91B3F2DA141FDFAB00939B3C /* _U1Asset.h */,
+				91B3F2DB141FDFAB00939B3C /* _U1Asset.m */,
 				96CC17CB1417EA0700EFC1BA /* _U1FileNode.h */,
 				96CC17CC1417EA0700EFC1BA /* _U1FileNode.m */,
 				96CC17CD1417EA0700EFC1BA /* _U1FolderNode.h */,
@@ -451,6 +471,7 @@
 		96E860B413F7251D0026783D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				91B3F2D4141E87F900939B3C /* AssetsLibrary.framework */,
 				96CC17D71417EA2B00EFC1BA /* CoreData.framework */,
 				96733B11140DFD6D0074D545 /* Security.framework */,
 				960D46151409E10200B73177 /* QuartzCore.framework */,
@@ -486,6 +507,8 @@
 				96E8614213F728380026783D /* U1FilesService.m */,
 				96CC17E314180C5F00EFC1BA /* U1FilesClient.h */,
 				96CC17E414180C5F00EFC1BA /* U1FilesClient.m */,
+				91B3F2D7141FC9BE00939B3C /* U1LocalAssetsManager.h */,
+				91A5E2DB142A70DF00EAAC2B /* U1LocalAssetsManager.m */,
 				969EF22613F8C10C00CEF6CB /* U1VolumesViewController.h */,
 				969EF22713F8C10C00CEF6CB /* U1VolumesViewController.m */,
 				969EF22813F8C10C00CEF6CB /* U1VolumesViewController.xib */,
@@ -498,6 +521,8 @@
 				960D4624140D8AF200B73177 /* U1ByteSizeValueTransformer.m */,
 				960D4626140D8B4400B73177 /* U1FriendlyDateValueTransformer.h */,
 				960D4627140D8B4400B73177 /* U1FriendlyDateValueTransformer.m */,
+				91A5E2DD142B727500EAAC2B /* U1AssetUploadOperation.h */,
+				91A5E2DE142B727500EAAC2B /* U1AssetUploadOperation.m */,
 				965D7EB71429690C00E4754F /* U1NavigationBar.h */,
 				965D7EB81429690C00E4754F /* U1NavigationBar.m */,
 				96A169A21430D53600E4C990 /* U1LocalFileInfo.h */,
@@ -818,6 +843,10 @@
 				96CC17DE1417EF7200EFC1BA /* U1DataRepository.m in Sources */,
 				96CC17E21418094800EFC1BA /* U1NodeJSONParser.m in Sources */,
 				96CC17E514180C6000EFC1BA /* U1FilesClient.m in Sources */,
+				91B3F2DC141FDFAB00939B3C /* _U1Asset.m in Sources */,
+				91B3F2DF141FDFBE00939B3C /* U1Asset.m in Sources */,
+				91A5E2DC142A70DF00EAAC2B /* U1LocalAssetsManager.m in Sources */,
+				91A5E2DF142B727600EAAC2B /* U1AssetUploadOperation.m in Sources */,
 				965D7EB91429690C00E4754F /* U1NavigationBar.m in Sources */,
 				96A169A41430D53700E4C990 /* U1LocalFileInfo.m in Sources */,
 			);
@@ -939,14 +968,14 @@
 		96E860F013F7251D0026783D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Zachery Bir (P7WDPDEFHU)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Files/Files-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "Files/Files-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "84E0B7E6-02A2-46EF-9C76-AA80C48130A7";
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
@@ -1022,9 +1051,10 @@
 		96CC17C61417E5E400EFC1BA /* U1Files.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				96A56430143265B4007A1A93 /* U1Files 1.0-3.xcdatamodel */,
 				96CC17C71417E5E400EFC1BA /* U1Files.xcdatamodel */,
 			);
-			currentVersion = 96CC17C71417E5E400EFC1BA /* U1Files.xcdatamodel */;
+			currentVersion = 96A56430143265B4007A1A93 /* U1Files 1.0-3.xcdatamodel */;
 			path = U1Files.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 
=== modified file 'Files/Files-Info.plist'
--- Files/Files-Info.plist	2011-09-27 14:42:09 +0000
+++ Files/Files-Info.plist	2011-10-04 14:38:28 +0000
@@ -6,6 +6,8 @@
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array/>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -22,8 +24,10 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array/>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
@@ -43,5 +47,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UTExportedTypeDeclarations</key>
+	<array/>
+	<key>UTImportedTypeDeclarations</key>
+	<array/>
 </dict>
 </plist>
 
=== modified file 'Files/FilesAppDelegate.m'
--- Files/FilesAppDelegate.m	2011-09-27 14:36:00 +0000
+++ Files/FilesAppDelegate.m	2011-10-04 14:38:28 +0000
@@ -13,6 +13,10 @@
 //  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 <AssetsLibrary/ALAssetsLibrary.h>
+#import <AssetsLibrary/ALAssetsGroup.h>
+#import <AssetsLibrary/ALAsset.h>
+
 #import "FilesAppDelegate.h"
 
 #import "U1AccountManager.h"
@@ -20,35 +24,41 @@
 #import "U1FileNode.h"
 #import "U1FilePreviewViewController.h"
 #import "U1FilesClient.h"
+#import "U1LocalAssetsManager.h"
 #import "U1FilesService.h"
 #import "U1FolderNode.h"
 #import "U1FolderViewController.h"
 #import "U1LoginController.h"
 #import "U1Node.h"
 #import "U1VolumesViewController.h"
+#import "U1Volume.h"
 
 
 @interface FilesAppDelegate () <U1FolderViewControllerDelegate, U1VolumesViewControllerDelegate, U1LoginControllerDelegate>
 @property (retain) U1FilesService *filesService;
 @property (retain) U1FilesClient *filesClient;
+@property (retain) U1LocalAssetsManager *localAssetsManager;
 @property (retain) U1LoginController *loginController;
 @property (retain) U1DataRepository *dataRepository;
-- (NSURL*)dataStoreURL;
 - (void)showVolumes;
 - (void)showLoginController;
+- (void)ensureUploadFolder;
+- (NSString*)remoteUploadFolderPath;
+- (NSString*)localUploadQueuePath;
 @end
 
 
 @implementation FilesAppDelegate
 
 @synthesize window;
-@synthesize filesService, filesClient, navController, loginController, dataRepository;
+@synthesize filesService, filesClient, localAssetsManager, navController, loginController, dataRepository;
 
 - (void)dealloc
 {
 	[window release];
 	[filesService release];
 	[filesClient release];
+	[localAssetsManager release];
 	[navController release];
 	[loginController release];
 	[dataRepository release];
@@ -59,51 +69,104 @@
 {
 	[self.window makeKeyAndVisible];
 
+	return YES;
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application;
+{
 	if (![[U1AccountManager sharedAccountManager] hasCredentials])
 	{
 		[self showLoginController];
 	}
 	else
 	{
-		[self showVolumes];
+		self.filesService = [U1FilesService sharedFilesService];
+		self.filesClient = [U1FilesClient sharedFilesClient];
+
+		self.localAssetsManager = [U1LocalAssetsManager sharedFilesManager];
+		NSLog(@"Showing Volumes: Reading localAssetsToUpload from filesystem.");
+		NSMutableArray *uploadQueue = [NSMutableArray arrayWithContentsOfFile:[self localUploadQueuePath]];
+		if (uploadQueue != nil) {
+			NSLog(@"Retrieved the upload queue from the filesystem.");
+			NSLog(@"Length of the array on filesystem: %d", [uploadQueue count]);
+			self.localAssetsManager.localAssetsToUpload = uploadQueue;
+			NSLog(@"Read in the file, now we delete it.");
+			NSError *error = nil;
+			[[NSFileManager defaultManager] removeItemAtPath:[self localUploadQueuePath] error:&error];
+		}
+
+		[self ensureUploadFolder];
 	}
-
-	return YES;
+}
+
+- (void)ensureUploadFolder;
+{
+	[self.filesClient volumesWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
+		dispatch_async(dispatch_get_main_queue(), ^(void) {
+			// iterate over volumeInfos. If there isn't one there called "Pictures - <device name>", create it.
+			BOOL found = NO;
+			NSLog(@"Walking the volumes, to see if it has been created already.");
+			for (U1Volume *volume in volumeInfos) {
+				if ([volume.path isEqualToString:[self remoteUploadFolderPath]])
+				{
+					NSLog(@"Found the volume. No need to try to create it.");
+					found = YES;
+					self.localAssetsManager.remoteUploadVolume = volume;
+					break;
+				}
+			}
+			if (!found)
+			{
+				NSLog(@"Didn't find the volume. Creating it.");
+				[self.filesClient createVolumeAtPath:[self remoteUploadFolderPath]
+									 completionBlock:^(U1Volume *volume, NSError *error) {
+										 self.localAssetsManager.remoteUploadVolume = volume;
+										 [self.localAssetsManager uploadPendingAssets];
+										 [self.localAssetsManager checkForNewAssets];
+										 NSLog(@"Error: %@", error);
+				}];
+			} else
+			{
+				[self.localAssetsManager uploadPendingAssets];
+				[self.localAssetsManager checkForNewAssets];
+			}
+			[self showVolumes];
+		});
+	}];
+}
+
+- (NSString *)remoteUploadFolderPath;
+{
+	return [NSString stringWithFormat:@"/~/Pictures - %@", [[UIDevice currentDevice] name]];
+}
+
+- (NSString*)localUploadQueuePath;
+{
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+	return [[paths objectAtIndex:0] stringByAppendingPathComponent:@"localAssetsToUpload.array"];
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application;
 {
 	[self.dataRepository save:NULL];
+	NSLog(@"Application Resigning: Writing localAssetsToUpload (%d items) to the filesystem.", [self.localAssetsManager.localAssetsToUpload count]);
+	[self.localAssetsManager.localAssetsToUpload writeToFile:[self localUploadQueuePath] atomically:YES];
+	// serialize self.filesManager's localAssetsToUpload to the filesystem
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application;
 {
 	// TODO: check error
 	[self.dataRepository save:NULL];
-}
-
-- (NSURL*)dataStoreURL;
-{
-	NSURL *cachesDirectory = [[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask] lastObject];
-	NSURL *storeURL = [NSURL URLWithString:@"U1Files.sqlite" relativeToURL:cachesDirectory];
-	return storeURL;
+	NSLog(@"Application Terminating: Writing localAssetsToUpload (%d items) to the filesystem.", [self.localAssetsManager.localAssetsToUpload count]);
+	[self.localAssetsManager.localAssetsToUpload writeToFile:[self localUploadQueuePath] atomically:YES];
+	// serialize self.filesManager's localAssetsToUpload to the filesystem
 }
 
 - (void)showVolumes;
 {
-	filesService = [U1FilesService new];
-	
-	NSURL *storeURL = [self dataStoreURL];
-	self.dataRepository = [[U1DataRepository alloc] initWithStoreURL:storeURL];
-	[dataRepository release];
-
-	filesClient = [[U1FilesClient alloc] init];
-	[self.filesClient setFilesService:filesService];
-	[self.filesClient setDataRepository:self.dataRepository];
-
 	U1VolumesViewController *rootController = [U1VolumesViewController new];
 	rootController.delegate = self;
-	rootController.filesService = self.filesService;
 	
 	[self.navController setViewControllers:[NSArray arrayWithObject:rootController] animated:NO];
 }
@@ -119,7 +182,7 @@
 {
 	[self.navController dismissModalViewControllerAnimated:YES];
 	self.loginController = nil;
-	[self showVolumes];
+	[self applicationDidBecomeActive:nil];
 }
 
 
@@ -130,14 +193,12 @@
 	if ([node isFolder])
 	{
 		U1FolderViewController *nextFolderController = [[U1FolderViewController alloc] initWithNodeResourcePath:node.resourcePath];
-		nextFolderController.filesClient = self.filesClient;
 		nextFolderController.delegate = self;
 		[self.navController pushViewController:nextFolderController animated:YES];
 	}
 	else if ([node isFile])
 	{
 		U1FilePreviewViewController *fileController = [[U1FilePreviewViewController alloc] initWithNode:(id)node];
-		fileController.filesClient = self.filesClient;
 		[self.navController pushViewController:fileController animated:YES];
 	}
 }
@@ -145,11 +206,10 @@
 
 #pragma mark U1VolumesControllerDelegate Methods
 
-- (void)volumesController:(U1VolumesViewController *)volumesController didSelectVolume:(NSDictionary *)volume;
+- (void)volumesController:(U1VolumesViewController *)volumesController didSelectVolume:(U1Volume *)volume;
 {
-	NSString *nodePath = [volume objectForKey:@"node_path"];
+	NSString *nodePath = volume.nodePath;
 	U1FolderViewController *folderController = [[U1FolderViewController alloc] initWithNodeResourcePath:nodePath];
-	folderController.filesClient = self.filesClient;
 	folderController.delegate = self;
 	[self.navController pushViewController:folderController animated:YES];
 }
 
=== added file 'Files/Generated/_U1Asset.h'
--- Files/Generated/_U1Asset.h	1970-01-01 00:00:00 +0000
+++ Files/Generated/_U1Asset.h	2011-10-04 14:38:28 +0000
@@ -0,0 +1,76 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to U1Asset.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+
+
+
+
+
+@interface U1AssetID : NSManagedObjectID {}
+@end
+
+@interface _U1Asset : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (U1AssetID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSString *filename;
+
+
+//- (BOOL)validateFilename:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *groupId;
+
+
+//- (BOOL)validateGroupId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *url;
+
+
+//- (BOOL)validateUrl:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@end
+
+@interface _U1Asset (CoreDataGeneratedAccessors)
+
+@end
+
+@interface _U1Asset (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSString*)primitiveFilename;
+- (void)setPrimitiveFilename:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveGroupId;
+- (void)setPrimitiveGroupId:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveUrl;
+- (void)setPrimitiveUrl:(NSString*)value;
+
+
+
+
+@end
 
=== added file 'Files/Generated/_U1Asset.m'
--- Files/Generated/_U1Asset.m	1970-01-01 00:00:00 +0000
+++ Files/Generated/_U1Asset.m	2011-10-04 14:38:28 +0000
@@ -0,0 +1,64 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to U1Asset.m instead.
+
+#import "_U1Asset.h"
+
+@implementation U1AssetID
+@end
+
+@implementation _U1Asset
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"Asset" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"Asset";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"Asset" inManagedObjectContext:moc_];
+}
+
+- (U1AssetID*)objectID {
+	return (U1AssetID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic filename;
+
+
+
+
+
+
+@dynamic groupId;
+
+
+
+
+
+
+@dynamic url;
+
+
+
+
+
+
+
+
+
+
+@end
 
=== modified file 'Files/Generated/_U1Volume.h'
--- Files/Generated/_U1Volume.h	2011-09-08 16:59:34 +0000
+++ Files/Generated/_U1Volume.h	2011-10-04 14:38:28 +0000
@@ -2,6 +2,7 @@
 // Make changes to U1Volume.h instead.
 
 #import <CoreData/CoreData.h>
+#import "U1Node.h"
 
 
 
@@ -9,7 +10,7 @@
 @interface U1VolumeID : NSManagedObjectID {}
 @end
 
-@interface _U1Volume : NSManagedObject {}
+@interface _U1Volume : U1Node {}
 + (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
 + (NSString*)entityName;
 + (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
@@ -18,6 +19,14 @@
 
 
 
+@property (nonatomic, retain) NSString *nodePath;
+
+
+//- (BOOL)validateNodePath:(id*)value_ error:(NSError**)error_;
+
+
+
+
 
 @end
 
@@ -28,4 +37,10 @@
 @interface _U1Volume (CoreDataGeneratedPrimitiveAccessors)
 
 
+- (NSString*)primitiveNodePath;
+- (void)setPrimitiveNodePath:(NSString*)value;
+
+
+
+
 @end
 
=== modified file 'Files/Generated/_U1Volume.m'
--- Files/Generated/_U1Volume.m	2011-09-08 16:59:34 +0000
+++ Files/Generated/_U1Volume.m	2011-10-04 14:38:28 +0000
@@ -36,6 +36,13 @@
 
 
 
+@dynamic nodePath;
+
+
+
+
+
+
 
 
 
 
=== added file 'Files/U1Asset.h'
--- Files/U1Asset.h	1970-01-01 00:00:00 +0000
+++ Files/U1Asset.h	2011-10-04 14:38:28 +0000
@@ -0,0 +1,5 @@
+#import "_U1Asset.h"
+
+@interface U1Asset : _U1Asset {}
+// Custom logic goes here.
+@end
 
=== added file 'Files/U1Asset.m'
--- Files/U1Asset.m	1970-01-01 00:00:00 +0000
+++ Files/U1Asset.m	2011-10-04 14:38:28 +0000
@@ -0,0 +1,7 @@
+#import "U1Asset.h"
+
+@implementation U1Asset
+
+// Custom logic goes here.
+
+@end
 
=== added file 'Files/U1AssetUploadOperation.h'
--- Files/U1AssetUploadOperation.h	1970-01-01 00:00:00 +0000
+++ Files/U1AssetUploadOperation.h	2011-10-04 14:38:28 +0000
@@ -0,0 +1,25 @@
+//
+//  U1AssetUploadOperation.h
+//  Files
+//
+//  Created by Zachery Bir on 9/22/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <AssetsLibrary/AssetsLibrary.h>
+
+@class U1Asset;
+@class U1FolderNode;
+
+@interface U1AssetUploadOperation : NSOperation {
+@private
+    
+}
+@property (retain) ALAssetRepresentation *representation;
+@property (retain) NSData *assetData;
+@property (retain) U1Asset *asset;
+@property (retain) U1FolderNode *folder;
+@property (retain) NSString *filename;
+@property (retain) NSError *error;
+@end
 
=== added file 'Files/U1AssetUploadOperation.m'
--- Files/U1AssetUploadOperation.m	1970-01-01 00:00:00 +0000
+++ Files/U1AssetUploadOperation.m	2011-10-04 14:38:28 +0000
@@ -0,0 +1,74 @@
+//
+//  U1AssetUploadOperation.m
+//  Files
+//
+//  Created by Zachery Bir on 9/22/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "U1AssetUploadOperation.h"
+#import "U1Asset.h"
+#import "U1FilesClient.h"
+
+@interface U1AssetUploadOperation ()
+@property (getter=isExecuting) BOOL executing;
+@property (getter=isFinished) BOOL finished;
+- (void)finishExecuting;
+@end
+
+@implementation U1AssetUploadOperation
+
+@synthesize executing, finished, asset, assetData, representation, folder, filename, error;
+
+- (id)init
+{
+    self = [super init];
+    if (self) {
+        // Initialization code here.
+    }
+    
+    return self;
+}
+
+- (BOOL)isConcurrent;
+{
+	return YES;
+}
+
+- (void)finishExecuting;
+{
+	[self willChangeValueForKey:@"isExecuting"];
+	[self willChangeValueForKey:@"isFinished"];
+	self.finished = YES;
+	self.executing = NO;
+	[self didChangeValueForKey:@"isFinished"];
+	[self didChangeValueForKey:@"isExecuting"];
+//	[UONetworkStatusCoordinator removeNetworkActivity];
+}
+
+- (void)start;
+{
+	// Trigger the filesClient to upload our asset, setting the completion block to marking ourself completed.
+	[self willChangeValueForKey:@"isExecuting"];
+	self.executing = YES;
+	[self didChangeValueForKey:@"isExecuting"];
+	dispatch_async(dispatch_get_main_queue(), ^(void) {
+		U1FilesClient *filesClient = [U1FilesClient sharedFilesClient];
+		[filesClient uploadContentData:self.assetData
+							  toFolder:self.folder withResourceName:self.filename progressBlock:^(long long bytesUploaded, long long totalBytes) {
+								  dispatch_async(dispatch_get_main_queue(), ^(void){
+									  NSLog(@"Uploaded %lld of %lld for %@", bytesUploaded, totalBytes, self.filename);
+								  });
+							  } completionBlock:^(U1FileNode *updatedNode, NSError *uploadError) {
+								  self.error = uploadError;
+								  [self finishExecuting];
+							  }];
+	});
+}
+
+- (void)dealloc
+{
+    [super dealloc];
+}
+
+@end
 
=== modified file 'Files/U1DataRepository.h'
--- Files/U1DataRepository.h	2011-09-08 16:59:34 +0000
+++ Files/U1DataRepository.h	2011-10-04 14:38:28 +0000
@@ -20,12 +20,16 @@
 
 
 @interface U1DataRepository : NSObject
-
++ (U1DataRepository*)sharedDataRepository;
 - (id)initWithStoreURL:(NSURL*)storeURL;
 - (BOOL)save:(NSError**)error;
 
 - (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;
+
 - (void)dispatchBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
 
 - (void)dispatchAsyncBlockWithManagedObjectContext:(void(^)(NSManagedObjectContext *context))block;
 
=== modified file 'Files/U1DataRepository.m'
--- Files/U1DataRepository.m	2011-09-08 16:59:34 +0000
+++ Files/U1DataRepository.m	2011-10-04 14:38:28 +0000
@@ -19,6 +19,7 @@
 
 #import "U1Node.h"
 
+static U1DataRepository *sharedDataRepository = nil;
 
 @interface U1DataRepository ()
 
@@ -35,6 +36,48 @@
 
 @synthesize model, mainContext, storeCoordinator;
 
++ (U1DataRepository*)sharedDataRepository;
+{
+	if (sharedDataRepository == nil)
+	{
+		NSURL *cachesDirectory = [[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory
+																		 inDomains:NSUserDomainMask] lastObject];
+		NSURL *storeURL = [NSURL URLWithString:@"U1Files.sqlite" relativeToURL:cachesDirectory];
+		sharedDataRepository = [[super allocWithZone:NULL] initWithStoreURL:storeURL];
+	}
+	return sharedDataRepository;
+}
+
++ (id)allocWithZone:(NSZone *)zone;
+{
+	return [[self sharedDataRepository] retain];
+}
+
+- (id)copyWithZone:(NSZone *)zone;
+{
+	return self;
+}
+
+- (id)retain;
+{
+	return self;
+}
+
+- (NSUInteger)retainCount;
+{
+	return NSUIntegerMax;
+}
+
+- (void)release;
+{
+	
+}
+
+- (id)autorelease;
+{
+	return self;
+}
+
 - (id)initWithStoreURL:(NSURL*)storeURL;
 {
 	if (!(self = [super init]))
@@ -93,6 +136,16 @@
 	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];
+}
+
 - (NSArray*)fetchEntitiesForClass:(Class)class inContext:(NSManagedObjectContext*)context withPredicate:(NSPredicate*)predicate sortDescriptors:(NSArray*)sortDescriptors error:(NSError**)error;
 {
 	NSParameterAssert(class != nil);
 
=== modified file 'Files/U1FilePreviewViewController.m'
--- Files/U1FilePreviewViewController.m	2011-09-27 14:36:00 +0000
+++ Files/U1FilePreviewViewController.m	2011-10-04 14:38:28 +0000
@@ -78,6 +78,7 @@
 	self = [super initWithNibName:@"U1FilePreviewViewController" bundle:nil];
 	if (self == nil)
 		return nil;
+	filesClient = [U1FilesClient sharedFilesClient];
 	self.node = theNode;
 	self.title = [node.path lastPathComponent];
 	
 
=== modified file 'Files/U1Files.xcdatamodeld/.xccurrentversion'
--- Files/U1Files.xcdatamodeld/.xccurrentversion	2011-09-08 16:59:34 +0000
+++ Files/U1Files.xcdatamodeld/.xccurrentversion	2011-10-04 14:38:28 +0000
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>U1Files.xcdatamodel</string>
+	<string>U1Files 1.0-3.xcdatamodel</string>
 </dict>
 </plist>
 
=== added directory 'Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel'
=== added file 'Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/elements'
 Binary files Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/elements	1970-01-01 00:00:00 +0000 and Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/elements	2011-10-04 14:38:28 +0000 differ
=== added file 'Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/layout'
 Binary files Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/layout	1970-01-01 00:00:00 +0000 and Files/U1Files.xcdatamodeld/U1Files 1.0-3.xcdatamodel/layout	2011-10-04 14:38:28 +0000 differ
=== modified file 'Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/elements'
 Binary files Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/elements	2011-09-08 16:59:34 +0000 and Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/elements	2011-10-04 14:38:28 +0000 differ
=== modified file 'Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/layout'
 Binary files Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/layout	2011-09-08 16:59:34 +0000 and Files/U1Files.xcdatamodeld/U1Files.xcdatamodel/layout	2011-10-04 14:38:28 +0000 differ
=== modified file 'Files/U1FilesClient.h'
--- Files/U1FilesClient.h	2011-09-27 14:36:00 +0000
+++ Files/U1FilesClient.h	2011-10-04 14:38:28 +0000
@@ -16,7 +16,7 @@
 #import <Foundation/Foundation.h>
 
 @class NSFetchedResultsController;
-@class U1Node, U1FileNode, U1FolderNode, U1NodeChildrenResultSet, U1LocalFileInfo;
+@class U1Node, U1FileNode, U1FolderNode, U1NodeChildrenResultSet, U1Volume, U1LocalFileInfo;
 @class U1DataRepository, U1FilesService;
 
 
@@ -25,11 +25,16 @@
 @property (retain) U1DataRepository *dataRepository;
 @property (retain) U1FilesService *filesService;
 
++ (U1FilesClient *)sharedFilesClient;
+
+- (id)volumesWithCompletionBlock:(void(^)(NSArray *volumes, NSError *error))completionBlock;
 - (id)fetchNodeWithResourcePath:(NSString*)nodePath completionBlock:(void(^)(U1Node *node, NSFetchedResultsController *childrenResultsController, NSError *error))completionBlock;
 - (id)deleteNode:(U1Node*)node completionBlock:(void(^)(NSError *error))completionBlock;
 - (id)uploadContentData:(NSData*)contentData toFolder:(U1FolderNode*)folderNode withResourceName:(NSString*)resourceName progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(U1FileNode *updatedNode, NSError *error))completionBlock;
 - (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
 - (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlock:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(U1Volume *volume, NSError *error))completionBlock;
 - (BOOL)isNodeSavedLocally:(U1FileNode*)node;
 - (U1LocalFileInfo*)localInfoForNode:(U1FileNode*)node;
 
 
=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-09-27 14:36:00 +0000
+++ Files/U1FilesClient.m	2011-10-04 14:38:28 +0000
@@ -23,22 +23,93 @@
 #import "U1FolderNode.h"
 #import "U1LocalFileInfo.h"
 #import "U1Node.h"
+#import "U1Volume.h"
 
 
 @interface U1FilesClient ()
 - (NSURL*)fileURLForNode:(U1FileNode*)node;
 @end
 
+static U1FilesClient *sharedFilesClient = nil;
 
 @implementation U1FilesClient
 
 @synthesize dataRepository, filesService;
 
-- (void)dealloc;
-{
-	[dataRepository release];
-	[filesService release];
-	[super dealloc];
++ (U1FilesClient*)sharedFilesClient;
+{
+	if (sharedFilesClient == nil)
+	{
+		sharedFilesClient = [[super allocWithZone:NULL] init];
+	}
+	return sharedFilesClient;
+}
+
++ (id)allocWithZone:(NSZone *)zone;
+{
+	return [[self sharedFilesClient] retain];
+}
+
+- (id)copyWithZone:(NSZone *)zone;
+{
+	return self;
+}
+
+- (id)retain;
+{
+	return self;
+}
+
+- (NSUInteger)retainCount;
+{
+	return NSUIntegerMax;
+}
+
+- (void)release;
+{
+	
+}
+
+- (id)autorelease;
+{
+	return self;
+}
+
+- (id)init;
+{
+	self = [super init];
+	if (self == nil)
+		return nil;
+	dataRepository = [U1DataRepository sharedDataRepository];
+	filesService = [U1FilesService sharedFilesService];
+	return self;
+}
+
+- (id)volumesWithCompletionBlock:(void(^)(NSArray *volumes, NSError *error))completionBlock;
+{
+	NSParameterAssert(completionBlock != NULL);
+	
+	[self.filesService volumeInfoWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
+		
+		NSMutableArray *volumes = [NSMutableArray array];
+		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+			for (NSDictionary *volumeInfo in volumeInfos)
+			{
+				NSString *path = [volumeInfo objectForKey:@"path"];
+				NSPredicate *p = [NSPredicate predicateWithFormat:@"path = %@", path];
+				U1Volume *volume = [[self.dataRepository resultsForEntityClass:[U1Volume class] matchingPredicate:p withSortDescriptors:nil error:NULL] lastObject];
+				if (!volume)
+				{
+					volume = [U1Volume insertInManagedObjectContext:context];
+				}
+				[volume updatePropertiesFromJSONDictionary:volumeInfo];
+				[volumes addObject:volume];
+			}
+			[context save:NULL];
+		}];
+		completionBlock(volumes, error);
+	}];
+	return nil;
 }
 
 - (id)fetchNodeWithResourcePath:(NSString*)nodePath completionBlock:(void(^)(U1Node *node, NSFetchedResultsController *childrenResultsController, NSError *error))completionBlock;
@@ -144,9 +215,18 @@
 	}
 	
 	return [self.filesService uploadContentData:contentData forNode:node progressBlock:progressBlock completionBlock:^(NSDictionary *updatedNodeInfo, NSError *error) {
-		
-		[node updatePropertiesFromJSONDictionary:updatedNodeInfo];
-		completionBlock(node, error);
+		if (error != nil)
+		{
+			[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+				[context deleteObject:node];
+			}];
+			completionBlock(nil, error);
+		}
+		else
+		{
+			[node updatePropertiesFromJSONDictionary:updatedNodeInfo];
+			completionBlock(node, error);
+		}
 	}];
 }
 
@@ -160,6 +240,42 @@
 	return [self.filesService unpublishNode:node completionBlock:completionBlock];
 }
 
+- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlock:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
+{
+	NSString *resourcePath = folderNode.resourcePath;
+	resourcePath = [resourcePath stringByAppendingPathComponent:name];
+
+	U1FolderNode *node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
+	if (!node)
+	{
+		[self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+			U1FolderNode *newNode = [U1FolderNode insertInManagedObjectContext:context];
+			newNode.resourcePath = resourcePath;
+			newNode.kind = @"directory";
+			newNode.contentPath = [folderNode.contentPath stringByAppendingPathComponent:name];
+			newNode.parent = folderNode;
+			[context save:NULL];
+		}];
+		node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
+	}
+	
+	return [self.filesService createFolderAtPath:resourcePath completionBlock:^(NSDictionary *nodeInfo, NSError *error) {
+		[node updatePropertiesFromJSONDictionary:nodeInfo];
+		completionBlock(node, error);
+	}];
+}
+
+- (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) {
+			U1Volume *volume = [U1Volume insertInManagedObjectContext:context];
+			[volume updatePropertiesFromJSONDictionary:volumeInfo];
+			completionBlock(volume, error);
+		}];
+	}];
+}
+
 - (BOOL)isNodeSavedLocally:(U1FileNode*)node;
 {
 	NSString *contentPath = node.contentPath;
 
=== modified file 'Files/U1FilesService.h'
--- Files/U1FilesService.h	2011-09-08 16:59:34 +0000
+++ Files/U1FilesService.h	2011-10-04 14:38:28 +0000
@@ -15,12 +15,12 @@
 
 #import <Foundation/Foundation.h>
 
-@class U1Node, U1FileNode;
+@class U1Node, U1FileNode, U1FolderNode;
 
 
 @interface U1FilesService : NSObject
-
-- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfo, NSError *error))completionBlock;
++ (U1FilesService *)sharedFilesService;
+- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
 
 - (id)infoForNodeAtResourcePath:(NSString*)resourcePath includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
 - (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
@@ -30,5 +30,7 @@
 - (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlock:(void(^)(NSError *error))completionBlock;
 - (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
 - (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)createFolderAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
 
 @end
 
=== modified file 'Files/U1FilesService.m'
--- Files/U1FilesService.m	2011-09-27 14:36:00 +0000
+++ Files/U1FilesService.m	2011-10-04 14:38:28 +0000
@@ -23,11 +23,13 @@
 #import "U1Node.h"
 #import "U1FileNode.h"
 
+static U1FilesService *sharedFilesService = nil;
 
 @interface U1FilesService ()
 
 @property (retain) NSOperationQueue *networkQueue;
 
+- (NSURL*)URLForVolumeWithPath:(NSString*)volumePath;
 - (NSURL*)URLForNode:(NSString*)nodePath includeChildren:(BOOL)includeChildren;
 - (id)execute:(NSString*)method toURL:(NSURL*)url withParameters:(NSDictionary*)parameters requestBody:(NSString*)body parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
 - (id)execute:(NSString*)method toURL:(NSURL*)url withParameters:(NSDictionary*)parameters requestData:(NSData*)bodyData contentType:(NSString*)contentType parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
@@ -44,6 +46,45 @@
 
 @synthesize networkQueue;
 
++ (U1FilesService*)sharedFilesService;
+{
+	if (sharedFilesService == nil)
+	{
+		sharedFilesService = [[super allocWithZone:NULL] init];
+	}
+	return sharedFilesService;
+}
+
++ (id)allocWithZone:(NSZone *)zone;
+{
+	return [[self sharedFilesService] retain];
+}
+
+- (id)copyWithZone:(NSZone *)zone;
+{
+	return self;
+}
+
+- (id)retain;
+{
+	return self;
+}
+
+- (NSUInteger)retainCount;
+{
+	return NSUIntegerMax;
+}
+
+- (void)release;
+{
+	
+}
+
+- (id)autorelease;
+{
+	return self;
+}
+
 - (id)init;
 {
 	self = [super init];
@@ -59,7 +100,7 @@
 	[super dealloc];
 }
 
-- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfo, NSError *error))completionBlock;
+- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
 {
 	NSURL *volumesURL = [self URLForNode:@"/volumes" includeChildren:NO];
 	return [self execute:@"GET" toURL:volumesURL withParameters:nil requestBody:nil parseResponseBody:YES completionBlock:^(id results, NSError *error) {
@@ -205,9 +246,44 @@
 	}];
 }
 
+- (id)createFolderAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+{
+	NSParameterAssert(folderPath != nil);
+	NSParameterAssert(completionBlock != NULL);
+	
+	NSURL *nodeURL = [self URLForNode:folderPath includeChildren:NO];
+	return [self execute:@"PUT" toURL:nodeURL withParameters:nil requestBody:@"{\"kind\": \"directory\"}" parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+		completionBlock(results, error);
+	}];
+}
+
+- (id)createVolumeAtPath:(NSString*)volumePath completionBlock:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
+{
+	NSParameterAssert(volumePath != nil);
+	NSParameterAssert(completionBlock != NULL);
+	
+	NSURL *volumeURL = [self URLForVolumeWithPath:volumePath];
+	return [self execute:@"PUT" toURL:volumeURL withParameters:nil requestBody:@"" parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+		completionBlock(results, error);
+	}];
+}
+
 
 #pragma mark Private Methods
 
+- (NSURL*)URLForVolumeWithPath:(NSString*)volumePath;
+{
+	NSParameterAssert(volumePath != nil);
+	NSParameterAssert([volumePath hasPrefix:@"/"]);
+	
+	NSMutableString *urlString = [NSMutableString stringWithString:U1FilesServiceAPIBase];
+	[urlString appendString:U1FilesServiceAPIPath];
+	[urlString appendString:U1FilesServiceAPIVersion1];
+	[urlString appendString:@"/volumes"];
+	[urlString appendString:volumePath];
+	return [NSURL URLWithString:[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+}
+
 - (NSURL*)URLForNode:(NSString*)nodePath includeChildren:(BOOL)includeChildren;
 {
 	NSMutableString *urlString = [NSMutableString stringWithString:U1FilesServiceAPIBase];
 
=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-09-27 14:36:00 +0000
+++ Files/U1FolderViewController.m	2011-10-04 14:38:28 +0000
@@ -50,6 +50,7 @@
 	self.title = [theResourcePath lastPathComponent];
 	self.resourcePath = [theResourcePath copy];
 	self.byteSizeTransformer = [[U1ByteSizeValueTransformer new] autorelease];
+	filesClient = [U1FilesClient sharedFilesClient];
 	
 	UIBarButtonItem *uploadItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(uploadImage:)];
 	[self.navigationItem setRightBarButtonItem:uploadItem];
@@ -74,7 +75,6 @@
 - (void)dealloc;
 {
 	[loadingCell release];
-	[filesClient release];
 	[resourcePath release];
 	[node release];
 	[byteSizeTransformer release];
 
=== added file 'Files/U1LocalAssetsManager.h'
--- Files/U1LocalAssetsManager.h	1970-01-01 00:00:00 +0000
+++ Files/U1LocalAssetsManager.h	2011-10-04 14:38:28 +0000
@@ -0,0 +1,29 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 <Foundation/Foundation.h>
+
+@class U1DataRepository;
+@class U1Volume;
+
+
+@interface U1LocalAssetsManager : NSObject
+@property (retain) U1DataRepository *dataRepository;
+@property (retain) NSMutableArray *localAssetsToUpload;
+@property (retain) U1Volume *remoteUploadVolume;
++ (U1LocalAssetsManager *)sharedFilesManager;
+- (void)checkForNewAssets;
+- (void)uploadPendingAssets;
+@end
 
=== added file 'Files/U1LocalAssetsManager.m'
--- Files/U1LocalAssetsManager.m	1970-01-01 00:00:00 +0000
+++ Files/U1LocalAssetsManager.m	2011-10-04 14:38:28 +0000
@@ -0,0 +1,209 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 <AssetsLibrary/AssetsLibrary.h>
+
+#import "U1Asset.h"
+#import "U1DataRepository.h"
+#import "U1LocalAssetsManager.h"
+#import "U1AssetUploadOperation.h"
+#import "U1FilesClient.h"
+#import "U1Volume.h"
+
+@interface U1LocalAssetsManager ()
+@property (retain) ALAssetsLibrary *assetsLibrary;
+@property (retain) NSOperationQueue *uploadQueue;
+- (void)walkAssetsInLibrary;
+- (void)uploadRepresentation:(ALAssetRepresentation*)rep forAsset:(U1Asset*)asset;
+- (NSString *)generateFilenameForAsset:(ALAsset *)asset;
+@end
+
+static U1LocalAssetsManager *sharedFilesManager = nil;
+
+@implementation U1LocalAssetsManager
+
+@synthesize dataRepository, uploadQueue, localAssetsToUpload, remoteUploadVolume;
+@synthesize assetsLibrary;
+
++ (U1LocalAssetsManager *)sharedFilesManager;
+{
+	if (sharedFilesManager == nil)
+	{
+		sharedFilesManager = [[super allocWithZone:NULL] init];
+	}
+	return sharedFilesManager;
+}
+
++ (id)allocWithZone:(NSZone *)zone;
+{
+	return [[self sharedFilesManager] retain];
+}
+
+- (id)copyWithZone:(NSZone *)zone;
+{
+	return self;
+}
+
+- (id)retain;
+{
+	return self;
+}
+
+- (NSUInteger)retainCount;
+{
+	return NSUIntegerMax;
+}
+
+- (void)release;
+{
+	
+}
+
+- (id)autorelease;
+{
+	return self;
+}
+
+- (id)init
+{
+    if (!(self = [super init]))
+		return nil;
+
+    assetsLibrary = [[ALAssetsLibrary alloc] init];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(libraryChanged:) name:ALAssetsLibraryChangedNotification object:assetsLibrary];
+	dataRepository = [U1DataRepository sharedDataRepository];
+	uploadQueue = [[NSOperationQueue alloc] init];
+	self.localAssetsToUpload = [NSMutableArray array];
+    return self;
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[assetsLibrary release];
+    [super dealloc];
+}
+
+- (void)checkForNewAssets;
+{
+	NSLog(@"Checking for new assets.");
+	[self walkAssetsInLibrary];
+}
+
+- (void)libraryChanged:(NSNotification*)notification;
+{
+	NSLog(@"The library changed, so we'll walk the assets again.");
+	[self walkAssetsInLibrary];
+}
+
+- (void)walkAssetsInLibrary;
+{
+	[self.assetsLibrary enumerateGroupsWithTypes:ALAssetsGroupSavedPhotos
+									  usingBlock:^(ALAssetsGroup *group, BOOL *stop) {
+										  [group enumerateAssetsUsingBlock:^(ALAsset *asset, NSUInteger index, BOOL *stop) {
+											  
+											  ALAsset *someAsset = asset;
+											  if (someAsset == nil)
+												  return;
+											  dispatch_async(dispatch_get_main_queue(), ^(void) {
+												  ALAssetRepresentation *defaultRep = [someAsset defaultRepresentation];
+												  NSString *assetURL = [[defaultRep url] absoluteString];
+												  NSString *groupId = [group valueForProperty:ALAssetsGroupPropertyPersistentID];
+												  
+												  NSPredicate *p = [NSPredicate predicateWithFormat:@"groupId = %@ and url = %@",
+																	groupId, assetURL];
+												  NSError *error = nil;
+												  NSArray *results = [self.dataRepository resultsForEntityClass:[U1Asset class] matchingPredicate:p withSortDescriptors:nil error:&error];
+												  U1Asset *trackedAsset = [results lastObject];
+												  NSLog(@"Did we find an asset? (%@)", [trackedAsset description]);
+												  if (trackedAsset == nil)
+												  {
+													  if ([[someAsset valueForProperty:ALAssetPropertyType] isEqualToString:ALAssetTypePhoto]) {
+														  [self.dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+															  
+															  U1Asset *newAsset = [U1Asset insertInManagedObjectContext:context];
+															  newAsset.groupId = groupId;
+															  newAsset.url = assetURL;
+															  newAsset.filename = [self generateFilenameForAsset:someAsset];
+															  NSLog(@"Adding and uploading an asset for %@ (filename: %@)", newAsset.url, newAsset.filename);
+															  [self.localAssetsToUpload addObject:newAsset];
+															  [self uploadRepresentation:defaultRep forAsset:newAsset];
+															  [self.dataRepository save:NULL];
+														  }];
+													  }
+												  }
+											  });
+										  }];
+									  }
+									failureBlock:^(NSError *error) {
+										NSLog(@"Some error happened.");
+									}];
+}
+
+- (NSString *)generateFilenameForAsset:(ALAsset *)asset;
+{
+	// get the type of the asset
+	NSString *ext = @"JPG";
+	
+	if ([asset valueForProperty:ALAssetPropertyType] == ALAssetTypeVideo) {
+		ext = @"M4V";
+	}
+	
+	NSError *error = nil;
+	int idx = [[self.dataRepository resultsForEntityClass:[U1Asset class]
+										matchingPredicate:nil
+									  withSortDescriptors:nil
+													error:&error] count];
+
+	return [NSString stringWithFormat:@"IMG_%d.%@", idx, ext];
+}
+
+- (void)uploadPendingAssets;
+{
+	NSLog(@"Uploading %d assets", [self.localAssetsToUpload count]);
+	[self.localAssetsToUpload enumerateObjectsUsingBlock:^(U1Asset *obj, NSUInteger idx, BOOL *stop) {
+		[self.assetsLibrary assetForURL:[NSURL URLWithString:obj.url]
+							resultBlock:^(ALAsset *asset) {
+								[self uploadRepresentation:[asset defaultRepresentation] forAsset:obj];
+							} failureBlock:^(NSError *error) {
+								NSLog(@"Error: %@", error);
+							}];
+	}];
+}
+
+- (void)uploadRepresentation:(ALAssetRepresentation *)rep forAsset:(U1Asset *)asset
+{
+	// iterate self.localAssetsToUpload, creating NSOperations for each, giving each a completionBlock to remove the asset from localAssetsToUpload if it completed properly
+	Byte *buffer = (Byte*)malloc(rep.size);
+	NSUInteger length = [rep getBytes:buffer fromOffset:0 length:rep.size error:nil];
+	NSData *assetData = [NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
+	
+	U1AssetUploadOperation *operation = [[U1AssetUploadOperation alloc] init];
+	operation.asset = asset;
+	operation.folder = [self.remoteUploadVolume rootFolder];
+	operation.filename = asset.filename;
+	operation.assetData = assetData;
+	[operation setCompletionBlock:^{
+		dispatch_async(dispatch_get_main_queue(), ^(void) {
+			if (operation.error == nil) // or the error is somehow unrecoverable (e.g., over quota)
+			{
+				[self.localAssetsToUpload removeObject:asset];
+			}
+		});
+	}];
+	[self.uploadQueue addOperation:operation];
+}
+
+@end
 
=== modified file 'Files/U1Volume.h'
--- Files/U1Volume.h	2011-09-08 16:59:34 +0000
+++ Files/U1Volume.h	2011-10-04 14:38:28 +0000
@@ -1,5 +1,22 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 "_U1Volume.h"
+#import "U1FolderNode.h"
+
 
 @interface U1Volume : _U1Volume {}
-// Custom logic goes here.
+- (U1FolderNode *)rootFolder;
 @end
 
=== modified file 'Files/U1Volume.m'
--- Files/U1Volume.m	2011-09-08 16:59:34 +0000
+++ Files/U1Volume.m	2011-10-04 14:38:28 +0000
@@ -1,7 +1,59 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 "U1Volume.h"
+#import "U1FolderNode.h"
+#import "U1DataRepository.h"
+
 
 @implementation U1Volume
 
-// Custom logic goes here.
+- (void)updatePropertiesFromJSONDictionary:(NSDictionary *)jsonDictionary;
+{
+	[super updatePropertiesFromJSONDictionary:jsonDictionary];
+	self.nodePath = [jsonDictionary objectForKey:@"node_path"];
+}
+
+- (U1FolderNode *)rootFolder;
+{
+	// Look up a U1FolderNode with us as the volume path and some part of us as its name?
+	// If it doesn't exist, create it, and return it.
+	U1DataRepository *dataRepository = [U1DataRepository sharedDataRepository];
+	NSPredicate *p = [NSPredicate predicateWithFormat:@"resourcePath = %@", self.nodePath];
+	NSError *error = nil;
+	NSArray *results = [dataRepository resultsForEntityClass:[U1FolderNode class] matchingPredicate:p withSortDescriptors:nil error:&error];
+	U1FolderNode *rootFolder = [results lastObject];
+	NSLog(@"Did we find a root folder? (%@)", [rootFolder description]);
+
+	if (rootFolder == nil)
+	{
+		// Upload
+		[dataRepository dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+			
+			U1FolderNode *rootFolder = [U1FolderNode insertInManagedObjectContext:context];
+			rootFolder.resourcePath = self.nodePath;
+			rootFolder.contentPath = self.contentPath;
+			NSLog(@"Adding a rootFolder node for %@", self.nodePath);
+			[dataRepository save:NULL];
+		}];
+	
+		results = [dataRepository resultsForEntityClass:[U1FolderNode class] matchingPredicate:p withSortDescriptors:nil error:&error];
+		rootFolder = [results lastObject];
+	}
+
+	return rootFolder;
+}
 
 @end
 
=== modified file 'Files/U1VolumesViewController.h'
--- Files/U1VolumesViewController.h	2011-08-31 14:56:30 +0000
+++ Files/U1VolumesViewController.h	2011-10-04 14:38:28 +0000
@@ -17,7 +17,8 @@
 
 #import "PullRefreshTableViewController.h"
 
-@class U1FilesService;
+@class U1FilesClient;
+@class U1Volume;
 
 @protocol U1VolumesViewControllerDelegate;
 
@@ -27,12 +28,12 @@
 @property (nonatomic, retain, readonly) IBOutlet UITableViewCell *loadingCell;
 
 @property (assign) id<U1VolumesViewControllerDelegate> delegate;
-@property (nonatomic, retain) U1FilesService *filesService;
+@property (retain) U1FilesClient *filesClient;
 
 @end
 
 
 @protocol U1VolumesViewControllerDelegate <NSObject>
 @required
-- (void)volumesController:(U1VolumesViewController*)volumesController didSelectVolume:(NSDictionary*)volume;
+- (void)volumesController:(U1VolumesViewController*)volumesController didSelectVolume:(U1Volume*)volume;
 @end
 
=== modified file 'Files/U1VolumesViewController.m'
--- Files/U1VolumesViewController.m	2011-09-27 14:36:00 +0000
+++ Files/U1VolumesViewController.m	2011-10-04 14:38:28 +0000
@@ -15,18 +15,20 @@
 
 #import "U1VolumesViewController.h"
 
-#import "U1FilesService.h"
+#import "U1FilesClient.h"
+#import "U1Volume.h"
 
 
 @interface U1VolumesViewController ()
 @property (retain) NSArray *volumes;
+- (void)loadVolumes;
 @end
 
 
 @implementation U1VolumesViewController
 
 @synthesize loadingCell;
-@synthesize delegate, filesService;
+@synthesize delegate, filesClient;
 @synthesize volumes;
 
 - (id)init;
@@ -35,6 +37,7 @@
 	if (!self)
 		return nil;
 	self.title = NSLocalizedString(@"Home", @"");
+	filesClient = [U1FilesClient sharedFilesClient];
 	UIImage *logoImage = [UIImage imageNamed:@"logo_4_white"];
 	UIImageView *logoView = [[UIImageView alloc] initWithImage:logoImage];
 	[self.navigationItem setTitleView:logoView];
@@ -45,7 +48,6 @@
 - (void)dealloc;
 {
 	[loadingCell release];
-	[filesService release];
 	[volumes release];
 	[super dealloc];
 }
@@ -53,12 +55,18 @@
 - (void)viewDidLoad;
 {
 	[super viewDidLoad];
-	[self.filesService volumeInfoWithCompletionBlock:^(NSArray *volumeInfo, NSError *error) {
+	[self.filesClient volumesWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
 		dispatch_async(dispatch_get_main_queue(), ^(void) {
-			self.volumes = volumeInfo;
+			self.volumes = volumeInfos;
 			[self.tableView reloadData];
 		});
 	}];
+	[self loadVolumes];
+}
+
+- (void)refresh;
+{
+	[self loadVolumes];
 }
 
 - (void)viewDidUnload;
@@ -93,8 +101,8 @@
 		[cell setSelectionStyle:UITableViewCellSelectionStyleGray];
 		[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
 	}
-	NSDictionary *volume = [self.volumes objectAtIndex:indexPath.row];
-	NSString *volumePath = [volume objectForKey:@"path"];
+	U1Volume *volume = [self.volumes objectAtIndex:indexPath.row];
+	NSString *volumePath = volume.path;
 	if ([@"~/.ubuntuone/Purchased from Ubuntu One" isEqualToString:volumePath])
 		volumePath = @"Purchased Music";
 	if ([volumePath hasPrefix:@"~/"])
@@ -106,8 +114,19 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
 {
-	NSDictionary *volume = [self.volumes objectAtIndex:indexPath.row];
+	U1Volume *volume = [self.volumes objectAtIndex:indexPath.row];
 	[self.delegate volumesController:self didSelectVolume:volume];
 }
 
+- (void)loadVolumes;
+{
+	[self.filesClient volumesWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
+		dispatch_async(dispatch_get_main_queue(), ^(void) {
+			self.volumes = volumeInfos;
+			[self stopLoading];
+			[self.tableView reloadData];
+		});
+	}];
+}
+
 @end