public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ripping out CoreData. Using SQLite directly.

Browse source
This commit is contained in:
Samuel Clay 2013-05-30 19:23:10 -07:00
parent 42a53b1aa4
commit 8213b91b13
4 changed files with 3 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
media/ios/Classes/NewsBlurAppDelegate.h
View file

@ -129,8 +129,6 @@
NSArray *categories;
NSDictionary *categoryFeeds;
UIImageView *splashView;
NSManagedObjectContext *managedObjectContext;
}
@property (nonatomic) IBOutlet UIWindow *window;
@ -218,10 +216,6 @@
@property (nonatomic) NSArray *categories;
@property (nonatomic) NSDictionary *categoryFeeds;
@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
+ (NewsBlurAppDelegate*) sharedAppDelegate;
- (void)startupAnimationDone:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context;

90
media/ios/Classes/NewsBlurAppDelegate.m
View file

@ -38,7 +38,6 @@
#import "AuthorizeServicesViewController.h"
#import "ShareThis.h"
#import "Reachability.h"
#import <CoreData/CoreData.h>
@implementation NewsBlurAppDelegate
@ -133,8 +132,6 @@
@synthesize categories;
@synthesize categoryFeeds;
@synthesize managedObjectContext, managedObjectModel, persistentStoreCoordinator;
+ (NewsBlurAppDelegate*) sharedAppDelegate {
return (NewsBlurAppDelegate*) [UIApplication sharedApplication].delegate;
}
@ -190,7 +187,7 @@
[self performSelectorOnMainThread:@selector(showSplashView) withObject:nil waitUntilDone:NO];
// [self showFirstTimeUser];
[managedObjectContext setPersistentStoreCoordinator:persistentStoreCoordinator];
return YES;
}
@ -1992,78 +1989,6 @@
#pragma mark -
#pragma mark Storing Stories for Offline
// Returns the managed object context for the application.
// If the context doesn't already exist, it is created and bound to the persistent store coordinator for the application.
- (NSManagedObjectContext *)managedObjectContext
{
if (managedObjectContext != nil) {
return managedObjectContext;
}
NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
if (coordinator != nil) {
managedObjectContext = [[NSManagedObjectContext alloc] init];
[managedObjectContext setPersistentStoreCoordinator:coordinator];
}
return managedObjectContext;
}
// Returns the managed object model for the application.
// If the model doesn't already exist, it is created from the application's model.
- (NSManagedObjectModel *)managedObjectModel
{
if (managedObjectModel != nil) {
return managedObjectModel;
}
NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"Stories" withExtension:@"momd"];
managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
return managedObjectModel;
}
// Returns the persistent store coordinator for the application.
// If the coordinator doesn't already exist, it is created and the application's store added to it.
- (NSPersistentStoreCoordinator *)persistentStoreCoordinator
{
if (persistentStoreCoordinator != nil) {
return persistentStoreCoordinator;
}
NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Stories.sqlite"];
NSError *error = nil;
persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
if (![persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
/*
Replace this implementation with code to handle the error appropriately.
abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
Typical reasons for an error here include:
* The persistent store is not accessible;
* The schema for the persistent store is incompatible with current managed object model.
Check the error message to determine what the actual problem was.
If the persistent store is not accessible, there is typically something wrong with the file path. Often, a file URL is pointing into the application's resources directory instead of a writeable directory.
If you encounter schema incompatibility errors during development, you can reduce their frequency by:
* Simply deleting the existing store:
[[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil]
* Performing automatic lightweight migration by passing the following dictionary as the options parameter:
[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption, [NSNumber numberWithBool:YES], NSInferMappingModelAutomaticallyOption, nil];
Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
*/
NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
abort();
}
return persistentStoreCoordinator;
}
// Returns the URL to the application's Documents directory.
- (NSURL *)applicationDocumentsDirectory
{
@ -2100,19 +2025,10 @@
JSONObjectWithData:responseData
options:kNilOptions
error:&error];
NSManagedObjectContext* context = [self managedObjectContext];
for (NSDictionary *story in [results objectForKey:@"stories"]) {
NSManagedObject *newStory;
newStory = [NSEntityDescription
insertNewObjectForEntityForName:@"Stories"
inManagedObjectContext:context];
[newStory setValue:[story objectForKey:@"id"] forKey:@"id"];
[newStory setValue:[story objectForKey:@"story_title"] forKey:@"story_title"];
[newStory setValue:[story objectForKey:@"story_feed_id"] forKey:@"story_feed_id"];
[newStory setValue:[story objectForKey:@"story_hash"] forKey:@"story_hash"];
NSError *error;
[context save:&error];
}
}

24
media/ios/Classes/Stories.xcdatamodeld/Stories.xcdatamodel/contents
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2061" systemVersion="12D78" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="Intelligence" syncable="YES"/>
<entity name="Stories" syncable="YES">
<attribute name="id" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="story_date" optional="YES" attributeType="Date" syncable="YES"/>
<attribute name="story_feed_id" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
<attribute name="story_hash" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="story_title" optional="YES" attributeType="String" syncable="YES"/>
<compoundIndexes>
<compoundIndex>
<index value="story_hash"/>
</compoundIndex>
<compoundIndex>
<index value="story_feed_id"/>
<index value="story_date"/>
</compoundIndex>
</compoundIndexes>
</entity>
<elements>
<element name="Intelligence" positionX="160" positionY="192" width="128" height="45"/>
<element name="Stories" positionX="160" positionY="192" width="128" height="120"/>
</elements>
</model>

