[SCM] morituri/master: * 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
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:08:57 UTC 2014
The following commit has been merged in the master branch:
commit c17a28d7aeb3a417143bd5f662ae4ceea8003fbc
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Mon May 4 16:01:19 2009 +0000
* 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
diff --git a/ChangeLog b/ChangeLog
index babd4e7..d5cde41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
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>
+
* examples/readdisc.py (added):
Add an example to read a whole disc. Doesn't work yet.
diff --git a/examples/movecue.py b/examples/movecue.py
index f14589f..56aca58 100644
--- a/examples/movecue.py
+++ b/examples/movecue.py
@@ -31,7 +31,7 @@ from morituri.image import cue
def move(path):
print 'reading', path
- cuefile = cue.Cue(path)
+ cuefile = cue.CueFile(path)
cuefile.parse()
track = cuefile.tracks[0]
diff --git a/examples/readcue.py b/examples/readcue.py
index 05162c1..281cab3 100644
--- a/examples/readcue.py
+++ b/examples/readcue.py
@@ -25,7 +25,7 @@ import sys
from morituri.image import cue
def main(path):
- cuefile = cue.Cue(path)
+ cuefile = cue.CueFile(path)
cuefile.parse()
print cuefile.tracks
diff --git a/morituri/image/cue.py b/morituri/image/cue.py
index 8407d70..53fea20 100644
--- a/morituri/image/cue.py
+++ b/morituri/image/cue.py
@@ -57,7 +57,7 @@ _INDEX_RE = re.compile(r"""
""", re.VERBOSE)
-class Cue(object, log.Loggable):
+class CueFile(object, log.Loggable):
def __init__(self, path):
self._path = path
self._rems = {}
diff --git a/morituri/image/image.py b/morituri/image/image.py
index decfccf..50f0080 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -45,7 +45,7 @@ class Image(object, log.Loggable):
@param path: .cue path
"""
self._path = path
- self.cue = cue.Cue(path)
+ self.cue = cue.CueFile(path)
self.cue.parse()
self._offsets = [] # 0 .. trackCount - 1
self._lengths = [] # 0 .. trackCount - 1
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index a2aa701..754e13e 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -64,7 +64,7 @@ _INDEX_RE = re.compile(r"""
\s(?P<offset>.+)$ # start offset
""", re.VERBOSE)
-class TOC:
+class TocFile(object):
def __init__(self, path):
self._path = path
self._messages = []
diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
index 70abab7..f940040 100644
--- a/morituri/program/cdrdao.py
+++ b/morituri/program/cdrdao.py
@@ -260,7 +260,7 @@ class ReadIndexTableTask(CDRDAOTask):
def done(self):
# FIXME: instead of reading only a TOC, output a complete IndexTable
# by merging the TOC info.
- self.toc = toc.TOC(self._toc)
+ self.toc = toc.TocFile(self._toc)
self.toc.parse()
os.unlink(self._toc)
diff --git a/morituri/test/test_image_cue.py b/morituri/test/test_image_cue.py
index 53549d4..bcd4ae5 100644
--- a/morituri/test/test_image_cue.py
+++ b/morituri/test/test_image_cue.py
@@ -11,7 +11,7 @@ from morituri.image import table, cue
class KingsSingleTestCase(unittest.TestCase):
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'))
self.cue.parse()
self.assertEquals(len(self.cue.tracks), 11)
@@ -25,7 +25,7 @@ class KingsSingleTestCase(unittest.TestCase):
class KingsSeparateTestCase(unittest.TestCase):
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'))
self.cue.parse()
self.assertEquals(len(self.cue.tracks), 11)
@@ -39,7 +39,7 @@ class KingsSeparateTestCase(unittest.TestCase):
class KanyeMixedTestCase(unittest.TestCase):
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'))
self.cue.parse()
self.assertEquals(len(self.cue.tracks), 13)
@@ -49,7 +49,7 @@ class KanyeMixedTestCase(unittest.TestCase):
self.assertEquals(self.cue.getTrackLength(t), -1)
-class WriteCueTestCase(unittest.TestCase):
+class WriteCueFileTestCase(unittest.TestCase):
def testWrite(self):
fd, path = tempfile.mkstemp(suffix='morituri.test.cue')
os.close(fd)
diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py
index f06503e..08a5b9d 100644
--- a/morituri/test/test_image_toc.py
+++ b/morituri/test/test_image_toc.py
@@ -8,7 +8,7 @@ from morituri.image import toc
class CureTestCase(unittest.TestCase):
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'))
self.toc.parse()
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
class BlocTestCase(unittest.TestCase):
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'))
self.toc.parse()
self.assertEquals(len(self.toc.tracks), 13)
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list