Merge pull request #25 from justlaputa/fix-issue-22

Retrieve all tracks

Author: Borewit

lib/cue.ts

@@ -95,7 +95,7 @@ function parseFlags(params: string[], cueSheet: CueSheet) {
   track.flags = params.slice(0);
 }
 
-function parseIndex(params: string[], cueSheet: CueSheet): Index {
+function parseIndex(params: string[], cueSheet: CueSheet) {
   const _number = parseInt(params[0], 10);
   const time = parseTime(params[1]);
   const track = cueSheet.getCurrentTrack();
@@ -112,9 +112,13 @@ function parseIndex(params: string[], cueSheet: CueSheet): Index {
     throw new Error(`Index number must between 0 and 99: ${_number}`);
   }
 
-  if (_number === 1 && time.min === 0 && time.min === 0 && time.sec === 0 && time.frame === 0) {
-    cueSheet.newFile();
-    return;
+  if (_number === 1) {
+    // Assign track to current file
+    const file = cueSheet.getCurrentFile();
+    if (!file.tracks) {
+      file.tracks = [];
+    }
+    file.tracks.push(track);
   }
 
   if (!track.indexes) {

lib/cuesheet.ts

@@ -50,6 +50,8 @@ export class CueSheet implements ICueSheet {
   public rem: string[] = null;
   public encoding: string;
 
+  private track: Track;
+
   public getCurrentFile(): File {
     if (this.files && this.files.length > 0) {
       return this.files[this.files.length - 1];
@@ -59,13 +61,7 @@ export class CueSheet implements ICueSheet {
   }
 
   public getCurrentTrack(): Track {
-    const file = this.getCurrentFile();
-
-    if (file && file.tracks && file.tracks.length > 0) {
-      return file.tracks[file.tracks.length - 1];
-    } else {
-      return null;
-    }
+    return this.track;
   }
 
   public newFile(): File {
@@ -80,18 +76,8 @@ export class CueSheet implements ICueSheet {
   }
 
   public newTrack(_number: number, type: string): CueSheet {
-    const file = this.getCurrentFile();
-
-    if (!file) {
-      throw new Error(`No file for track: ${_number} ${type}`);
-    }
-
-    if (!file.tracks) {
-      file.tracks = [];
-    }
-
-    file.tracks.push(new Track(_number, type));
 
+    this.track = new Track(_number, type);
     return this;
   }
 }

test/Frank Boeijen - Palermo - CD1.eac.cue renamed to test/cue/Frank Boeijen - Palermo - CD1.eac.cue

@@ -0,0 +1,50 @@
+REM GENRE R&B
+REM DATE 2016
+REM DISCID 720CEB0A
+REM COMMENT "ExactAudioCopy v1.1"
+PERFORMER "Michael Kiwanuka"
+TITLE "Love And Hate"
+FILE "Michael Kiwanuka - Love And Hate.flac" WAVE
+  TRACK 01 AUDIO
+    TITLE "Cold Little Heart"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    TITLE "Black Man In A White World"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 00 09:58:54
+    INDEX 01 10:10:36
+  TRACK 03 AUDIO
+    TITLE "Falling"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 14:29:33
+  TRACK 04 AUDIO
+    TITLE "Place I Belong"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 18:46:24
+  TRACK 05 AUDIO
+    TITLE "Love And Hate"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 23:33:63
+  TRACK 06 AUDIO
+    TITLE "One More Night"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 30:40:70
+  TRACK 07 AUDIO
+    TITLE "I'll Never Love"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 34:34:26
+  TRACK 08 AUDIO
+    TITLE "Rule The World"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 37:20:25
+  TRACK 09 AUDIO
+    TITLE "Father's Child"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 01 43:03:12
+    INDEX 02 50:06:41
+  TRACK 10 AUDIO
+    TITLE "The Final Frame"
+    PERFORMER "Michael Kiwanuka"
+    INDEX 00 50:06:41
+    INDEX 01 50:08:23

test/Frank Boeijen Groep - Welkom In Utopia.eac.cue renamed to test/cue/Frank Boeijen Groep - Welkom In Utopia.eac.cue

@@ -0,0 +1,78 @@
+REM DATE 2005
+REM DISCID 1411B112
+REM COMMENT "ExactAudioCopy v1.1"
+PERFORMER "Schiller"
+TITLE "Day and Night"
+FILE "Schiller - Day and Night.flac" WAVE
+  TRACK 01 AUDIO
+    TITLE "Welcome"
+    PERFORMER "Schiller"
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    TITLE "Nightflight"
+    PERFORMER "Schiller"
+    INDEX 01 01:09:47
+  TRACK 03 AUDIO
+    TITLE "Tired of Being Alone"
+    PERFORMER "Schiller"
+    INDEX 01 06:55:22
+  TRACK 04 AUDIO
+    TITLE "What's Coming"
+    PERFORMER "Schiller"
+    INDEX 01 10:57:36
+  TRACK 05 AUDIO
+    TITLE "Sunrise"
+    PERFORMER "Schiller"
+    INDEX 01 15:23:43
+  TRACK 06 AUDIO
+    TITLE "Miles and Miles"
+    PERFORMER "Schiller"
+    INDEX 01 18:36:31
+  TRACK 07 AUDIO
+    TITLE "Das Meer"
+    PERFORMER "Schiller"
+    INDEX 01 22:30:57
+  TRACK 08 AUDIO
+    TITLE "I Know (feat. Jette Von Roth)"
+    PERFORMER "Schiller"
+    INDEX 01 27:21:18
+  TRACK 09 AUDIO
+    TITLE "Morning Dew"
+    PERFORMER "Schiller"
+    INDEX 01 32:19:36
+  TRACK 10 AUDIO
+    TITLE "Berlin Bombay"
+    PERFORMER "Schiller"
+    INDEX 01 36:22:07
+  TRACK 11 AUDIO
+    TITLE "The Smile"
+    PERFORMER "Schiller"
+    INDEX 01 41:11:63
+  TRACK 12 AUDIO
+    TITLE "Lightstorm (feat. Kim Sanders)"
+    PERFORMER "Schiller"
+    INDEX 01 44:26:20
+  TRACK 13 AUDIO
+    TITLE "Falling"
+    PERFORMER "Schiller"
+    INDEX 01 47:45:33
+  TRACK 14 AUDIO
+    TITLE "Rings of Time"
+    PERFORMER "Schiller"
+    INDEX 01 53:02:26
+  TRACK 15 AUDIO
+    TITLE "I Saved You (feat. Kim Sanders)"
+    PERFORMER "Schiller"
+    INDEX 01 56:52:66
+  TRACK 16 AUDIO
+    TITLE "Misguiding Light"
+    PERFORMER "Schiller"
+    INDEX 01 61:31:43
+  TRACK 17 AUDIO
+    TITLE "Fireworks"
+    PERFORMER "Schiller"
+    INDEX 01 64:49:60
+  TRACK 18 AUDIO
+    TITLE "Sleepy Storm (feat. Jette Von Roth)"
+    PERFORMER "Schiller"
+    INDEX 01 69:54:21