21
media/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -270,14 +270,12 @@
FF688E5316E6B8D0003B7B42 /* traverse_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */; };
FF6A233216448E0700E15989 /* StoryPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = FF6A233116448E0700E15989 /* StoryPageControl.m */; };
FF6A23391644957800E15989 /* StoryPageControl.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF6A23361644903900E15989 /* StoryPageControl.xib */; };
FF753CC117582DE000344EC9 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF753CC017582DE000344EC9 /* CoreData.framework */; };
FF793E1B13F1A9F700F282D2 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
FF793E1C13F1A9F700F282D2 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1A13F1A9F700F282D2 /* ASIDataDecompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
FF8364BB1755759A008F5C58 /* traverse_text.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364B91755759A008F5C58 /* traverse_text.png */; };
FF8364BC1755759A008F5C58 /* traverse_text@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364BA1755759A008F5C58 /* traverse_text@2x.png */; };
FF8364BF1756949E008F5C58 /* traverse_text_on.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364BD1756949E008F5C58 /* traverse_text_on.png */; };
FF8364C01756949E008F5C58 /* traverse_text_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364BE1756949E008F5C58 /* traverse_text_on@2x.png */; };
FF8364C31757C1F6008F5C58 /* Stories.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = FF8364C11757C1F6008F5C58 /* Stories.xcdatamodeld */; };
FF8364C61757EC0B008F5C58 /* traverse_background_left.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364C41757EC0B008F5C58 /* traverse_background_left.png */; };
FF8364C71757EC0B008F5C58 /* traverse_background_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */; };
FF85BF6016D5A587002D334D /* nav_icn_activity_hover.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */; };
@ -802,7 +800,6 @@
FF6A233016448E0700E15989 /* StoryPageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoryPageControl.h; sourceTree = "<group>"; };
FF6A233116448E0700E15989 /* StoryPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryPageControl.m; sourceTree = "<group>"; };
FF6A23361644903900E15989 /* StoryPageControl.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = StoryPageControl.xib; path = ../Classes/StoryPageControl.xib; sourceTree = "<group>"; };
FF753CC017582DE000344EC9 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
FF793E1713F1A9F700F282D2 /* ASIDataCompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIDataCompressor.h; sourceTree = "<group>"; };
FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIDataCompressor.m; sourceTree = "<group>"; };
FF793E1913F1A9F700F282D2 /* ASIDataDecompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIDataDecompressor.h; sourceTree = "<group>"; };
@ -811,7 +808,6 @@
FF8364BA1755759A008F5C58 /* traverse_text@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_text@2x.png"; sourceTree = "<group>"; };
FF8364BD1756949E008F5C58 /* traverse_text_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_text_on.png; sourceTree = "<group>"; };
FF8364BE1756949E008F5C58 /* traverse_text_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_text_on@2x.png"; sourceTree = "<group>"; };
FF8364C21757C1F6008F5C58 /* Stories.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Stories.xcdatamodel; sourceTree = "<group>"; };
FF8364C41757EC0B008F5C58 /* traverse_background_left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_background_left.png; sourceTree = "<group>"; };
FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_background_left@2x.png"; sourceTree = "<group>"; };
FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nav_icn_activity_hover.png; sourceTree = "<group>"; };
@ -1078,7 +1074,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FF753CC117582DE000344EC9 /* CoreData.framework in Frameworks */,
FFDCA0C316E80952000D8E0C /* AdSupport.framework in Frameworks */,
FFDCA0C116E8094F000D8E0C /* Accounts.framework in Frameworks */,
FFDCA0BF16E80944000D8E0C /* Social.framework in Frameworks */,
@ -1182,7 +1177,6 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
FF753CC017582DE000344EC9 /* CoreData.framework */,
FFDCA0C216E80952000D8E0C /* AdSupport.framework */,
FFDCA0C016E8094F000D8E0C /* Accounts.framework */,
FFDCA0BE16E80944000D8E0C /* Social.framework */,
@ -1676,7 +1670,6 @@
43D8189F15B9404D00733444 /* Models */ = {
isa = PBXGroup;
children = (
FF8364C11757C1F6008F5C58 /* Stories.xcdatamodeld */,
);
name = Models;
sourceTree = "<group>";
@ -2507,7 +2500,6 @@
FFDCA0BC16E80877000D8E0C /* NSData+Base64.m in Sources */,
FFECD016172B0D4200D45A62 /* SafariService.m in Sources */,
FFECD01D172B10BD00D45A62 /* SafariActivityItem.m in Sources */,
FF8364C31757C1F6008F5C58 /* Stories.xcdatamodeld in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2657,19 +2649,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCVersionGroup section */
FF8364C11757C1F6008F5C58 /* Stories.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
FF8364C21757C1F6008F5C58 /* Stories.xcdatamodel */,
);
currentVersion = FF8364C21757C1F6008F5C58 /* Stories.xcdatamodel */;
path = Stories.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
/* End XCVersionGroup section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
}