[SCM] morituri/master: * examples/ARcue.py: * morituri/image/image.py: * morituri/test/test_image_image.py: Make everything use TOC for the id's.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1abeac8dcfcf6293b5d0c95593022566703d6115
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Apr 15 13:20:56 2009 +0000

    	* examples/ARcue.py:
    	* morituri/image/image.py:
    	* morituri/test/test_image_image.py:
    	  Make everything use TOC for the id's.

diff --git a/ChangeLog b/ChangeLog
index e4b3fb7..3e86b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-04-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* examples/ARcue.py:
+	* morituri/image/image.py:
+	* morituri/test/test_image_image.py:
+	  Make everything use TOC for the id's.
+
+2009-04-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/image/image.py:
 	  Refactor to use TOC class.
 	* morituri/image/toc.py:
diff --git a/examples/ARcue.py b/examples/ARcue.py
index 1e7e006..323f814 100644
--- a/examples/ARcue.py
+++ b/examples/ARcue.py
@@ -76,8 +76,8 @@ def main(argv):
         function = gtkmain
 
     cueImage.setup(runner)
-    print "CDDB disc id", cueImage.getCDDBDiscId()
-    url = cueImage.getAccurateRipURL()
+    print "CDDB disc id", cueImage.toc.getCDDBDiscId()
+    url = cueImage.toc.getAccurateRipURL()
     print "AccurateRip URL", url
 
     # FIXME: download url as a task too
@@ -96,7 +96,7 @@ def main(argv):
     if responses:
         print '%d AccurateRip reponses found' % len(responses)
 
-        if responses[0].cddbDiscId != cueImage.getCDDBDiscId():
+        if responses[0].cddbDiscId != cueImage.toc.getCDDBDiscId():
             print "AccurateRip response discid different: %s" % \
                 responses[0].cddbDiscId
 
@@ -106,7 +106,7 @@ def main(argv):
     response = None
 
     for i, crc in enumerate(cuetask.crcs):
-        status = '** rip not accurate **'
+        status = 'rip NOT accurate'
 
         confidence = None
         arcrc = None
@@ -119,7 +119,7 @@ def main(argv):
                     assert r == response, \
                         "CRC %s for %d matches wrong response %d, crc %s" % (
                             crc, i + 1, j + 1, response.crcs[i])
-                status = '   rip accurate       '
+                status = 'rip accurate    '
                 arcrc = crc
                 confidence = response.confidences[i]
 
diff --git a/morituri/image/image.py b/morituri/image/image.py
index ad0b8cb..597f569 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -99,29 +99,6 @@ class Image:
 
         self.toc = toc.TOC(tracks)
 
-    def getTrackOffset(self, track):
-        return self._offsets[self.cue.tracks.index(track)]
-
-    def getTrackLength(self, track):
-        return self.toc.getTrackLength(self.cue.tracks.index(track) + 1)
-
-    def getCDDBDiscId(self):
-        return self.toc.getCDDBDiscId()
-
-    def getAccurateRipIds(self):
-        """
-        @rtype: two-tuple of (str, str)
-        """
-        return self.toc.getAccurateRipIds()
-
-    def getAccurateRipURL(self):
-        discId1, discId2 = self.getAccurateRipIds()
-
-        return "http://www.accuraterip.com/accuraterip/" \
-            "%s/%s/%s/dBAR-%.3d-%s-%s-%s.bin" % ( 
-                discId1[-1], discId1[-2], discId1[-3],
-                len(self.cue.tracks), discId1, discId2, self.getCDDBDiscId())
-
 class MultiTask(task.Task):
     """
     I perform multiple tasks.
diff --git a/morituri/test/test_image_image.py b/morituri/test/test_image_image.py
index ac45738..cb39fc6 100644
--- a/morituri/test/test_image_image.py
+++ b/morituri/test/test_image_image.py
@@ -31,17 +31,16 @@ class TrackSingleTestCase(unittest.TestCase):
         self.assertEquals(h(crctask.crcs[3]), '0x00000000')
 
     def testLength(self):
-        tracks = self.image.cue.tracks
-        self.assertEquals(self.image.getTrackLength(tracks[0]), 2)
-        self.assertEquals(self.image.getTrackLength(tracks[1]), 2)
-        self.assertEquals(self.image.getTrackLength(tracks[2]), 2)
-        self.assertEquals(self.image.getTrackLength(tracks[3]), 4)
+        self.assertEquals(self.image.toc.getTrackLength(1), 2)
+        self.assertEquals(self.image.toc.getTrackLength(2), 2)
+        self.assertEquals(self.image.toc.getTrackLength(3), 2)
+        self.assertEquals(self.image.toc.getTrackLength(4), 4)
 
     def testCDDB(self):
-        self.assertEquals(self.image.getCDDBDiscId(), "08000004")
+        self.assertEquals(self.image.toc.getCDDBDiscId(), "08000004")
 
     def testAccurateRip(self):
-        self.assertEquals(self.image.getAccurateRipIds(), (
+        self.assertEquals(self.image.toc.getAccurateRipIds(), (
             "00000016", "0000005b"))
 
 class TracSeparateTestCase(unittest.TestCase):
@@ -63,16 +62,16 @@ class TracSeparateTestCase(unittest.TestCase):
 
     def testLength(self):
         tracks = self.image.cue.tracks
-        self.assertEquals(self.image.getTrackLength(tracks[0]), 10)
-        self.assertEquals(self.image.getTrackLength(tracks[1]), 10)
-        self.assertEquals(self.image.getTrackLength(tracks[2]), 10)
-        self.assertEquals(self.image.getTrackLength(tracks[3]), 10)
+        self.assertEquals(self.image.toc.getTrackLength(1), 10)
+        self.assertEquals(self.image.toc.getTrackLength(2), 10)
+        self.assertEquals(self.image.toc.getTrackLength(3), 10)
+        self.assertEquals(self.image.toc.getTrackLength(4), 10)
 
     def testCDDB(self):
-        self.assertEquals(self.image.getCDDBDiscId(), "08000004")
+        self.assertEquals(self.image.toc.getCDDBDiscId(), "08000004")
 
     def testAccurateRip(self):
-        self.assertEquals(self.image.getAccurateRipIds(), (
+        self.assertEquals(self.image.toc.getAccurateRipIds(), (
             "00000064", "00000191"))
 
 class AudioLengthTestCase(unittest.TestCase):

-- 
morituri packaging