starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-24 01:28:37 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Make demo app compile again (sorry) (fixes #57)

Browse Source
This commit is contained in:
John Estropia
2016-03-10 20:28:19 +09:00
parent 9f1a351311
commit 0c1af09a8d
7 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@ Carthage/Build
CoreStore.xcworkspace/xcuserdata CoreStore.xcworkspace/xcuserdata
.DS_Store .DS_Store
DerivedData DerivedData
*.orig

12
CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift
View File

@@ -99,10 +99,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch self.segmentedControl?.selectedSegmentIndex { switch self.segmentedControl?.selectedSegmentIndex {
case .Some(Section.Fetching.rawValue): case Section.Fetching.rawValue?:
return self.fetchingItems.count return self.fetchingItems.count
case .Some(Section.Querying.rawValue): case Section.Querying.rawValue?:
return self.queryingItems.count return self.queryingItems.count
default: default:
@@ -116,10 +116,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
switch self.segmentedControl?.selectedSegmentIndex { switch self.segmentedControl?.selectedSegmentIndex {
case .Some(Section.Fetching.rawValue): case Section.Fetching.rawValue?:
cell.textLabel?.text = self.fetchingItems[indexPath.row].title cell.textLabel?.text = self.fetchingItems[indexPath.row].title
case .Some(Section.Querying.rawValue): case Section.Querying.rawValue?:
cell.textLabel?.text = self.queryingItems[indexPath.row].title cell.textLabel?.text = self.queryingItems[indexPath.row].title
default: default:
@@ -138,10 +138,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
switch self.segmentedControl?.selectedSegmentIndex { switch self.segmentedControl?.selectedSegmentIndex {
case .Some(Section.Fetching.rawValue): case Section.Fetching.rawValue?:
self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath) self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath)
case .Some(Section.Querying.rawValue): case Section.Querying.rawValue?:
self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath) self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath)
default: default:

8
CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift
View File

@@ -16,19 +16,19 @@ class QueryingResultsViewController: UITableViewController {
switch value { switch value {
case .Some(let array as [AnyObject]): case (let array as [AnyObject])?:
self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in
( (
title: item.description, title: item.description,
detail: _stdlib_getDemangledTypeName(item) detail: String(reflecting: item)
) )
} }
case .Some(let item): case let item?:
self.values = [ self.values = [
( (
title: item.description, title: item.description,
detail: _stdlib_getDemangledTypeName(item) detail: String(reflecting: item)
) )
] ]

8
CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
View File

@@ -88,7 +88,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
UIBarButtonItem( UIBarButtonItem(
barButtonSystemItem: .Trash, barButtonSystemItem: .Trash,
target: self, target: self,
action: "resetBarButtonItemTouched:" action: #selector(self.resetBarButtonItemTouched(_:))
) )
] ]
@@ -96,13 +96,13 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
title: Static.filter.rawValue, title: Static.filter.rawValue,
style: .Plain, style: .Plain,
target: self, target: self,
action: "filterBarButtonItemTouched:" action: #selector(self.filterBarButtonItemTouched(_:))
) )
navigationItem.rightBarButtonItems = [ navigationItem.rightBarButtonItems = [
UIBarButtonItem( UIBarButtonItem(
barButtonSystemItem: .Add, barButtonSystemItem: .Add,
target: self, target: self,
action: "addBarButtonItemTouched:" action: #selector(self.addBarButtonItemTouched(_:))
), ),
filterBarButton filterBarButton
] ]
@@ -119,7 +119,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
switch (segue.identifier, segue.destinationViewController, sender) { switch (segue.identifier, segue.destinationViewController, sender) {
case (.Some("ObjectObserverDemoViewController"), let destinationViewController as ObjectObserverDemoViewController, let palette as Palette): case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
destinationViewController.palette = palette destinationViewController.palette = palette
default: default:

6
CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift
View File

@@ -102,20 +102,20 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
switch self.segmentedControl?.selectedSegmentIndex { switch self.segmentedControl?.selectedSegmentIndex {
case .Some(0): case 0?:
self.dataStack.beginAsynchronous { (transaction) -> Void in self.dataStack.beginAsynchronous { (transaction) -> Void in
transaction.create(Into(Palette)) transaction.create(Into(Palette))
} }
case .Some(1): case 1?:
do { do {
try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore") try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore")
} }
catch _ { } catch _ { }
case .Some(2): case 2?:
self.dataStack.beginAsynchronous { (transaction) -> Void in self.dataStack.beginAsynchronous { (transaction) -> Void in
transaction.commit() transaction.commit()

32
CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift
View File

@@ -162,36 +162,46 @@ class MigrationsDemoViewController: UIViewController {
fileName: "MigrationDemo.sqlite", fileName: "MigrationDemo.sqlite",
completion: { [weak self] (result) -> Void in completion: { [weak self] (result) -> Void in
guard let strongSelf = self else { guard let `self` = self else {
return return
} }
guard case .Success = result else { guard case .Success = result else {
strongSelf.setEnabled(true) self.setEnabled(true)
return return
} }
strongSelf.setDataStack(dataStack, model: model, scrollToSelection: true) self.setDataStack(dataStack, model: model, scrollToSelection: true)
let count = dataStack.queryValue(From(model.entityType), Select<Int>(.Count("dna"))) let count = dataStack.queryValue(
From(model.entityType),
Select<Int>(.Count("dna"))
)
if count > 0 { if count > 0 {
strongSelf.setEnabled(true) self.setEnabled(true)
} }
else { else {
dataStack.beginAsynchronous { (transaction) -> Void in for i: Int64 in 0 ..< 20 {
for i: Int64 in 1 ..< 10000 { dataStack.beginAsynchronous { (transaction) -> Void in
let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol for j: Int64 in 0 ..< 500 {
organism.dna = i
organism.mutate() let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol
organism.dna = (i * 500) + j + 1
organism.mutate()
}
transaction.commit()
} }
}
dataStack.beginAsynchronous { [weak self] (transaction) -> Void in
transaction.commit { result -> Void in transaction.commit { _ in
self?.setEnabled(true) self?.setEnabled(true)
} }

4
CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift
View File

@@ -60,7 +60,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
super.viewDidLoad() super.viewDidLoad()
let longPressGesture = UILongPressGestureRecognizer(target: self, action: "longPressGestureRecognized:") let longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressGestureRecognized(_:)))
self.mapView?.addGestureRecognizer(longPressGesture) self.mapView?.addGestureRecognizer(longPressGesture)
Static.placeController.addObserver(self) Static.placeController.addObserver(self)
@@ -68,7 +68,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
self.navigationItem.rightBarButtonItem = UIBarButtonItem( self.navigationItem.rightBarButtonItem = UIBarButtonItem(
barButtonSystemItem: .Refresh, barButtonSystemItem: .Refresh,
target: self, target: self,
action: "refreshButtonTapped:" action: #selector(self.refreshButtonTapped(_:))
) )
} }