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

* examples/movecue.py:

Browse Source 
* examples/readcue.py:
	* morituri/image/cue.py:
	* morituri/image/image.py:
	* morituri/image/toc.py:
	* morituri/program/cdrdao.py:
	* morituri/test/test_image_cue.py:
	* morituri/test/test_image_toc.py:
	  Cue -> CueFile
	  TOC -> TocFile
This commit is contained in:
Thomas Vander Stichele
2009-05-04 16:01:19 +00:00
parent 2dbd307096
commit c17a28d7ae
9 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2009-05-04 Thomas Vander Stichele <thomas at apestaart dot org>
* examples/movecue.py:
* examples/readcue.py:
* morituri/image/cue.py:
* morituri/image/image.py:
* morituri/image/toc.py:
* morituri/program/cdrdao.py:
* morituri/test/test_image_cue.py:
* morituri/test/test_image_toc.py:
Cue -> CueFile
TOC -> TocFile
2009-05-04 Thomas Vander Stichele <thomas at apestaart dot org> 2009-05-04 Thomas Vander Stichele <thomas at apestaart dot org>
* examples/readdisc.py (added): * examples/readdisc.py (added):

2
examples/movecue.py
View File

@@ -31,7 +31,7 @@ from morituri.image import cue
def move(path): def move(path):
print 'reading', path print 'reading', path
cuefile = cue.Cue(path) cuefile = cue.CueFile(path)
cuefile.parse() cuefile.parse()
track = cuefile.tracks[0] track = cuefile.tracks[0]

2
examples/readcue.py
View File

@@ -25,7 +25,7 @@ import sys
from morituri.image import cue from morituri.image import cue
def main(path): def main(path):
cuefile = cue.Cue(path) cuefile = cue.CueFile(path)
cuefile.parse() cuefile.parse()
print cuefile.tracks print cuefile.tracks

2
morituri/image/cue.py
View File

@@ -57,7 +57,7 @@ _INDEX_RE = re.compile(r"""
""", re.VERBOSE) """, re.VERBOSE)
class Cue(object, log.Loggable): class CueFile(object, log.Loggable):
def __init__(self, path): def __init__(self, path):
self._path = path self._path = path
self._rems = {} self._rems = {}

2
morituri/image/image.py
View File

@@ -45,7 +45,7 @@ class Image(object, log.Loggable):
@param path: .cue path @param path: .cue path
""" """
self._path = path self._path = path
self.cue = cue.Cue(path) self.cue = cue.CueFile(path)
self.cue.parse() self.cue.parse()
self._offsets = [] # 0 .. trackCount - 1 self._offsets = [] # 0 .. trackCount - 1
self._lengths = [] # 0 .. trackCount - 1 self._lengths = [] # 0 .. trackCount - 1

2
morituri/image/toc.py
View File

@@ -64,7 +64,7 @@ _INDEX_RE = re.compile(r"""
\s(?P<offset>.+)$ # start offset \s(?P<offset>.+)$ # start offset
""", re.VERBOSE) """, re.VERBOSE)
class TOC: class TocFile(object):
def __init__(self, path): def __init__(self, path):
self._path = path self._path = path
self._messages = [] self._messages = []

2
morituri/program/cdrdao.py
View File

@@ -260,7 +260,7 @@ class ReadIndexTableTask(CDRDAOTask):
def done(self): def done(self):
# FIXME: instead of reading only a TOC, output a complete IndexTable # FIXME: instead of reading only a TOC, output a complete IndexTable
# by merging the TOC info. # by merging the TOC info.
self.toc = toc.TOC(self._toc) self.toc = toc.TocFile(self._toc)
self.toc.parse() self.toc.parse()
os.unlink(self._toc) os.unlink(self._toc)

8
morituri/test/test_image_cue.py
View File

@@ -11,7 +11,7 @@ from morituri.image import table, cue
class KingsSingleTestCase(unittest.TestCase): class KingsSingleTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.cue = cue.Cue(os.path.join(os.path.dirname(__file__), self.cue = cue.CueFile(os.path.join(os.path.dirname(__file__),
'kings-single.cue')) 'kings-single.cue'))
self.cue.parse() self.cue.parse()
self.assertEquals(len(self.cue.tracks), 11) self.assertEquals(len(self.cue.tracks), 11)
@@ -25,7 +25,7 @@ class KingsSingleTestCase(unittest.TestCase):
class KingsSeparateTestCase(unittest.TestCase): class KingsSeparateTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.cue = cue.Cue(os.path.join(os.path.dirname(__file__), self.cue = cue.CueFile(os.path.join(os.path.dirname(__file__),
'kings-separate.cue')) 'kings-separate.cue'))
self.cue.parse() self.cue.parse()
self.assertEquals(len(self.cue.tracks), 11) self.assertEquals(len(self.cue.tracks), 11)
@@ -39,7 +39,7 @@ class KingsSeparateTestCase(unittest.TestCase):
class KanyeMixedTestCase(unittest.TestCase): class KanyeMixedTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.cue = cue.Cue(os.path.join(os.path.dirname(__file__), self.cue = cue.CueFile(os.path.join(os.path.dirname(__file__),
'kanye.cue')) 'kanye.cue'))
self.cue.parse() self.cue.parse()
self.assertEquals(len(self.cue.tracks), 13) self.assertEquals(len(self.cue.tracks), 13)
@@ -49,7 +49,7 @@ class KanyeMixedTestCase(unittest.TestCase):
self.assertEquals(self.cue.getTrackLength(t), -1) self.assertEquals(self.cue.getTrackLength(t), -1)
class WriteCueTestCase(unittest.TestCase): class WriteCueFileTestCase(unittest.TestCase):
def testWrite(self): def testWrite(self):
fd, path = tempfile.mkstemp(suffix='morituri.test.cue') fd, path = tempfile.mkstemp(suffix='morituri.test.cue')
os.close(fd) os.close(fd)

4
morituri/test/test_image_toc.py
View File

@@ -8,7 +8,7 @@ from morituri.image import toc
class CureTestCase(unittest.TestCase): class CureTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.toc = toc.TOC(os.path.join(os.path.dirname(__file__), self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
'cure.toc')) 'cure.toc'))
self.toc.parse() self.toc.parse()
self.assertEquals(len(self.toc.tracks), 13) self.assertEquals(len(self.toc.tracks), 13)
@@ -33,7 +33,7 @@ class CureTestCase(unittest.TestCase):
# Bloc Party - Silent Alarm has a Hidden Track One Audio # Bloc Party - Silent Alarm has a Hidden Track One Audio
class BlocTestCase(unittest.TestCase): class BlocTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.toc = toc.TOC(os.path.join(os.path.dirname(__file__), self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
'bloc.toc')) 'bloc.toc'))
self.toc.parse() self.toc.parse()
self.assertEquals(len(self.toc.tracks), 13) self.assertEquals(len(self.toc.tracks), 13)