Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose ErrorHandler protocol; inject errorHandler into Turntable #95

Merged
merged 2 commits into from
May 13, 2019
Merged

Expose ErrorHandler protocol; inject errorHandler into Turntable #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d59a08
Expose ErrorHandler protocol; inject errorHandler into Turntable
Apr 28, 2019
598ae6b
TT-154 set CI to use xcode10.2
Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9.4
osx_image: xcode10.2
env:
matrix:
- PLATFORM="iOS"
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "typelift/SwiftCheck" "0.10.0"
github "typelift/SwiftCheck" "0.12.0"
12 changes: 7 additions & 5 deletions Vinyl/ErrorHandler/ErrorHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@

import Foundation

protocol ErrorHandler {
public protocol ErrorHandler {
func handleTrackNotFound(_ request: Request, playTracksUniquely: Bool)
func handleUnknownError()
}

struct DefaultErrorHandler: ErrorHandler {

func handleTrackNotFound(_ request: Request, playTracksUniquely: Bool) {
public struct DefaultErrorHandler: ErrorHandler {

public init() {}

public func handleTrackNotFound(_ request: Request, playTracksUniquely: Bool) {

if playTracksUniquely {
fatalError("💥 No 🎶 recorded and matchable with request: \n\(request.debugDescription)\n\nThis might be happening because you are trying to consume the same request multiple times 😩\n")
Expand All @@ -25,7 +27,7 @@ struct DefaultErrorHandler: ErrorHandler {
}
}

func handleUnknownError() {
public func handleUnknownError() {
fatalError("💥")
}
}
5 changes: 3 additions & 2 deletions Vinyl/Turntable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ public final class Turntable: URLSession {
self.init(vinyl: vinyl, turntableConfiguration: turntableConfiguration, delegateQueue: delegateQueue, urlSession: urlSession)
}

public convenience init(vinylName: String, bundle: Bundle = testingBundle(), turntableConfiguration: TurntableConfiguration = TurntableConfiguration(), delegateQueue: OperationQueue? = nil, urlSession: URLSession? = nil) {
public convenience init(vinylName: String, bundle: Bundle = testingBundle(), turntableConfiguration: TurntableConfiguration = TurntableConfiguration(), delegateQueue: OperationQueue? = nil, urlSession: URLSession? = nil, errorHandler: ErrorHandler = DefaultErrorHandler()) {
let plastic = Turntable.createPlastic(vinyl: vinylName, bundle: bundle, recordingMode: turntableConfiguration.recordingMode)
let vinyl = Vinyl(plastic: plastic ?? [])
self.init(vinyl: vinyl, turntableConfiguration: turntableConfiguration, delegateQueue: delegateQueue, urlSession: urlSession)


self.errorHandler = errorHandler
switch turntableConfiguration.recordingMode {
case .missingVinyl where plastic == nil, .missingTracks:
recorder = Recorder(wax: Wax(vinyl: vinyl), recordingPath: recordingPath(fromConfiguration: turntableConfiguration, vinylName: vinylName, bundle: bundle))
Expand Down