From 61fdb2c332067c9b216322b491f6920b28abe747 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Tue, 20 Aug 2013 00:38:19 +0200
Subject: [PATCH] move some assignments around to be more logical

---
 morituri/image/toc.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index 7d293fc..62c5c52 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -217,24 +217,27 @@ class TocFile(object, log.Loggable):
                             currentTrack.number, pregapLength,
                             currentTrack.getIndex(1))
 
-                # update running totals
+                # create a new track to be filled by later lines
                 trackNumber += 1
+                trackMode = m.group('mode')
+                audio = trackMode == 'AUDIO'
+                currentTrack = table.Track(trackNumber, audio=audio)
+                self.table.tracks.append(currentTrack)
+
+                # update running totals
                 absoluteOffset += currentLength
                 relativeOffset += currentLength
                 totalLength += currentLength
-                trackMode = m.group('mode')
-
-                # reset counters
-                currentLength = 0
-                indexNumber = 1
-                pregapLength = 0
 
                 # FIXME: track mode
                 self.debug('found track %d, mode %s, at absoluteOffset %d',
                     trackNumber, trackMode, absoluteOffset)
-                audio = trackMode == 'AUDIO'
-                currentTrack = table.Track(trackNumber, audio=audio)
-                self.table.tracks.append(currentTrack)
+
+                # reset counters relative to a track
+                currentLength = 0
+                indexNumber = 1
+                pregapLength = 0
+
                 continue
 
             # look for ISRC lines