benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* morituri/image/image.py:

Browse Source 
* morituri/image/table.py:
	* morituri/test/test_image_image.py:
	* morituri/test/test_image_table.py:
	  Rename toc.TOC to table.Table
This commit is contained in:
Thomas Vander Stichele
2009-04-27 22:15:51 +00:00
parent 5df66ce231
commit 4982f588c7
5 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2009-04-28 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/image/image.py:
* morituri/image/table.py:
* morituri/test/test_image_image.py:
* morituri/test/test_image_table.py:
Rename toc.TOC to table.Table
2009-04-28 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/test/test_image_table.py (added):

6
morituri/image/image.py
View File

@@ -30,7 +30,7 @@ import struct
import gst
from morituri.common import task, checksum
from morituri.image import cue, toc
from morituri.image import cue, table
class Image:
def __init__(self, path):
@@ -68,11 +68,11 @@ class Image:
length = self.cue.getTrackLength(self.cue.tracks[i])
if length == -1:
length = verify.lengths[i + 1]
tracks.append(toc.Track(i + 1, offset, offset + length - 1))
tracks.append(table.Track(i + 1, offset, offset + length - 1))
offset += length
self.toc = toc.TOC(tracks)
self.table = table.Table(tracks)
class AccurateRipChecksumTask(task.MultiTask):

4
morituri/image/table.py
View File

@@ -1,4 +1,4 @@
# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*-
# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*-
# vi:si:et:sw=4:sts=4:ts=4
# Morituri - for those about to RIP
@@ -57,7 +57,7 @@ class Track:
self.end = end
self.audio = audio
class TOC:
class Table:
"""
I represent the Table of Contents of a CD.

24
morituri/test/test_image_image.py
View File

@@ -31,16 +31,16 @@ class TrackSingleTestCase(unittest.TestCase):
self.assertEquals(h(checksumtask.checksums[3]), '0x00000000')
def testLength(self):
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)
self.assertEquals(self.image.table.getTrackLength(1), 2)
self.assertEquals(self.image.table.getTrackLength(2), 2)
self.assertEquals(self.image.table.getTrackLength(3), 2)
self.assertEquals(self.image.table.getTrackLength(4), 4)
def testCDDB(self):
self.assertEquals(self.image.toc.getCDDBDiscId(), "08000004")
self.assertEquals(self.image.table.getCDDBDiscId(), "08000004")
def testAccurateRip(self):
self.assertEquals(self.image.toc.getAccurateRipIds(), (
self.assertEquals(self.image.table.getAccurateRipIds(), (
"00000016", "0000005b"))
class TrackSeparateTestCase(unittest.TestCase):
@@ -62,16 +62,16 @@ class TrackSeparateTestCase(unittest.TestCase):
def testLength(self):
tracks = self.image.cue.tracks
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)
self.assertEquals(self.image.table.getTrackLength(1), 10)
self.assertEquals(self.image.table.getTrackLength(2), 10)
self.assertEquals(self.image.table.getTrackLength(3), 10)
self.assertEquals(self.image.table.getTrackLength(4), 10)
def testCDDB(self):
self.assertEquals(self.image.toc.getCDDBDiscId(), "08000004")
self.assertEquals(self.image.table.getCDDBDiscId(), "08000004")
def testAccurateRip(self):
self.assertEquals(self.image.toc.getAccurateRipIds(), (
self.assertEquals(self.image.table.getAccurateRipIds(), (
"00000064", "00000191"))
class AudioLengthTestCase(unittest.TestCase):

36
morituri/test/test_image_table.py
View File

@@ -1,10 +1,10 @@
# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*-
# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
import unittest
from morituri.image import toc
from morituri.image import table
def h(i):
return "0x%08x" % i
@@ -18,25 +18,25 @@ class LadyhawkeTestCase(unittest.TestCase):
# AccurateRip URL has been verified against EAC's, using wireshark
def setUp(self):
self.toc = toc.TOC([
toc.Track( 1, 0, 15536),
toc.Track( 2, 15537, 31690),
toc.Track( 3, 31691, 50865),
toc.Track( 4, 50866, 66465),
toc.Track( 5, 66466, 81201),
toc.Track( 6, 81202, 99408),
toc.Track( 7, 99409, 115919),
toc.Track( 8, 115920, 133092),
toc.Track( 9, 133093, 149846),
toc.Track(10, 149847, 161559),
toc.Track(11, 161560, 177681),
toc.Track(12, 177682, 195705),
toc.Track(13, 207106, 210384, audio=False),
self.table = table.Table([
table.Track( 1, 0, 15536),
table.Track( 2, 15537, 31690),
table.Track( 3, 31691, 50865),
table.Track( 4, 50866, 66465),
table.Track( 5, 66466, 81201),
table.Track( 6, 81202, 99408),
table.Track( 7, 99409, 115919),
table.Track( 8, 115920, 133092),
table.Track( 9, 133093, 149846),
table.Track(10, 149847, 161559),
table.Track(11, 161560, 177681),
table.Track(12, 177682, 195705),
table.Track(13, 207106, 210384, audio=False),
])
def testCDDB(self):
self.assertEquals(self.toc.getCDDBDiscId(), "c60af50d")
self.assertEquals(self.table.getCDDBDiscId(), "c60af50d")
def testAccurateRip(self):
self.assertEquals(self.toc.getAccurateRipIds(), (
self.assertEquals(self.table.getAccurateRipIds(), (
"0013bd5a", "00b8d489"))