Bug fixes

CoreZen/Cache/ObjectCache.m

@@ -18,7 +18,7 @@ @interface ZENObjectCache ()
 - (instancetype)initWeakObjectCache;
 - (instancetype)initStrongObjectCache;
 
-- (void)initCommon:(NSString *)queueLabel;
+- (void)setupCommon:(NSString *)queueLabel;
 
 @end
 
@@ -28,7 +28,7 @@ - (instancetype)init {
 	return [self initWeakObjectCache];
 }
 
-- (void)initCommon:(NSString *)queueLabel {
+- (void)setupCommon:(NSString *)queueLabel {
 	static atomic_uint_fast64_t nextIdentifier = 0;
 	uint64_t cacheID = atomic_fetch_add(&nextIdentifier, 1);
 
@@ -41,7 +41,7 @@ - (instancetype)initWeakObjectCache {
 	if (self) {
 		_mapTable = [NSMapTable strongToWeakObjectsMapTable];
 
-		[self initCommon:@"ZENWeakObjectCache"];
+		[self setupCommon:@"ZENWeakObjectCache"];
 	}
 	return self;
 }
@@ -55,7 +55,7 @@ - (instancetype)initStrongObjectCache {
 	if (self) {
 		_mapTable = [NSMapTable strongToStrongObjectsMapTable];
 
-		[self initCommon:@"ZENStrongObjectCache"];
+		[self setupCommon:@"ZENStrongObjectCache"];
 	}
 	return self;
 }

CoreZen/Categories/NSFileManager+CoreZen.m

@@ -15,7 +15,7 @@ - (NSURL *)zen_findOrCreateURLForDirectory:(NSSearchPathDirectory)searchPathDire
 									create:(BOOL)create
 									 error:(NSError **)outError {
 	// Search for the directory
-	NSURL *url = [NSFileManager.defaultManager URLForDirectory:searchPathDirectory inDomain:domain appropriateForURL:nil create:create error:outError];
+	NSURL *url = [self URLForDirectory:searchPathDirectory inDomain:domain appropriateForURL:nil create:create error:outError];
 	if (!url) {
 		return nil;
 	}

CoreZen/Categories/NSNumber+CoreZen.m

@@ -14,7 +14,7 @@ @implementation NSNumber (CoreZen)
 + (NSInteger)zen_randomInteger {
 	int64_t randomBytes;
 	int result = SecRandomCopyBytes(kSecRandomDefault, 8, &randomBytes);
-	assert(result == errSecSuccess);
+	NSCAssert(result == errSecSuccess, @"SecRandomCopyBytes failed with status %d", result);
 	return randomBytes;
 }
 

CoreZen/Categories/NSURL+CoreZen.m

@@ -17,7 +17,9 @@ - (BOOL)zen_volumeName:(NSString **)outVolumeName
 	if ([self getResourceValue:outVolumeName forKey:NSURLVolumeLocalizedNameKey error:outError] &&
 		[self getResourceValue:outVolumeURL forKey:NSURLVolumeURLKey error:outError] &&
 		[self getResourceValue:&volumeUUID forKey:NSURLVolumeUUIDStringKey error:outError]) {
-		*outVolumeUUID = [[NSUUID alloc] initWithUUIDString:volumeUUID];
+		if (outVolumeUUID) {
+			*outVolumeUUID = [[NSUUID alloc] initWithUUIDString:volumeUUID];
+		}
 		return YES;
 	}
 	return NO;
@@ -45,18 +47,20 @@ + (BOOL)zen_volumeInfoForUUID:(NSUUID *)volumeUUID
 		if ([volumeURL getResourceValue:&uuid forKey:NSURLVolumeUUIDStringKey error:&error] &&
 			[uuid isEqual:volumeUUIDString]) {
 
-			[volumeURL getResourceValue:outVolumeName forKey:NSURLVolumeLocalizedNameKey error:&error];
-			[volumeURL getResourceValue:outVolumeURL forKey:NSURLVolumeURLKey error:&error];
-			return YES;
+			if ([volumeURL getResourceValue:outVolumeName forKey:NSURLVolumeLocalizedNameKey error:&error] &&
+				[volumeURL getResourceValue:outVolumeURL forKey:NSURLVolumeURLKey error:&error]) {
+				return YES;
+			}
+			return NO;
 		}
 	}
 	return NO;
 }
 
 - (NSString *)zen_relativePathToURL:(NSURL *)url {
 
-	NSString *fullPath = [url absoluteString];
-	NSString *basePath = [self absoluteString];
+	NSString *fullPath = [url path];
+	NSString *basePath = [self path];
 	if ([fullPath hasPrefix:basePath]) {
 		NSString *relativePath = [fullPath substringFromIndex:basePath.length];
 		return relativePath;
@@ -66,7 +70,7 @@ - (NSString *)zen_relativePathToURL:(NSURL *)url {
 
 - (NSUInteger)zen_fileSize {
 	NSError *error;
-	NSDictionary *attributes = [NSFileManager.defaultManager attributesOfItemAtPath:self.absoluteString error:&error];
+	NSDictionary *attributes = [NSFileManager.defaultManager attributesOfItemAtPath:self.path error:&error];
 	if (attributes) {
 		return attributes.fileSize;
 	}

CoreZen/Database/DatabaseQueue.m

@@ -20,7 +20,7 @@ - (instancetype)initWithURL:(NSURL *)URL;
 - (FMDatabase *)threadDatabase;
 
 @property (nonatomic, strong, readonly) NSURL *databaseURL;
-@property (nonatomic, strong, readonly) NSString *databaseKey;
+@property (nonatomic, copy, readonly) NSString *databaseKey;
 @property (nonatomic, strong, readonly) ZENWorkQueue *workQueue;
 
 @end;
@@ -105,7 +105,10 @@ - (FMDatabase *)threadDatabase {
 			database = [FMDatabase databaseWithPath:self.databaseKey];
 		}
 
-		[database open];
+		if (![database open]) {
+			NSLog(@"ERROR: Failed to open database at %@", self.databaseURL);
+			return nil;
+		}
 		[database executeUpdate:@"PRAGMA synchronous = 1;"];
 		[database setShouldCacheStatements:YES];
 
@@ -164,9 +167,11 @@ - (void)fetchSync:(ZENDatabaseBlock)fetchBlock {
 
 - (void)vacuumAsync {
 	[self.workQueue async:^(ZENWorkQueueToken *canceled) {
-		@autoreleasepool {
-			FMDatabase *database = self.threadDatabase;
-			[database executeUpdate:@"VACUUM;"];
+		if (!canceled.canceled) {
+			@autoreleasepool {
+				FMDatabase *database = self.threadDatabase;
+				[database executeUpdate:@"VACUUM;"];
+			}
 		}
 	}];
 }

CoreZen/Database/DatabaseSchema.m

@@ -51,12 +51,9 @@ - (void)initializeDatabase:(FMDatabase *)database {
 }
 
 - (NSArray *)tableNames {
-	static NSMutableArray *tableNames = nil;
-	if (!tableNames) {
-		tableNames = [NSMutableArray array];
-		for (Class<ZENDatabaseTable> tableClass in self.tableClasses) {
-			[tableNames addObject:[tableClass tableName]];
-		}
+	NSMutableArray *tableNames = [NSMutableArray array];
+	for (Class<ZENDatabaseTable> tableClass in self.tableClasses) {
+		[tableNames addObject:[tableClass tableName]];
 	}
 	return tableNames;
 }

CoreZen/Domain/ObjectRepository.h

@@ -107,8 +107,8 @@ typedef enum : NSUInteger {
 @end
 
 
-extern NSString *ZENObjectRepositoryNotificationObjectKey;
+extern NSString * const ZENObjectRepositoryNotificationObjectKey;
 
-extern NSString *ZENObjectRepositoryObjectAddedNotification;
-extern NSString *ZENObjectRepositoryObjectUpdatedNotification;
-extern NSString *ZENObjectRepositoryObjectDeletedNotification;
+extern NSString * const ZENObjectRepositoryObjectAddedNotification;
+extern NSString * const ZENObjectRepositoryObjectUpdatedNotification;
+extern NSString * const ZENObjectRepositoryObjectDeletedNotification;

CoreZen/Domain/ObjectRepository.m

@@ -104,7 +104,7 @@ - (void)sumAllVideoDuration:(ZENAsyncCountCompletionBlock)countBlock {
 - (void)sumAllVideoDurationForUI:(ZENAsyncCountCompletionBlock)countBlock {
 	// Bounce to main thread
 	[self sumAllVideoDuration:^(NSUInteger count) {
-		ZENCallAsyncCountCompletionBlockOnMainThread(countBlock, 0);
+		ZENCallAsyncCountCompletionBlockOnMainThread(countBlock, count);
 	}];
 }
 
@@ -134,6 +134,10 @@ - (void)fetchObjectByIdentifier:(ZENIdentifier)identifier
 		// and we only ever create and cache objects on this queue. If there was a race, only one instance
 		// can win and cache the object. The other instance would have a cache hit just before here.
 		object = [self fetchObjectByIdentifier:identifier database:database];
+		if (!object) {
+			ZENCallFetchResultsBlockOnThreadPool(resultsBlock, @[]);
+			return;
+		}
 		[self.cache cacheObject:object];
 
 		// Async initialize object
@@ -198,10 +202,11 @@ - (void)addObject:(ZENDomainObject *)domainObject
 		ZENObjectRepositoryNotificationObjectKey: domainObject
 	};
 
-	[self.cache cacheObject:domainObject];
 	[self.queue transactionAsync:^(FMDatabase *database) {
-		[self.table insertDTO:domainObject.basicDTO database:database];
-		ZENDeliverNotificationOnMainThread(ZENObjectRepositoryObjectAddedNotification, self, notificationData);
+		if ([self.table insertDTO:domainObject.basicDTO database:database]) {
+			[self.cache cacheObject:domainObject];
+			ZENDeliverNotificationOnMainThread(ZENObjectRepositoryObjectAddedNotification, self, notificationData);
+		}
 		ZENCallAsyncContinueBlockOnThreadPool(completion);
 	}];
 }
@@ -224,7 +229,7 @@ - (void) asyncInitAndAdd:(ZENDomainObject *)domainObject
 - (void) asyncInitAndAdd:(ZENDomainObject *)domainObject
 			uiCompletion:(ZENAsyncContinueBlock)completion {
 	[self asyncInitAndAdd:domainObject completion:^{
-			ZENCallAsyncContinueBlockOnThreadPool(completion);
+			ZENCallAsyncContinueBlockOnMainThread(completion);
 	}];
 }
 
@@ -259,10 +264,11 @@ - (void)deleteObject:(ZENDomainObject *)domainObject
 		ZENObjectRepositoryNotificationObjectKey: domainObject
 	};
 
-	[self.cache removeObject:domainObject.identifier];
 	[self.queue transactionAsync:^(FMDatabase *database) {
-		[self.table deleteByIdentifier:domainObject.identifier database:database];
-		ZENDeliverNotificationOnMainThread(ZENObjectRepositoryObjectDeletedNotification, self, notificationData);
+		if ([self.table deleteByIdentifier:domainObject.identifier database:database]) {
+			[self.cache removeObject:domainObject.identifier];
+			ZENDeliverNotificationOnMainThread(ZENObjectRepositoryObjectDeletedNotification, self, notificationData);
+		}
 		ZENCallAsyncContinueBlockOnThreadPool(completion);
 	}];
 }
@@ -292,7 +298,7 @@ - (void)zen_removeObserver:(id)observer {
 
 @end
 
-NSString *ZENObjectRepositoryNotificationObjectKey = @"ZENObjectRepositoryNotificationObject";
-NSString *ZENObjectRepositoryObjectAddedNotification = @"ZENObjectRepositoryObjectAddedNotification";
-NSString *ZENObjectRepositoryObjectUpdatedNotification = @"ZENObjectRepositoryObjectUpdatedNotification";
-NSString *ZENObjectRepositoryObjectDeletedNotification = @"ZENObjectRepositoryObjectDeletedNotification";
+NSString * const ZENObjectRepositoryNotificationObjectKey = @"ZENObjectRepositoryNotificationObject";
+NSString * const ZENObjectRepositoryObjectAddedNotification = @"ZENObjectRepositoryObjectAddedNotification";
+NSString * const ZENObjectRepositoryObjectUpdatedNotification = @"ZENObjectRepositoryObjectUpdatedNotification";
+NSString * const ZENObjectRepositoryObjectDeletedNotification = @"ZENObjectRepositoryObjectDeletedNotification";

CoreZen/Media/FrameRenderer.h

@@ -14,13 +14,19 @@
 typedef void (^ZENRenderFrameResultsBlock)(ZENRenderedFrame *frame);
 typedef void (^ZENRenderFramesResultsBlock)(NSArray<ZENRenderedFrame *> *frames);
 
+typedef NS_ENUM(NSInteger, ZENFrameRequestType) {
+	ZENFrameRequestTypeSeconds,
+	ZENFrameRequestTypePercentage
+};
+
 // Rendered frame result
 @interface ZENRenderedFrame : NSObject
 
 // The rendered video frame image
 @property (nonatomic, strong) NSImage *image;
 
 // The requested position of the frame
+@property (nonatomic) ZENFrameRequestType requestType;
 @property (nonatomic) int64_t requestedTimestamp;
 @property (nonatomic) double requestedSeconds;
 @property (nonatomic) double requestedPercentage;

CoreZen/Media/FrameRenderer.m

@@ -42,6 +42,7 @@ - (ZENWorkQueueToken *)renderFrameAtSeconds:(double)seconds
 								 completion:(ZENRenderFrameResultsBlock)completion {
 
 	ZENRenderedFrame *frame = [ZENRenderedFrame new];
+	frame.requestType = ZENFrameRequestTypeSeconds;
 	frame.requestedSeconds = seconds;
 
 	return [self.frameRenderController renderFrame:frame size:NSMakeSize(width, height) completion:completion];
@@ -53,6 +54,7 @@ - (ZENWorkQueueToken *)renderFrameAtPercentage:(double)percentage
 									completion:(ZENRenderFrameResultsBlock)completion {
 
 	ZENRenderedFrame *frame = [ZENRenderedFrame new];
+	frame.requestType = ZENFrameRequestTypePercentage;
 	frame.requestedPercentage = percentage;
 
 	return [self.frameRenderController renderFrame:frame size:NSMakeSize(width, height) completion:completion];

CoreZen/Media/LibAV/LibAVInfoController.m

@@ -136,7 +136,10 @@ - (ZENLibAVRenderController *)frameRenderController {
 
 - (NSUInteger)durationMicroseconds {
 	NSAssert(AV_TIME_BASE == 1000000, @"Expected libav AV_TIME_BASE 1000000 for microseconds, instead = %d", AV_TIME_BASE);
-	return _formatContext->duration;
+	if (!_formatContext || _formatContext->duration < 0) {
+		return 0;
+	}
+	return (NSUInteger)_formatContext->duration;
 }
 
 - (double)durationSeconds {