Skip to content

Commit 9f5ac6f

Browse files
committed
Rename recognitionTask to startTask.
1 parent 89b0ef7 commit 9f5ac6f

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Client.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ struct SpeechClient {
66
var finishTask: () -> Effect<Never, Never>
77
var recognitionTask: (SFSpeechAudioBufferRecognitionRequest) -> Effect<SpeechRecognitionResult, Error>
88
var requestAuthorization: () -> Effect<SFSpeechRecognizerAuthorizationStatus, Never>
9+
var startTask:
910

1011
enum Error: Swift.Error, Equatable {
1112
case taskError

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Live.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ extension SpeechClient {
1515
recognitionTask?.finish()
1616
}
1717
},
18-
recognitionTask: { request in
18+
requestAuthorization: {
19+
.future { callback in
20+
SFSpeechRecognizer.requestAuthorization { status in
21+
callback(.success(status))
22+
}
23+
}
24+
},
25+
startTask: { request in
1926
Effect { subscriber, lifetime in
2027
let speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US"))!
2128
let cancellable = AnyDisposable {
@@ -66,13 +73,6 @@ extension SpeechClient {
6673

6774
return
6875
}
69-
},
70-
requestAuthorization: {
71-
.future { callback in
72-
SFSpeechRecognizer.requestAuthorization { status in
73-
callback(.success(status))
74-
}
75-
}
7676
}
7777
)
7878
}

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Unimplemented.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import Speech
66
extension SpeechClient {
77
static let unimplemented = Self(
88
finishTask: { .unimplemented("\(Self.self).finishTask") },
9-
recognitionTask: { _ in .unimplemented("\(Self.self).recognitionTask") },
10-
requestAuthorization: { .unimplemented("\(Self.self).requestAuthorization") }
9+
requestAuthorization: { .unimplemented("\(Self.self).requestAuthorization") },
10+
startTask: { _ in .unimplemented("\(Self.self).recognitionTask") }
1111
)
1212
}
1313
#endif

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
9393
let request = SFSpeechAudioBufferRecognitionRequest()
9494
request.shouldReportPartialResults = true
9595
request.requiresOnDeviceRecognition = false
96-
return environment.speechClient.recognitionTask(request)
96+
return environment.speechClient.startTask(request)
9797
.animation()
9898
.catchToEffect(AppAction.speech)
9999

@@ -173,7 +173,10 @@ extension SpeechClient {
173173
isRunning = false
174174
}
175175
},
176-
recognitionTask: { _ in
176+
requestAuthorization: {
177+
.init(value: .authorized)
178+
},
179+
startTask: { _ in
177180
isRunning = true
178181
var finalText = """
179182
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor \
@@ -209,9 +212,6 @@ extension SpeechClient {
209212

210213
lifetime += disposable
211214
}
212-
},
213-
requestAuthorization: {
214-
.init(value: .authorized)
215215
}
216216
)
217217
}

Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class SpeechRecognitionTests: XCTestCase {
6464
speechClient.finishTask = {
6565
.fireAndForget { self.recognitionTaskSubject.input.sendCompleted() }
6666
}
67-
speechClient.recognitionTask = { _ in self.recognitionTaskSubject.output.producer }
67+
speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
6868
speechClient.requestAuthorization = { Effect(value: .authorized) }
6969

7070
let store = TestStore(
@@ -109,7 +109,7 @@ class SpeechRecognitionTests: XCTestCase {
109109

110110
func testAudioSessionFailure() {
111111
var speechClient = SpeechClient.unimplemented
112-
speechClient.recognitionTask = { _ in self.recognitionTaskSubject.output.producer }
112+
speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
113113
speechClient.requestAuthorization = { Effect(value: .authorized) }
114114

115115
let store = TestStore(
@@ -139,7 +139,7 @@ class SpeechRecognitionTests: XCTestCase {
139139

140140
func testAudioEngineFailure() {
141141
var speechClient = SpeechClient.unimplemented
142-
speechClient.recognitionTask = { _ in self.recognitionTaskSubject.output.producer }
142+
speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
143143
speechClient.requestAuthorization = { Effect(value: .authorized) }
144144

145145
let store = TestStore(

0 commit comments

Comments
 (0)