Refactor the streaming write call to be more "general".

If someone gets an epiphany on how to do that without passing the git_odb_stream object to the block or copying the data…

Author: tiennou

Classes/GTObjectDatabase.h

@@ -46,6 +46,7 @@
 - (GTOdbObject *)objectWithSha:(NSString *)sha error:(NSError **)error;
 
 - (NSString *)shaByInsertingString:(NSString *)data objectType:(GTObjectType)type error:(NSError **)error;
+- (GTOdbObject *)objectByInsertingData:(NSData *)data objectType:(GTObjectType)type error:(NSError **)error;
 
 - (BOOL)containsObjectWithSha:(NSString *)sha error:(NSError **)error;
 

Classes/GTObjectDatabase.m

@@ -27,6 +27,7 @@
 #import "GTRepository.h"
 #import "NSError+Git.h"
 #import "GTOdbObject.h"
+#import "GTOID.h"
 #import "NSString+Git.h"
 
 #import "git2/odb_backend.h"
@@ -89,24 +90,30 @@ - (GTOdbObject *)objectWithSha:(NSString *)sha error:(NSError **)error {
     return [self objectWithOid:&oid error:error];
 }
 
-- (NSString *)shaByInsertingString:(NSString *)data objectType:(GTObjectType)type error:(NSError **)error {
+- (GTOID *)oidByWritingDataOfLength:(size_t)length type:(GTObjectType)type error:(NSError **)error block:(int (^)(git_odb_stream *stream))block {
+	NSParameterAssert(length != 0);
+	NSParameterAssert(block != nil);
 	git_odb_stream *stream;
 	git_oid oid;
+	size_t writtenBytes = 0;
 
-	int gitError = git_odb_open_wstream(&stream, self.git_odb, data.length, (git_otype) type);
+	int gitError = git_odb_open_wstream(&stream, self.git_odb, length, (git_otype) type);
 	if(gitError < GIT_OK) {
 		if(error != NULL)
 			*error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to open write stream on odb."];
 		return nil;
 	}
-	
-	gitError = stream->write(stream, [data UTF8String], data.length);
-	if(gitError < GIT_OK) {
-		if(error != NULL)
-			*error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to write to stream on odb."];
-		return nil;
+
+	while (length < writtenBytes) {
+		gitError = block(stream);
+		if(gitError < GIT_OK) {
+			if(error != NULL)
+				*error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to write to stream on odb."];
+			return nil;
+		}
+		writtenBytes += gitError;
 	}
-	
+
 	gitError = stream->finalize_write(&oid, stream);
 	if(gitError < GIT_OK) {
 		if(error != NULL)
@@ -116,7 +123,21 @@ - (NSString *)shaByInsertingString:(NSString *)data objectType:(GTObjectType)typ
 
 	stream->free(stream);
 
-	return [NSString git_stringWithOid:&oid];
+	return [GTOID oidWithGitOid:&oid];
+}
+
+- (NSString *)shaByInsertingString:(NSString *)string objectType:(GTObjectType)type error:(NSError **)error {
+	GTOID *oid = [self oidByWritingDataOfLength:string.length type:type error:error block:^int(git_odb_stream *stream) {
+		return stream->write(stream, string.UTF8String, string.length);
+	}];
+	return [oid SHA];
+}
+
+- (GTOdbObject *)objectByInsertingData:(NSData *)data objectType:(GTObjectType)type error:(NSError **)error {
+	GTOID *oid = [self oidByWritingDataOfLength:data.length type:type error:error block:^int(git_odb_stream *stream) {
+		return stream->write(stream, data.bytes, data.length);
+	}];
+	return [self objectWithOid:oid.git_oid error:error];
 }
 
 - (BOOL)containsObjectWithSha:(NSString *)sha error:(NSError **)error {