Fix voice memos crasher (#183)

* Test case for voice memos crasher.

* fix crasher

* clean up

* rename remove to delete

Author: mluisbrown

Examples/VoiceMemos/VoiceMemos/VoiceMemos.swift

@@ -29,6 +29,7 @@ struct VoiceMemo: Equatable {
 enum VoiceMemoAction: Equatable {
   case audioPlayerClient(Result<AudioPlayerClient.Action, AudioPlayerClient.Failure>)
   case playButtonTapped
+  case delete
   case timerUpdated(TimeInterval)
   case titleTextFieldChanged(String)
 }
@@ -48,6 +49,12 @@ let voiceMemoReducer = Reducer<VoiceMemo, VoiceMemoAction, VoiceMemoEnvironment>
     memo.mode = .notPlaying
     return .cancel(id: TimerId())
 
+  case .delete:
+    return .merge(
+      .cancel(id: PlayerId()),
+      .cancel(id: TimerId())
+    )
+
   case .playButtonTapped:
     switch memo.mode {
     case .notPlaying:
@@ -57,7 +64,8 @@ let voiceMemoReducer = Reducer<VoiceMemo, VoiceMemoAction, VoiceMemoEnvironment>
         environment.audioPlayerClient
           .play(PlayerId(), memo.url)
           .catchToEffect()
-          .map(VoiceMemoAction.audioPlayerClient),
+          .map(VoiceMemoAction.audioPlayerClient)
+          .cancellable(id: PlayerId()),
         Effect.timer(id: TimerId(), every: .milliseconds(500), on: environment.mainQueue)
           .map { date -> VoiceMemoAction in
             .timerUpdated(
@@ -121,7 +129,6 @@ enum VoiceMemosAction: Equatable {
   case alertDismissed
   case audioRecorderClient(Result<AudioRecorderClient.Action, AudioRecorderClient.Failure>)
   case currentRecordingTimerUpdated
-  case deleteVoiceMemo(IndexSet)
   case finalRecordingTime(TimeInterval)
   case openSettingsButtonTapped
   case recordButtonTapped
@@ -140,6 +147,12 @@ struct VoiceMemosEnvironment {
 }
 
 let voiceMemosReducer = Reducer<VoiceMemosState, VoiceMemosAction, VoiceMemosEnvironment>.combine(
+  voiceMemoReducer.forEach(
+    state: \.voiceMemos,
+    action: /VoiceMemosAction.voiceMemo(index:action:),
+    environment: {
+      VoiceMemoEnvironment(audioPlayerClient: $0.audioPlayerClient, mainQueue: $0.mainQueue)
+  }),
   .init { state, action, environment in
     struct RecorderId: Hashable {}
     struct RecorderTimerId: Hashable {}
@@ -199,10 +212,6 @@ let voiceMemosReducer = Reducer<VoiceMemosState, VoiceMemosAction, VoiceMemosEnv
       state.currentRecording?.duration += 1
       return .none
 
-    case let .deleteVoiceMemo(indexSet):
-      state.voiceMemos.remove(atOffsets: indexSet)
-      return .none
-
     case let .finalRecordingTime(duration):
       state.currentRecording?.duration = duration
       return .none
@@ -257,6 +266,10 @@ let voiceMemosReducer = Reducer<VoiceMemosState, VoiceMemosAction, VoiceMemosEnv
       state.alertMessage = "Voice memo playback failed."
       return .none
 
+    case let .voiceMemo(index: index, action: .delete):
+      state.voiceMemos.remove(at: index)
+      return .none
+
     case let .voiceMemo(index: index, action: .playButtonTapped):
       for idx in state.voiceMemos.indices where idx != index {
         state.voiceMemos[idx].mode = .notPlaying
@@ -266,13 +279,7 @@ let voiceMemosReducer = Reducer<VoiceMemosState, VoiceMemosAction, VoiceMemosEnv
     case .voiceMemo:
       return .none
     }
-  },
-  voiceMemoReducer.forEach(
-    state: \.voiceMemos,
-    action: /VoiceMemosAction.voiceMemo(index:action:),
-    environment: {
-      VoiceMemoEnvironment(audioPlayerClient: $0.audioPlayerClient, mainQueue: $0.mainQueue)
-    })
+  }
 )
 
 struct VoiceMemosView: View {
@@ -290,7 +297,11 @@ struct VoiceMemosView: View {
               id: \.url,
               content: VoiceMemoView.init(store:)
             )
-            .onDelete { viewStore.send(.deleteVoiceMemo($0)) }
+            .onDelete { indexSet in
+              for index in indexSet {
+                viewStore.send(.voiceMemo(index: index, action: .delete))
+              }
+            }
           }
           VStack {
             ZStack {

Examples/VoiceMemos/VoiceMemosTests/VoiceMemosTests.swift

@@ -280,12 +280,44 @@ class VoiceMemosTests: XCTestCase {
     )
 
     store.assert(
-      .send(.deleteVoiceMemo(IndexSet(integer: 1))),
-      .send(.deleteVoiceMemo(IndexSet(integer: 0))) {
+      .send(.voiceMemo(index: 0, action: .delete)) {
         $0.voiceMemos = []
       }
     )
   }
+
+  func testDeleteMemoWhilePlaying() {
+    let store = TestStore(
+      initialState: VoiceMemosState(
+        voiceMemos: [
+          VoiceMemo(
+            date: Date(timeIntervalSinceNow: 0),
+            duration: 10,
+            mode: .notPlaying,
+            title: "",
+            url: URL(string: "https://www.pointfree.co/functions")!
+          ),
+        ]
+      ),
+      reducer: voiceMemosReducer,
+      environment: .mock(
+        audioPlayerClient: .mock(
+          play: { id, url in .future { _ in } }
+        ),
+        mainQueue: self.scheduler.eraseToAnyScheduler()
+      )
+    )
+
+    store.assert(
+      .send(.voiceMemo(index: 0, action: .playButtonTapped)) {
+        $0.voiceMemos[0].mode = .playing(progress: 0)
+      },
+      .send(.voiceMemo(index: 0, action: .delete)) {
+        $0.voiceMemos = []
+      },
+      .do { self.scheduler.run() }
+    )
+  }
 }
 
 extension VoiceMemosEnvironment {