Automatically attempts to open last used file.

Author: jenswilly

EAGLEView/AppDelegate.h

@@ -13,7 +13,9 @@
 #define DROPBOX_APP_SECRET @"pgvi4d7y3gt2lx0"
 #define GLOBAL_TINT_COLOR 0xe25454 // 0xff8d3a //0x9b3aff
 
+// Extern user defaults keys
 extern NSString *const kUserDefaults_lastDropboxPath;
+extern NSString *const kUserDefaults_lastFilePath;
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate, UIActionSheetDelegate>
 

EAGLEView/AppDelegate.m

@@ -15,6 +15,7 @@
 
 NSString *const kUserDefaults_lastDropboxPath = @"kUserDefaults_lastDropboxPath";
 NSString *const kUserDefaults_settingsKeepAlive = @"keep_awake";
+NSString *const kUserDefaults_lastFilePath = @"lastFilePath";
 
 @implementation AppDelegate
 {

EAGLEView/DocumentChooserViewController.m

@@ -71,7 +71,7 @@ - (void)viewDidAppear:(BOOL)animated
 		self.navigationItem.title = _path.lastPathComponent;
 
 	// Load from Dropbox
-	[[Dropbox sharedInstance] loadContentsForFolder:_path completion:^(BOOL success, NSArray *contents) {
+	[[Dropbox sharedInstance] loadContentsForFolder:_path completion:^(BOOL success, NSArray *contents, DBMetadata *metadata) {
 
 		// Remove HUD (whether it is there or not) and set title (possibly again)
 		[MBProgressHUD hideAllHUDsForView:self.view animated:YES];
@@ -128,7 +128,7 @@ - (void)setItem:(DBMetadata *)item
 		self.navigationItem.title = _item.filename;
 
 	// Load from Dropbox
-	[[Dropbox sharedInstance] loadContentsForFolder:_item.path completion:^(BOOL success, NSArray *contents) {
+	[[Dropbox sharedInstance] loadContentsForFolder:_item.path completion:^(BOOL success, NSArray *contents, DBMetadata *metadata) {
 
 		// Remove HUD (whether it is there or not) and set title (possibly again)
 		[MBProgressHUD hideAllHUDsForView:self.view animated:YES];
@@ -147,7 +147,7 @@ - (void)setItem:(DBMetadata *)item
 		else
 		{
 			// Error loading
-			UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Erro" message:@"Error loading contents from Dropbox" delegate:nil cancelButtonTitle:nil otherButtonTitles:@"OK", nil];
+			UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Error" message:@"Error loading contents from Dropbox" delegate:nil cancelButtonTitle:nil otherButtonTitles:@"OK", nil];
 			[alert show];
 		}
 	}];

EAGLEView/Dropbox.h

@@ -9,8 +9,11 @@
 #import <Foundation/Foundation.h>
 #import <DropboxSDK/DropboxSDK.h>
 
-typedef void(^foldercompletionBlock_t)(BOOL success, NSArray *contents);
-typedef void(^fileCompletionBlock_t)(BOOL success, NSString *filePath);
+// Extern definition of the Dropbox folder name (in case it is needed in some other file)
+extern NSString* const kDropboxFolderName;
+
+typedef void(^foldercompletionBlock_t)(BOOL success, NSArray *contents, DBMetadata *metadata);
+typedef void(^fileCompletionBlock_t)(BOOL success, NSString *filePath, DBMetadata *metadata);
 
 
 @interface Dropbox : NSObject <DBRestClientDelegate>

EAGLEView/Dropbox.m

@@ -9,8 +9,8 @@
 #import "Dropbox.h"
 #import "AppDelegate.h"
 
-static NSString* const kDropboxFolderName = @"dropbox";
-typedef void(^genericBlock_t)(BOOL success, id contents);	// This can be used for both folder and file completion blocks
+NSString* const kDropboxFolderName = @"dropbox";
+typedef void(^genericBlock_t)(BOOL success, id contents, DBMetadata *metadata);	// This can be used for both folder and file completion blocks
 
 @implementation Dropbox
 {
@@ -97,7 +97,7 @@ - (BOOL)loadContentsForFolder:(NSString*)path completion:(foldercompletionBlock_
 		if( _contents[ [path lowercaseString] ] )
 		{
 			// Yes: return it immediately in the completion block
-			completion( YES, _contents[ [path lowercaseString] ] );
+			completion( YES, _contents[ [path lowercaseString] ], nil );
 			return YES;
 		}
 
@@ -142,6 +142,8 @@ - (BOOL)loadFileAtPath:(NSString*)path completion:(fileCompletionBlock_t)complet
 		NSAssert( error == nil, @"Error creating documents folder: %@", [error localizedDescription] );
 	}
 
+	// Re-append last path component so the loaded file doesn't have the name of its parent directory.
+	dropboxFolderPath = [dropboxFolderPath stringByAppendingPathComponent:[path lastPathComponent]];
 	// Start loading
 	_isBusy = YES;
 	[[self restClient] loadFile:path intoPath:dropboxFolderPath];
@@ -153,14 +155,14 @@ - (BOOL)loadFileAtPath:(NSString*)path completion:(fileCompletionBlock_t)complet
 - (void)restClient:(DBRestClient*)client loadedFile:(NSString*)localPath contentType:(NSString*)contentType metadata:(DBMetadata*)metadata
 {
 	DEBUG_LOG( @"File loaded into path: %@", localPath );
-	_completionBlock( YES, localPath );
+	_completionBlock( YES, localPath, metadata );
 	_isBusy = NO;
 }
 
 - (void)restClient:(DBRestClient*)client loadFileFailedWithError:(NSError*)error
 {
 	DEBUG_LOG( @"There was an error loading the file - %@", [error localizedDescription] );
-	_completionBlock( NO, nil );
+	_completionBlock( NO, nil, nil );
 	_isBusy = NO;
 }
 
@@ -169,7 +171,7 @@ - (void)restClient:(DBRestClient *)client loadedMetadata:(DBMetadata *)metadata
 	// If the folder is deleted, we'll consider it non-existing
 	if( metadata.isDeleted )
 	{
-		_completionBlock( NO, nil );
+		_completionBlock( NO, nil, nil );
 		_isBusy = NO;
 		return;
 	}
@@ -178,14 +180,14 @@ - (void)restClient:(DBRestClient *)client loadedMetadata:(DBMetadata *)metadata
 	_contents[ [metadata.path lowercaseString] ] = metadata.contents;
 
 	// Call completion block
-	_completionBlock( YES, metadata.contents );
+	_completionBlock( YES, metadata.contents, metadata );
 	_isBusy = NO;
 }
 
 - (void)restClient:(DBRestClient *)client loadMetadataFailedWithError:(NSError *)error
 {
 	DEBUG_LOG( @"Error loading metadata: %@", [error localizedDescription] );
-	_completionBlock( NO, nil );
+	_completionBlock( NO, nil, nil );
 	_isBusy = NO;
 }
 

EAGLEView/ViewController.h

@@ -21,4 +21,13 @@
 - (void)openFile:(EAGLEFile*)file;
 - (IBAction)zoomToFitAction:(id)sender;
 
+/**
+ Opens a schematic or board file from the specified local path.
+ 
+ @return Returns YES if the operation was successful; NO otherwise
+ @param filePath The full path to the file to open.
+ @param error Error handle
+*/
+- (BOOL)openFileAtPath:(NSString*)filePath error:(NSError**)error;
+
 @end

EAGLEView/ViewController.m

@@ -48,26 +48,44 @@ - (void)viewDidLoad
 
 	// Show placeholder image
 	self.placeholderImageView.hidden = NO;
-
-	// Initialize file view. We have to initialize with a valid file. Otherwise the drawing context is messed up (for some reason).
-	NSError *error = nil;
-
-	_eagleFile = [EAGLEBoard boardFromBoardFile:@"" error:&error];	// Empty board
-	//_eagleFile = [EAGLESchematic schematicFromSchematicFile:@"" error:&error];	// Empty schematic
-	//_eagleFile = [EAGLESchematic schematicFromSchematicFile:@"#2014-003_Powerpack" error:&error];
-	//_eagleFile = [EAGLEBoard boardFromBoardFile:@"Gift card" error:nil];
-
-	_eagleFile.fileName = @"";
-	_eagleFile.fileDate = [NSDate date];
-	NSAssert( error == nil, @"Error loading file: %@", [error localizedDescription] );
 	[self.fileView setRelativeZoomFactor:0.1];
-	self.fileView.file = _eagleFile;
 
-	dispatch_after( dispatch_time( DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC ), dispatch_get_main_queue(), ^{
-		[self zoomToFitAction:nil];
-	});
-
-	[self updateBackgroundAndStatusBar];
+	// If we have a local file path saved in user defaults, attempt to open that
+	NSError *error = nil;
+	BOOL hasLoadedLastFile = NO;
+	NSString *lastUsedFilePath = [[NSUserDefaults standardUserDefaults] objectForKey:kUserDefaults_lastFilePath];
+	if( [lastUsedFilePath length] > 0 )
+	{
+		// Construct full path. Value in user defaults is relative to the app's dropbox folder in the documents folder.
+		NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES );
+		NSString *documentsFolder = paths[0];
+		NSString *fullPath = [[documentsFolder stringByAppendingPathComponent:kDropboxFolderName] stringByAppendingPathComponent:lastUsedFilePath];
+
+		DEBUG_LOG( @"Opening last used file: %@", fullPath );
+		hasLoadedLastFile = [self openFileAtPath:fullPath error:&error];
+		if( error )
+			NSLog( @"Error loading last used file: %@", error );
+	}
+	if( !hasLoadedLastFile )
+	{
+		// Initialize file view. We have to initialize with a valid file. Otherwise the drawing context is messed up (for some reason).
+		error = nil;
+		_eagleFile = [EAGLEBoard boardFromBoardFile:@"" error:&error];	// Empty board
+		//_eagleFile = [EAGLESchematic schematicFromSchematicFile:@"" error:&error];	// Empty schematic
+		//_eagleFile = [EAGLESchematic schematicFromSchematicFile:@"#2014-003_Powerpack" error:&error];
+		//_eagleFile = [EAGLEBoard boardFromBoardFile:@"Gift card" error:nil];
+
+		_eagleFile.fileName = @"";
+		_eagleFile.fileDate = [NSDate date];
+		NSAssert( error == nil, @"Error loading file: %@", [error localizedDescription] );
+		self.fileView.file = _eagleFile;
+
+		dispatch_after( dispatch_time( DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC ), dispatch_get_main_queue(), ^{
+			[self zoomToFitAction:nil];
+		});
+
+		[self updateBackgroundAndStatusBar];
+	}
 
 	// Add double tap recognizer (NB: behaves differently on iPad/iPhone – see the handler method
 	UITapGestureRecognizer *doubleTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleDoubleTapGesture:)];
@@ -431,6 +449,8 @@ - (IBAction)zoomToFitAction:(id)sender
 - (void)openFileFromURL:(NSURL*)fileURL
 {
 	// Make sure it's a file URL
+	[NSException raise:@"Possibly wrong method." format:@"This method seems to load only schematics. Are you sure that's right?"];
+
 	if( ![fileURL isFileURL] )
 		[NSException raise:@"Invalid URL" format:@"Expected file URL: %@", [fileURL absoluteString]];
 
@@ -461,6 +481,42 @@ - (void)openFile:(EAGLEFile*)file
 	});
 }
 
+- (BOOL)openFileAtPath:(NSString*)filePath error:(NSError**)error
+{
+	NSError *err;
+
+	// Schematic or board?
+	NSString *fileName = [filePath lastPathComponent];
+
+	if( [[[fileName pathExtension] lowercaseString] isEqualToString:@"sch"] )
+		_eagleFile = [EAGLESchematic schematicFromSchematicAtPath:filePath error:&err];
+	else if( [[[fileName pathExtension] lowercaseString] isEqualToString:@"brd"] )
+		_eagleFile = [EAGLEBoard boardFromBoardFileAtPath:filePath error:&err];
+
+	// Pass back error and return NO if we have an error
+	if( err != nil )
+	{
+		if( error )
+			*error = err;
+		return NO;
+	}
+
+	_eagleFile.fileName = fileName;
+//	_eagleFile.fileDate = fileDate;	/// TODO: date?
+
+	[self updateBackgroundAndStatusBar];
+
+	self.fileView.file = _eagleFile;
+	self.placeholderImageView.hidden = YES;	// Hide initial placeholder
+
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[self.fileView zoomToFitSize:self.scrollView.bounds.size animated:YES];
+		[MBProgressHUD hideHUDForView:self.view animated:YES];
+	});
+
+	return YES;
+}
+
 #pragma mark - Document Chooser Delegate methods
 
 - (void)documentChooserPickedDropboxFile:(DBMetadata *)metadata lastPath:(NSString*)lastPath
