From d06fdd3f8a406a8e4bc54cd8ed9abac50ac8f4c6 Mon Sep 17 00:00:00 2001
From: Sabeur Thabti <thabti.sabeur@gmail.com>
Date: Mon, 29 Aug 2016 06:34:45 +0100
Subject: [PATCH] missing segment fix (#467)

* handle when no segment

return state when segments isnt defined

ensure to target mp3 audio

ensure to target mp3 audio

revert audio.mp3

multi-purpose function

revert audio.mp3

* multi-purpose function

update travis to node 6, use node_modules travis says it cannot find modules(eslint, karma)

ditto

* fix unit tests

fix unit tests
---
 .travis.yml                         |  2 +-
 src/components/Audioplayer/index.js |  2 ++
 src/components/TopOptions/spec.js   |  6 ++++--
 src/helpers/buildAudio.js           |  7 +++++++
 src/redux/modules/audioplayer.js    | 11 +++++------
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32099e761..5e4886b5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 env: TEST_SUITE=unit
 node_js:
-  - "5.6.0"
+  - "6.3.0"
 cache:
   directories:
     - node_modules
diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js
index 2bfc7ed8e..3725a348c 100644
--- a/src/components/Audioplayer/index.js
+++ b/src/components/Audioplayer/index.js
@@ -344,6 +344,7 @@ export class Audioplayer extends Component {
 
   renderPreviousButton() {
     const { currentAyah, files } = this.props;
+    if (!files) return false;
     const index = Object.keys(files).findIndex(id => id === currentAyah);
 
     return (
@@ -358,6 +359,7 @@ export class Audioplayer extends Component {
 
   renderNextButton() {
     const { surah, currentAyah } = this.props;
+    if (!surah) return false;
     const isEnd = surah.ayat === parseInt(currentAyah.split(':')[1], 10);
 
     return (
diff --git a/src/components/TopOptions/spec.js b/src/components/TopOptions/spec.js
index 0d4982d8c..a5ba0b004 100644
--- a/src/components/TopOptions/spec.js
+++ b/src/components/TopOptions/spec.js
@@ -22,8 +22,10 @@ describe("<TopOptions />", () => {
     };
 
     const actions = {
-      setOption: () => {},
-      toggleReadingMode: () => {}
+      options: {
+        setOption: () => {},
+        toggleReadingMode: () => {}
+      }
     };
 
     const component = shallow(<TopOptions
diff --git a/src/helpers/buildAudio.js b/src/helpers/buildAudio.js
index cf80088e6..d32f4bf16 100644
--- a/src/helpers/buildAudio.js
+++ b/src/helpers/buildAudio.js
@@ -6,6 +6,13 @@ export function buildAudioForAyah(audio) {
   if (audio.url) {
     scopedAudio.src = audio.url;
     segments = audio.encryptedSegments;
+    return { audio: scopedAudio, segments };
+  }
+
+  if (audio.mp3) {
+    scopedAudio.src = audio.mp3.url;
+    segments = audio.mp3.encryptedSegments;
+    return { audio: scopedAudio, segments };
   }
 
   return { audio: scopedAudio, segments };
diff --git a/src/redux/modules/audioplayer.js b/src/redux/modules/audioplayer.js
index 38c517c0b..3c276b9de 100644
--- a/src/redux/modules/audioplayer.js
+++ b/src/redux/modules/audioplayer.js
@@ -239,13 +239,13 @@ export default function reducer(state = initialState, action = {}) {
     }
     case SET_CURRENT_WORD: {
       if (!action.word) return state;
-
-      const [surahId, ayahNum, word] = action.word.split(':');
       let currentTime = null;
-
-      if (state.files[surahId][`${surahId}:${ayahNum}`] === state.currentFile) {
+      const [surahId, ayahNum, word] = action.word.split(':');
+      const nextId = `${surahId}:${ayahNum}`;
+      if (!state.segments[surahId][nextId]) return state;
+      if (state.files[surahId][nextId] === state.currentFile) {
         // When the files are the same, set the current time to that word
-        currentTime = state.segments[surahId][`${surahId}:${ayahNum}`].words[word].startTime;
+        currentTime = state.segments[surahId][nextId].words[word].startTime;
         state.currentFile.currentTime = currentTime; // eslint-disable-line no-param-reassign
 
         return {
@@ -256,7 +256,6 @@ export default function reducer(state = initialState, action = {}) {
       }
 
       // When the files are not the same.
-      const nextId = `${surahId}:${ayahNum}`;
       const currentFile = state.files[surahId][nextId];
       const segment = buildSegments(state.segments[surahId][nextId]);
       currentTime = segment.words[word].startTime;