kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 22:48:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/experiemental' of github.com:magicalpanda/MagicalRecord into feature/experiemental

Browse Source
This commit is contained in:
Saul Mora
2013-01-24 17:29:42 -07:00
parent 2b1f2590f6 44282adcc2
commit df5a092986
2 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
View File

@@ -36,8 +36,19 @@
{
if (![value isKindOfClass:[NSDate class]])
{
NSString *dateFormat = [[self userInfo] valueForKey:kMagicalRecordImportCustomDateFormatKey];
value = dateFromString([value description], dateFormat ?: kMagicalRecordImportDefaultDateFormatString);
NSDate *convertedValue = nil;
NSString *dateFormat;
NSUInteger index = 0;
do {
NSMutableString *dateFormatKey = [kMagicalRecordImportCustomDateFormatKey mutableCopy];
if (index) {
[dateFormatKey appendFormat:@".%d", index];
}
index++;
dateFormat = [[self userInfo] valueForKey:dateFormatKey];
convertedValue = dateFromString([value description], dateFormat ?: kMagicalRecordImportDefaultDateFormatString);
} while (!convertedValue && dateFormat);
value = convertedValue;
}
// value = adjustDateForDST(value);
}

42
MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
View File

@@ -259,24 +259,44 @@ NSString * const kMagicalRecordImportAttributeUseDefaultValueWhenNotPresent = @"
+ (NSArray *) MR_importFromArray:(NSArray *)listOfObjectData inContext:(NSManagedObjectContext *)context
{
NSMutableArray *objectIDs = [NSMutableArray array];
// NSMutableArray *objectIDs = [NSMutableArray array];
//
// [MagicalRecord saveWithBlock:^(NSManagedObjectContext *localContext)
// {
// [listOfObjectData enumerateObjectsWithOptions:0 usingBlock:^(id obj, NSUInteger idx, BOOL *stop)
// {
// NSDictionary *objectData = (NSDictionary *)obj;
//
// NSManagedObject *dataObject = [self MR_importFromObject:objectData inContext:localContext];
//
// if ([context obtainPermanentIDsForObjects:[NSArray arrayWithObject:dataObject] error:nil])
// {
// [objectIDs addObject:[dataObject objectID]];
// }
// }];
// }];
//
// return [self MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"self IN %@", objectIDs] inContext:context];
[MagicalRecord saveWithBlock:^(NSManagedObjectContext *localContext)
{
[listOfObjectData enumerateObjectsWithOptions:0 usingBlock:^(id obj, NSUInteger idx, BOOL *stop)
{
NSDictionary *objectData = (NSDictionary *)obj;
NSManagedObject *dataObject = [self MR_importFromObject:objectData inContext:localContext];
// See https://gist.github.com/4501089 and https://alpha.app.net/tonymillion/post/2397422
if ([context obtainPermanentIDsForObjects:[NSArray arrayWithObject:dataObject] error:nil])
NSMutableArray *objects = [NSMutableArray array];
[listOfObjectData enumerateObjectsWithOptions:0
usingBlock:^(id obj, NSUInteger idx, BOOL *stop)
{
[objectIDs addObject:[dataObject objectID]];
NSDictionary * dict = obj;
if([dict isKindOfClass:[NSDictionary class]])
{
NSManagedObject *importedObject = [self MR_importFromObject:dict
inContext:context];
[objects addObject:importedObject];
}
}];
}];
return [self MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"self IN %@", objectIDs] inContext:context];
return objects;
}
@end