@@ -482,7 +538,7 @@ - (void)documentChooserPickedDropboxFile:(DBMetadata *)metadata lastPath:(NSStri
 	// Remember file data
 	NSDate *fileDate = metadata.lastModifiedDate;
 	NSString *fileName = [metadata.path lastPathComponent];
-	[[Dropbox sharedInstance] loadFileAtPath:metadata.path completion:^(BOOL success, NSString *filePath) {
+	[[Dropbox sharedInstance] loadFileAtPath:metadata.path completion:^(BOOL success, NSString *filePath, DBMetadata *metadata) {
 
 		if( success )
 		{
@@ -504,6 +560,10 @@ - (void)documentChooserPickedDropboxFile:(DBMetadata *)metadata lastPath:(NSStri
 			self.fileView.file = _eagleFile;
 			self.placeholderImageView.hidden = YES;	// Hide initial placeholder
 
+			// Save path in user defaults. This path is relative to the app's documents directory.
+			[[NSUserDefaults standardUserDefaults] setObject:metadata.path forKey:kUserDefaults_lastFilePath];
+			[[NSUserDefaults standardUserDefaults] synchronize];
+
 			dispatch_async(dispatch_get_main_queue(), ^{
 				[self.fileView zoomToFitSize:self.scrollView.bounds.size animated:YES];
 				[MBProgressHUD hideHUDForView:self.view animated:YES];

To-do.txt

@@ -28,6 +28,7 @@ To-do:
 - Fix part info popup location on iPhone
 - Add padding to auto-size bounding rect
 - Fix the goddamn zoom-to-fit!
+- Disable sheets picker if there is only one sheet/module or if it's a board file
 
 
 ------------------------
@@ -41,6 +42,7 @@ In progress/partly done:
 -----
 Done:
 
+√ Automatically open last file
 √ Placeholder view when no schematic/board is selected
 √ UI: double tap on module instance -> show module (first sheet)
 √ New Dropbox and zoom-to-fit icons