diff --git a/HACKING b/HACKING
index 8a9c5a3a..420eeb42 100644
--- a/HACKING
+++ b/HACKING
@@ -44,7 +44,7 @@ unicode
- Use asserts liberally to ensure this so we catch problems earlier.
- All gst.parse_launch() pipelines should be passed as utf-8; use
encode('utf-8')
-- morituri.extern.log.log is not unicode-safe; don't pass it unicode objects;
+- whipper.extern.log.log is not unicode-safe; don't pass it unicode objects;
for example, always use %r to log paths
- run with RIP_DEBUG=5 once in a while to catch unicode/logging errors.
- Also use unicode prefix/suffix in tempfile.* methods; to force unicode.
diff --git a/doc/.gitignore b/doc/.gitignore
index bdb5ae53..02b12366 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,4 +1,4 @@
-morituri.ics
-morituri.rss2
+whipper.ics
+whipper.rss2
reference
rip.1
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c115c2c3..9a31b5d2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,30 +1,30 @@
-EXTRA_DIST = morituri.rss2 morituri.ics $(man_MANS)
+EXTRA_DIST = whipper.rss2 whipper.ics $(man_MANS)
DISTCLEANFILES = $(man_MANS)
all-local: feeds reference
if HAVE_EPYDOC
-reference: $(top_srcdir)/morituri/*.py feeds
- epydoc -o reference $(top_srcdir)/morituri
+reference: $(top_srcdir)/whipper/*.py feeds
+ epydoc -o reference $(top_srcdir)/whipper
else
reference:
@true
endif
# generate feeds
-feeds: morituri.rss2 morituri.ics
+feeds: whipper.rss2 whipper.ics
# don't fail fatally if user does not have RDF
-morituri.rss2: $(top_srcdir)/morituri.doap
- -moap doap -f $(top_srcdir)/morituri.doap rss > morituri.rss2
+whipper.rss2: $(top_srcdir)/whipper.doap
+ -moap doap -f $(top_srcdir)/whipper.doap rss > whipper.rss2
-morituri.ics: $(top_srcdir)/morituri.doap
- -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
+whipper.ics: $(top_srcdir)/whipper.doap
+ -moap doap -f $(top_srcdir)/whipper.doap ical > whipper.ics
man_MANS = rip.1
-rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
+rip.1: $(top_srcdir)/whipper/extern/python-command/scripts/help2man $(top_srcdir)/whipper
+ PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/whipper/extern/python-command/scripts/help2man whipper.rip.main.Rip rip > rip.1
clean-local:
@rm -rf reference
diff --git a/misc/header.py b/misc/header.py
index 15b83ba0..a7322f4d 100644
--- a/misc/header.py
+++ b/misc/header.py
@@ -1,21 +1,19 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_header -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_header -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
diff --git a/misc/pycheckerrc b/misc/pycheckerrc
index 8f63c7b8..697f40f7 100644
--- a/misc/pycheckerrc
+++ b/misc/pycheckerrc
@@ -182,7 +182,7 @@ blacklist = [
#warning: couldn't find real module for class xml.parsers.expat.ExpatError (module name: xml.parsers.expat)
'xml.parsers.expat',
'unittest',
- 'morituri.extern.log.log',
+ 'whipper.extern.log.log',
]
# ignore global variables not used if name is one of these values
diff --git a/misc/morituri-uninstalled b/misc/whipper-uninstalled
similarity index 100%
rename from misc/morituri-uninstalled
rename to misc/whipper-uninstalled
diff --git a/morituri/test/cache/result/fe105a11.pickle b/morituri/test/cache/result/fe105a11.pickle
deleted file mode 100644
index 97c91cc0..00000000
Binary files a/morituri/test/cache/result/fe105a11.pickle and /dev/null differ
diff --git a/setup.py b/setup.py
index 99856752..9262a8de 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
from setuptools import setup, find_packages
-from morituri import __version__ as morituri_version
+from whipper import __version__ as whipper_version
setup(
name="whipper",
- version=morituri_version,
+ version=whipper_version,
description="a secure cd ripper preferring accuracy over speed",
author=['Thomas Vander Stichele', 'Joe Lametta', 'Samantha Baldwin'],
maintainer=['Joe Lametta', 'Samantha Baldwin'],
@@ -12,7 +12,7 @@
packages=find_packages(),
entry_points={
'console_scripts': [
- 'whipper = morituri.command.main:main'
+ 'whipper = whipper.command.main:main'
]
}
)
diff --git a/morituri/__init__.py b/whipper/__init__.py
similarity index 100%
rename from morituri/__init__.py
rename to whipper/__init__.py
diff --git a/morituri/command/__init__.py b/whipper/command/__init__.py
similarity index 100%
rename from morituri/command/__init__.py
rename to whipper/command/__init__.py
diff --git a/morituri/command/accurip.py b/whipper/command/accurip.py
similarity index 89%
rename from morituri/command/accurip.py
rename to whipper/command/accurip.py
index 09ae0875..56ea4708 100644
--- a/morituri/command/accurip.py
+++ b/whipper/command/accurip.py
@@ -1,29 +1,27 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import sys
-from morituri.command.basecommand import BaseCommand
-from morituri.common import accurip
+from whipper.command.basecommand import BaseCommand
+from whipper.common import accurip
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/command/basecommand.py b/whipper/command/basecommand.py
similarity index 97%
rename from morituri/command/basecommand.py
rename to whipper/command/basecommand.py
index 563dde03..86c419fd 100644
--- a/morituri/command/basecommand.py
+++ b/whipper/command/basecommand.py
@@ -5,7 +5,7 @@
import os
import sys
-from morituri.common import drive
+from whipper.common import drive
import logging
logger = logging.getLogger(__name__)
@@ -67,7 +67,7 @@ def __init__(self, argv, prog_name, opts):
if not drives:
msg = 'No CD-DA drives found!'
logger.critical(msg)
- # morituri exited with return code 3 here
+ # whipper exited with return code 3 here
raise IOError(msg)
self.parser.add_argument('-d', '--device',
action="store",
diff --git a/morituri/command/cd.py b/whipper/command/cd.py
similarity index 97%
rename from morituri/command/cd.py
rename to whipper/command/cd.py
index 38e03e05..15af8b0f 100644
--- a/morituri/command/cd.py
+++ b/whipper/command/cd.py
@@ -1,24 +1,22 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import argparse
import os
@@ -30,12 +28,12 @@
import gobject
gobject.threads_init()
-from morituri.command.basecommand import BaseCommand
-from morituri.common import (
+from whipper.command.basecommand import BaseCommand
+from whipper.common import (
accurip, common, config, drive, program, task
)
-from morituri.program import cdrdao, cdparanoia, utils
-from morituri.result import result
+from whipper.program import cdrdao, cdparanoia, utils
+from whipper.result import result
import logging
logger = logging.getLogger(__name__)
@@ -225,7 +223,7 @@ def add_arguments(self):
class Rip(_CD):
summary = "rip CD"
- # see morituri.common.program.Program.getPath for expansion
+ # see whipper.common.program.Program.getPath for expansion
description = """
Rips a CD.
@@ -257,7 +255,7 @@ def add_arguments(self):
_CD.add_arguments(self.parser)
self.parser.add_argument('-L', '--logger',
- action="store", dest="logger", default='morituri',
+ action="store", dest="logger", default='whipper',
help="logger to use (choose from '" + "', '".join(loggers) + "')")
# FIXME: get from config
self.parser.add_argument('-o', '--offset',
@@ -274,7 +272,7 @@ def add_arguments(self):
help="output directory; will be included in file paths in log")
self.parser.add_argument('-W', '--working-directory',
action="store", dest="working_directory",
- help="working directory; morituri will change to this directory "
+ help="working directory; whipper will change to this directory "
"and files will be created relative to it when not absolute")
self.parser.add_argument('--track-template',
action="store", dest="track_template",
diff --git a/morituri/command/debug.py b/whipper/command/debug.py
similarity index 91%
rename from morituri/command/debug.py
rename to whipper/command/debug.py
index c6310db3..28d99df1 100644
--- a/morituri/command/debug.py
+++ b/whipper/command/debug.py
@@ -1,31 +1,29 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import argparse
import sys
-from morituri.command.basecommand import BaseCommand
-from morituri.common import cache, task
-from morituri.result import result
+from whipper.command.basecommand import BaseCommand
+from whipper.common import cache, task
+from whipper.result import result
import logging
logger = logging.getLogger(__name__)
@@ -89,7 +87,7 @@ def add_arguments(self):
self.parser.add_argument(
'-L', '--logger',
action="store", dest="logger",
- default='morituri',
+ default='whipper',
help="logger to use (choose from '" + "', '".join(loggers) + "')"
)
@@ -136,7 +134,7 @@ def add_arguments(self):
def do(self):
runner = task.SyncRunner()
# here to avoid import gst eating our options
- from morituri.common import checksum
+ from whipper.common import checksum
for f in self.options.files:
fromPath = unicode(f)
@@ -151,7 +149,7 @@ class Encode(BaseCommand):
def add_arguments(self):
# here to avoid import gst eating our options
- from morituri.common import encode
+ from whipper.common import encode
self.parser.add_argument('input', action='store',
help="audio file to encode")
@@ -159,7 +157,7 @@ def add_arguments(self):
help="output path")
def do(self):
- from morituri.common import encode
+ from whipper.common import encode
try:
fromPath = unicode(self.options.input)
@@ -209,7 +207,7 @@ def do(self):
runner = task.SyncRunner()
- from morituri.common import encode
+ from whipper.common import encode
logger.debug('Reading tags from %s' % path.encode('utf-8'))
tagtask = encode.TagReadTask(path)
@@ -238,7 +236,7 @@ def do(self):
sys.stdout.write('Please specify a MusicBrainz disc id.\n')
return 3
- from morituri.common import mbngs
+ from whipper.common import mbngs
metadatas = mbngs.musicbrainz(discId, record=self.options.record)
sys.stdout.write('%d releases\n' % len(metadatas))
@@ -265,7 +263,7 @@ class CDParanoia(BaseCommand):
description = summary
def do(self):
- from morituri.program import cdparanoia
+ from whipper.program import cdparanoia
version = cdparanoia.getCdParanoiaVersion()
sys.stdout.write("cdparanoia version: %s\n" % version)
@@ -275,7 +273,7 @@ class CDRDAO(BaseCommand):
description = summary
def do(self):
- from morituri.program import cdrdao
+ from whipper.program import cdrdao
version = cdrdao.getCDRDAOVersion()
sys.stdout.write("cdrdao version: %s\n" % version)
diff --git a/morituri/command/drive.py b/whipper/command/drive.py
similarity index 89%
rename from morituri/command/drive.py
rename to whipper/command/drive.py
index e8d44981..3af5cbf0 100644
--- a/morituri/command/drive.py
+++ b/whipper/command/drive.py
@@ -1,31 +1,29 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import sys
-from morituri.command.basecommand import BaseCommand
-from morituri.common import config, drive
-from morituri.extern.task import task
-from morituri.program import cdparanoia
+from whipper.command.basecommand import BaseCommand
+from whipper.common import config, drive
+from whipper.extern.task import task
+from whipper.program import cdparanoia
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/command/image.py b/whipper/command/image.py
similarity index 90%
rename from morituri/command/image.py
rename to whipper/command/image.py
index 606ed813..94c12c31 100644
--- a/morituri/command/image.py
+++ b/whipper/command/image.py
@@ -1,34 +1,32 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import os
import sys
-from morituri.command.basecommand import BaseCommand
-from morituri.common import accurip, config, program
-from morituri.common import encode
-from morituri.extern.task import task
-from morituri.image import image
-from morituri.result import result
+from whipper.command.basecommand import BaseCommand
+from whipper.common import accurip, config, program
+from whipper.common import encode
+from whipper.extern.task import task
+from whipper.image import image
+from whipper.result import result
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/command/main.py b/whipper/command/main.py
similarity index 89%
rename from morituri/command/main.py
rename to whipper/command/main.py
index 03ea106e..0219591d 100644
--- a/morituri/command/main.py
+++ b/whipper/command/main.py
@@ -6,20 +6,20 @@
import pkg_resources
import musicbrainzngs
-import morituri
+import whipper
-from morituri.command import cd, offset, drive, image, accurip, debug
-from morituri.command.basecommand import BaseCommand
-from morituri.common import common, directory
-from morituri.extern.task import task
-from morituri.program.utils import eject_device
+from whipper.command import cd, offset, drive, image, accurip, debug
+from whipper.command.basecommand import BaseCommand
+from whipper.common import common, directory
+from whipper.extern.task import task
+from whipper.program.utils import eject_device
import logging
logger = logging.getLogger(__name__)
def main():
# set user agent
- musicbrainzngs.set_useragent("whipper", morituri.__version__,
+ musicbrainzngs.set_useragent("whipper", whipper.__version__,
"https://github.com/JoeLametta/whipper")
# register plugins with pkg_resources
distributions, _ = pkg_resources.working_set.find_plugins(
@@ -92,5 +92,5 @@ def handle_arguments(self):
self.parser.print_help()
sys.exit(0)
if self.options.version:
- print "whipper %s" % morituri.__version__
+ print "whipper %s" % whipper.__version__
sys.exit(0)
diff --git a/morituri/command/offset.py b/whipper/command/offset.py
similarity index 92%
rename from morituri/command/offset.py
rename to whipper/command/offset.py
index 065f2ea0..b4223edc 100644
--- a/morituri/command/offset.py
+++ b/whipper/command/offset.py
@@ -1,24 +1,22 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import argparse
import os
@@ -28,13 +26,13 @@
import gobject
gobject.threads_init()
-from morituri.command.basecommand import BaseCommand
-from morituri.common import accurip, common, config, drive, program
-from morituri.common import task as ctask
-from morituri.program import cdrdao, cdparanoia, utils
-from morituri.common import checksum
+from whipper.command.basecommand import BaseCommand
+from whipper.common import accurip, common, config, drive, program
+from whipper.common import task as ctask
+from whipper.program import cdrdao, cdparanoia, utils
+from whipper.common import checksum
-from morituri.extern.task import task
+from whipper.extern.task import task
import logging
logger = logging.getLogger(__name__)
@@ -198,7 +196,7 @@ def _arcs(self, runner, table, track, offset):
logger.debug('Ripping track %r with offset %d ...', track, offset)
fd, path = tempfile.mkstemp(
- suffix=u'.track%02d.offset%d.morituri.wav' % (
+ suffix=u'.track%02d.offset%d.whipper.wav' % (
track, offset))
os.close(fd)
diff --git a/morituri/common/__init__.py b/whipper/common/__init__.py
similarity index 100%
rename from morituri/common/__init__.py
rename to whipper/common/__init__.py
diff --git a/morituri/common/accurip.py b/whipper/common/accurip.py
similarity index 90%
rename from morituri/common/accurip.py
rename to whipper/common/accurip.py
index e9fb31f0..1ff2e03a 100644
--- a/morituri/common/accurip.py
+++ b/whipper/common/accurip.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_accurip -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_accurip -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import errno
import os
@@ -26,7 +24,7 @@
import urlparse
import urllib2
-from morituri.common import directory
+from whipper.common import directory
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/common/cache.py b/whipper/common/cache.py
similarity index 93%
rename from morituri/common/cache.py
rename to whipper/common/cache.py
index 260abe18..6e5e4e64 100644
--- a/morituri/common/cache.py
+++ b/whipper/common/cache.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_cache -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_cache -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import os
import os.path
@@ -26,8 +24,8 @@
import tempfile
import shutil
-from morituri.result import result
-from morituri.common import directory
+from whipper.result import result
+from whipper.common import directory
import logging
logger = logging.getLogger(__name__)
@@ -81,7 +79,7 @@ def persist(self, obj=None):
# pickle
self.object = obj
- (fd, path) = tempfile.mkstemp(suffix='.morituri.pickle')
+ (fd, path) = tempfile.mkstemp(suffix='.whipper.pickle')
handle = os.fdopen(fd, 'wb')
import pickle
pickle.dump(obj, handle, 2)
diff --git a/morituri/common/checksum.py b/whipper/common/checksum.py
similarity index 80%
rename from morituri/common/checksum.py
rename to whipper/common/checksum.py
index 9ed12a80..17dd8981 100644
--- a/morituri/common/checksum.py
+++ b/whipper/common/checksum.py
@@ -1,32 +1,30 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_checksum -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_checksum -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import binascii
import wave
-from morituri.extern.task import task as etask
+from whipper.extern.task import task as etask
-from morituri.program.arc import accuraterip_checksum
+from whipper.program.arc import accuraterip_checksum
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/common/common.py b/whipper/common/common.py
similarity index 95%
rename from morituri/common/common.py
rename to whipper/common/common.py
index 641720f1..1fe563f7 100644
--- a/morituri/common/common.py
+++ b/whipper/common/common.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_common -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_common -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import os
@@ -27,7 +25,7 @@
import math
import subprocess
-from morituri.extern import asyncsub
+from whipper.extern import asyncsub
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/common/config.py b/whipper/common/config.py
similarity index 91%
rename from morituri/common/config.py
rename to whipper/common/config.py
index 66e23998..9c75d28e 100644
--- a/morituri/common/config.py
+++ b/whipper/common/config.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_config -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_config -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import ConfigParser
import codecs
@@ -27,7 +25,7 @@
import tempfile
import urllib
-from morituri.common import directory
+from whipper.common import directory
import logging
logger = logging.getLogger(__name__)
@@ -51,7 +49,7 @@ def open(self):
len(self._parser.sections()))
def write(self):
- fd, path = tempfile.mkstemp(suffix=u'.moriturirc')
+ fd, path = tempfile.mkstemp(suffix=u'.whipperrc')
handle = os.fdopen(fd, 'w')
self._parser.write(handle)
handle.close()
diff --git a/morituri/common/directory.py b/whipper/common/directory.py
similarity index 79%
rename from morituri/common/directory.py
rename to whipper/common/directory.py
index a15041e4..42942d65 100644
--- a/morituri/common/directory.py
+++ b/whipper/common/directory.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_directory -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_directory -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2013 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
from os import getenv, makedirs
from os.path import join, expanduser, exists
diff --git a/morituri/common/drive.py b/whipper/common/drive.py
similarity index 82%
rename from morituri/common/drive.py
rename to whipper/common/drive.py
index f0e58679..b20642a9 100644
--- a/morituri/common/drive.py
+++ b/whipper/common/drive.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_drive -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_drive -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import os
diff --git a/morituri/common/encode.py b/whipper/common/encode.py
similarity index 80%
rename from morituri/common/encode.py
rename to whipper/common/encode.py
index 4d3b69ad..309c5816 100644
--- a/morituri/common/encode.py
+++ b/whipper/common/encode.py
@@ -1,32 +1,30 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_encode -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_encode -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
from mutagen.flac import FLAC
-from morituri.extern.task import task
+from whipper.extern.task import task
-from morituri.program import sox
-from morituri.program import flac
+from whipper.program import sox
+from whipper.program import flac
import logging
logger = logging.getLogger(__name__)
@@ -65,7 +63,7 @@ def _flac_encode(self):
# TODO: Wizzup: Do we really want this as 'Task'...?
# I only made it a task for now because that it's easier to integrate in
-# program/cdparanoia.py - where morituri currently does the tagging.
+# program/cdparanoia.py - where whipper currently does the tagging.
# We should just move the tagging to a more sensible place.
class TaggingTask(task.Task):
description = 'Writing tags to FLAC'
diff --git a/morituri/common/mbngs.py b/whipper/common/mbngs.py
similarity index 96%
rename from morituri/common/mbngs.py
rename to whipper/common/mbngs.py
index fb4d1e1a..a066d641 100644
--- a/morituri/common/mbngs.py
+++ b/whipper/common/mbngs.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_mbngs -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_mbngs -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
Handles communication with the musicbrainz server using NGS.
@@ -90,7 +88,7 @@ def _record(record, which, name, what):
# optionally record to disc as a JSON serialization
if record:
import json
- filename = 'morituri.%s.%s.json' % (which, name)
+ filename = 'whipper.%s.%s.json' % (which, name)
handle = open(filename, 'w')
handle.write(json.dumps(what))
handle.close()
diff --git a/morituri/common/path.py b/whipper/common/path.py
similarity index 85%
rename from morituri/common/path.py
rename to whipper/common/path.py
index cb595aea..6b1ff514 100644
--- a/morituri/common/path.py
+++ b/whipper/common/path.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_path -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_path -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import re
diff --git a/morituri/common/program.py b/whipper/common/program.py
similarity index 97%
rename from morituri/common/program.py
rename to whipper/common/program.py
index cc5bbaf2..d4978b58 100644
--- a/morituri/common/program.py
+++ b/whipper/common/program.py
@@ -1,27 +1,25 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_program -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_program -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
-Common functionality and class for all programs using morituri.
+Common functionality and class for all programs using whipper.
"""
import musicbrainzngs
@@ -29,11 +27,11 @@
import sys
import time
-from morituri.common import common, mbngs, cache, path
-from morituri.common import checksum
-from morituri.program import cdrdao, cdparanoia
-from morituri.image import image
-from morituri.extern.task import task
+from whipper.common import common, mbngs, cache, path
+from whipper.common import checksum
+from whipper.program import cdrdao, cdparanoia
+from whipper.image import image
+from whipper.extern.task import task
import logging
logger = logging.getLogger(__name__)
@@ -51,7 +49,7 @@ class Program:
@ivar result: the rip's result
@type result: L{result.RipResult}
@type outdir: unicode
- @type config: L{morituri.common.config.Config}
+ @type config: L{whipper.common.config.Config}
"""
cuePath = None
@@ -286,7 +284,7 @@ def getCDDB(self, cddbdiscid):
def getMusicBrainz(self, ittoc, mbdiscid, release=None, country=None, prompt=False):
"""
- @type ittoc: L{morituri.image.table.Table}
+ @type ittoc: L{whipper.image.table.Table}
"""
# look up disc on musicbrainz
self._stdout.write('Disc duration: %s, %d audio tracks\n' % (
diff --git a/morituri/common/renamer.py b/whipper/common/renamer.py
similarity index 93%
rename from morituri/common/renamer.py
rename to whipper/common/renamer.py
index 03730647..c71a1367 100644
--- a/morituri/common/renamer.py
+++ b/whipper/common/renamer.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_renamer -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_renamer -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import os
import tempfile
@@ -201,7 +199,7 @@ def verify(self):
def do(self):
with open(self._path) as handle:
- (fd, name) = tempfile.mkstemp(suffix='.morituri')
+ (fd, name) = tempfile.mkstemp(suffix='.whipper')
for s in handle:
os.write(fd, s.replace(self._source, self._destination))
diff --git a/morituri/common/task.py b/whipper/common/task.py
similarity index 97%
rename from morituri/common/task.py
rename to whipper/common/task.py
index 24197042..e1f4bcfa 100644
--- a/morituri/common/task.py
+++ b/whipper/common/task.py
@@ -5,8 +5,8 @@
import signal
import subprocess
-from morituri.extern import asyncsub
-from morituri.extern.task import task
+from whipper.extern import asyncsub
+from whipper.extern.task import task
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/extern/__init__.py b/whipper/extern/__init__.py
similarity index 100%
rename from morituri/extern/__init__.py
rename to whipper/extern/__init__.py
diff --git a/morituri/extern/asyncsub.py b/whipper/extern/asyncsub.py
similarity index 100%
rename from morituri/extern/asyncsub.py
rename to whipper/extern/asyncsub.py
diff --git a/morituri/extern/task/ChangeLog b/whipper/extern/task/ChangeLog
similarity index 100%
rename from morituri/extern/task/ChangeLog
rename to whipper/extern/task/ChangeLog
diff --git a/morituri/extern/task/__init__.py b/whipper/extern/task/__init__.py
similarity index 100%
rename from morituri/extern/task/__init__.py
rename to whipper/extern/task/__init__.py
diff --git a/morituri/extern/task/task.py b/whipper/extern/task/task.py
similarity index 98%
rename from morituri/extern/task/task.py
rename to whipper/extern/task/task.py
index da4639af..30c0ed2d 100644
--- a/morituri/extern/task/task.py
+++ b/whipper/extern/task/task.py
@@ -1,24 +1,22 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import sys
diff --git a/morituri/image/__init__.py b/whipper/image/__init__.py
similarity index 100%
rename from morituri/image/__init__.py
rename to whipper/image/__init__.py
diff --git a/morituri/image/cue.py b/whipper/image/cue.py
similarity index 93%
rename from morituri/image/cue.py
rename to whipper/image/cue.py
index c774ccf5..e8a87ed6 100644
--- a/morituri/image/cue.py
+++ b/whipper/image/cue.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
Reading .cue files
@@ -29,8 +27,8 @@
import re
import codecs
-from morituri.common import common
-from morituri.image import table
+from whipper.common import common
+from whipper.image import table
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/image/image.py b/whipper/image/image.py
similarity index 93%
rename from morituri/image/image.py
rename to whipper/image/image.py
index d2f2b92c..90d5869f 100644
--- a/morituri/image/image.py
+++ b/whipper/image/image.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_image -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_image -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
Wrap on-disk CD images based on the .cue file.
@@ -26,12 +24,12 @@
import os
-from morituri.common import encode
-from morituri.common import common
-from morituri.common import checksum
-from morituri.image import cue, table
-from morituri.extern.task import task
-from morituri.program.soxi import AudioLengthTask
+from whipper.common import encode
+from whipper.common import common
+from whipper.common import checksum
+from whipper.image import cue, table
+from whipper.extern.task import task
+from whipper.program.soxi import AudioLengthTask
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/image/table.py b/whipper/image/table.py
similarity index 98%
rename from morituri/image/table.py
rename to whipper/image/table.py
index fbd7cc04..b9909e65 100644
--- a/morituri/image/table.py
+++ b/whipper/image/table.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_table -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
Wrap Table of Contents.
@@ -28,9 +26,9 @@
import urllib
import urlparse
-import morituri
+import whipper
-from morituri.common import common
+from whipper.common import common
import logging
logger = logging.getLogger(__name__)
@@ -527,7 +525,7 @@ def getAccurateRipURL(self):
discId1[-1], discId1[-2], discId1[-3],
self.getAudioTracks(), discId1, discId2, self.getCDDBDiscId())
- def cue(self, cuePath='', program='morituri'):
+ def cue(self, cuePath='', program='whipper'):
"""
@param cuePath: path to the cue file to be written. If empty,
will treat paths as if in current directory.
@@ -556,7 +554,7 @@ def writeFile(path):
assert self.hasTOC(), "Table does not represent a full CD TOC"
lines.append('REM DISCID %s' % self.getCDDBDiscId().upper())
- lines.append('REM COMMENT "%s %s"' % (program, morituri.__version__))
+ lines.append('REM COMMENT "%s %s"' % (program, whipper.__version__))
if self.catalog:
lines.append("CATALOG %s" % self.catalog)
diff --git a/morituri/image/toc.py b/whipper/image/toc.py
similarity index 97%
rename from morituri/image/toc.py
rename to whipper/image/toc.py
index 45ae12ff..25d00d42 100644
--- a/morituri/image/toc.py
+++ b/whipper/image/toc.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_toc -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
"""
Reading .toc files
@@ -29,8 +27,8 @@
import re
import codecs
-from morituri.common import common
-from morituri.image import table
+from whipper.common import common
+from whipper.image import table
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/program/__init__.py b/whipper/program/__init__.py
similarity index 100%
rename from morituri/program/__init__.py
rename to whipper/program/__init__.py
diff --git a/morituri/program/arc.py b/whipper/program/arc.py
similarity index 100%
rename from morituri/program/arc.py
rename to whipper/program/arc.py
diff --git a/morituri/program/cdparanoia.py b/whipper/program/cdparanoia.py
similarity index 96%
rename from morituri/program/cdparanoia.py
rename to whipper/program/cdparanoia.py
index b2321ade..81e7281f 100644
--- a/morituri/program/cdparanoia.py
+++ b/whipper/program/cdparanoia.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import errno
import os
@@ -29,10 +27,10 @@
import tempfile
import time
-from morituri.common import common
-from morituri.common import task as ctask
-from morituri.extern import asyncsub
-from morituri.extern.task import task
+from whipper.common import common
+from whipper.common import task as ctask
+from whipper.extern import asyncsub
+from whipper.extern.task import task
import logging
logger = logging.getLogger(__name__)
@@ -454,12 +452,12 @@ def __init__(self, path, table, start, stop, overread, offset=0,
if taglist:
logger.debug('read and verify with taglist %r', taglist)
# FIXME: choose a dir on the same disk/dir as the final path
- fd, tmppath = tempfile.mkstemp(suffix='.morituri.wav')
+ fd, tmppath = tempfile.mkstemp(suffix='.whipper.wav')
tmppath = unicode(tmppath)
os.close(fd)
self._tmpwavpath = tmppath
- from morituri.common import checksum
+ from whipper.common import checksum
self.tasks = []
self.tasks.append(
@@ -484,7 +482,7 @@ def __init__(self, path, table, start, stop, overread, offset=0,
self._tmppath = tmpoutpath
self.path = path
- from morituri.common import encode
+ from whipper.common import encode
self.tasks.append(encode.FlacEncodeTask(tmppath, tmpoutpath))
@@ -581,7 +579,7 @@ class AnalyzeTask(ctask.PopenTask):
def __init__(self, device=None):
# cdparanoia -A *always* writes cdparanoia.log
- self.cwd = tempfile.mkdtemp(suffix='.morituri.cache')
+ self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
self.command = ['cdparanoia', '-A']
if device:
self.command += ['-d', device]
diff --git a/morituri/program/cdrdao.py b/whipper/program/cdrdao.py
similarity index 96%
rename from morituri/program/cdrdao.py
rename to whipper/program/cdrdao.py
index 682d1a6d..037588fa 100644
--- a/morituri/program/cdrdao.py
+++ b/whipper/program/cdrdao.py
@@ -3,8 +3,8 @@
import tempfile
from subprocess import Popen, PIPE
-from morituri.common.common import EjectError
-from morituri.image.toc import TocFile
+from whipper.common.common import EjectError
+from whipper.image.toc import TocFile
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/program/flac.py b/whipper/program/flac.py
similarity index 89%
rename from morituri/program/flac.py
rename to whipper/program/flac.py
index d83162b3..1db961d2 100644
--- a/morituri/program/flac.py
+++ b/whipper/program/flac.py
@@ -6,7 +6,7 @@
def encode(infile, outfile):
"""
Encodes infile to outfile, with flac.
- Uses '-f' because morituri already creates the file.
+ Uses '-f' because whipper already creates the file.
"""
try:
# TODO: Replace with Popen so that we can catch stderr and write it to
diff --git a/morituri/program/sox.py b/whipper/program/sox.py
similarity index 100%
rename from morituri/program/sox.py
rename to whipper/program/sox.py
diff --git a/morituri/program/soxi.py b/whipper/program/soxi.py
similarity index 93%
rename from morituri/program/soxi.py
rename to whipper/program/soxi.py
index 36fb03a7..650e1443 100644
--- a/morituri/program/soxi.py
+++ b/whipper/program/soxi.py
@@ -1,7 +1,7 @@
import os
-from morituri.common import common
-from morituri.common import task as ctask
+from whipper.common import common
+from whipper.common import task as ctask
import logging
logger = logging.getLogger(__name__)
diff --git a/morituri/program/utils.py b/whipper/program/utils.py
similarity index 100%
rename from morituri/program/utils.py
rename to whipper/program/utils.py
diff --git a/morituri/result/__init__.py b/whipper/result/__init__.py
similarity index 100%
rename from morituri/result/__init__.py
rename to whipper/result/__init__.py
diff --git a/morituri/result/logger.py b/whipper/result/logger.py
similarity index 98%
rename from morituri/result/logger.py
rename to whipper/result/logger.py
index fbd3505b..9adfebf3 100644
--- a/morituri/result/logger.py
+++ b/whipper/result/logger.py
@@ -1,13 +1,13 @@
import time
import hashlib
-import morituri
+import whipper
-from morituri.common import common
-from morituri.result import result
+from whipper.common import common
+from whipper.result import result
-class MorituriLogger(result.Logger):
+class WhipperLogger(result.Logger):
_accuratelyRipped = 0
_inARDatabase = 0
@@ -26,7 +26,7 @@ def logRip(self, ripResult, epoch):
# Ripper version
lines.append("Log created by: whipper %s (internal logger)" %
- morituri.__version__)
+ whipper.__version__)
# Rip date
date = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime(epoch)).strip()
diff --git a/morituri/result/result.py b/whipper/result/result.py
similarity index 86%
rename from morituri/result/result.py
rename to whipper/result/result.py
index 52e5f47a..0c128744 100644
--- a/morituri/result/result.py
+++ b/whipper/result/result.py
@@ -1,24 +1,22 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_result_result -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_result_result -*-
# vi:si:et:sw=4:sts=4:ts=4
-# Morituri - for those about to RIP
-
# Copyright (C) 2009 Thomas Vander Stichele
-# This file is part of morituri.
+# This file is part of whipper.
#
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with morituri. If not, see .
+# along with whipper. If not, see .
import pkg_resources
import time
@@ -83,7 +81,7 @@ class RipResult:
@ivar offset: sample read offset
@ivar table: the full index table
- @type table: L{morituri.image.table.Table}
+ @type table: L{whipper.image.table.Table}
@ivar vendor: vendor of the CD drive
@ivar model: model of the CD drive
@@ -149,22 +147,22 @@ def log(self, ripResult, epoch=time.time()):
class EntryPoint(object):
- name = 'morituri'
+ name = 'whipper'
def load(self):
- from morituri.result import logger
- return logger.MorituriLogger
+ from whipper.result import logger
+ return logger.WhipperLogger
def getLoggers():
"""
- Get all logger plugins with entry point 'morituri.logger'.
+ Get all logger plugins with entry point 'whipper.logger'.
@rtype: dict of C{str} -> C{Logger}
"""
d = {}
- pluggables = list(pkg_resources.iter_entry_points("morituri.logger"))
+ pluggables = list(pkg_resources.iter_entry_points("whipper.logger"))
for entrypoint in [EntryPoint(), ] + pluggables:
plugin_class = entrypoint.load()
d[entrypoint.name] = plugin_class
diff --git a/morituri/test/__init__.py b/whipper/test/__init__.py
similarity index 100%
rename from morituri/test/__init__.py
rename to whipper/test/__init__.py
diff --git a/morituri/test/bloc.cue b/whipper/test/bloc.cue
similarity index 96%
rename from morituri/test/bloc.cue
rename to whipper/test/bloc.cue
index c1be8a61..16d08edc 100644
--- a/morituri/test/bloc.cue
+++ b/whipper/test/bloc.cue
@@ -1,5 +1,5 @@
REM DISCID AD0BE00D
-REM COMMENT "morituri 0.5.1"
+REM COMMENT "whipper 0.5.1"
FILE "data.wav" WAVE
TRACK 01 AUDIO
PREGAP 03:22:70
diff --git a/morituri/test/bloc.toc b/whipper/test/bloc.toc
similarity index 100%
rename from morituri/test/bloc.toc
rename to whipper/test/bloc.toc
diff --git a/morituri/test/breeders.cue b/whipper/test/breeders.cue
similarity index 97%
rename from morituri/test/breeders.cue
rename to whipper/test/breeders.cue
index 4b3e358c..e55a56de 100644
--- a/morituri/test/breeders.cue
+++ b/whipper/test/breeders.cue
@@ -1,5 +1,5 @@
REM DISCID BE08990D
-REM COMMENT "morituri 0.5.1"
+REM COMMENT "whipper 0.5.1"
CATALOG 0652637280326
PERFORMER "THE BREEDERS"
TITLE "MOUNTAIN BATTLES"
diff --git a/morituri/test/breeders.toc b/whipper/test/breeders.toc
similarity index 100%
rename from morituri/test/breeders.toc
rename to whipper/test/breeders.toc
diff --git a/whipper/test/cache/result/fe105a11.pickle b/whipper/test/cache/result/fe105a11.pickle
new file mode 100644
index 00000000..e2a3a058
--- /dev/null
+++ b/whipper/test/cache/result/fe105a11.pickle
@@ -0,0 +1,903 @@
+(iwhipper.result.result
+RipResult
+p1
+(dp2
+S'vendor'
+p3
+S'PLEXTOR '
+p4
+sS'artist'
+p5
+S"Destiny's Child"
+p6
+sS'title'
+p7
+S"The Writing's on the Wall"
+p8
+sS'tracks'
+p9
+(lp10
+(iwhipper.result.result
+TrackResult
+p11
+(dp12
+S'testcrc'
+p13
+I938873735
+sS'quality'
+p14
+F1
+sS'number'
+p15
+I1
+sS'filename'
+p16
+Vwhipper/Destiny's Child - The Writing's on the Wall/01. Destiny's Child - Intro (The Writing's on the Wall).flac
+p17
+sS'peak'
+p18
+F0.988555908203125
+sS'pregap'
+p19
+I0
+sS'copycrc'
+p20
+I938873735
+sba(iwhipper.result.result
+TrackResult
+p21
+(dp22
+g13
+I764981533
+sg14
+F1
+sg15
+I2
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/02. Destiny's Child - So Good.flac
+p23
+sg18
+F0.988555908203125
+sg19
+I0
+sg20
+I764981533
+sba(iwhipper.result.result
+TrackResult
+p24
+(dp25
+g13
+I4263524715
+sg14
+F1
+sg15
+I3
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/03. Destiny's Child - Bills, Bills, Bills.flac
+p26
+sg18
+F0.988555908203125
+sg19
+I0
+sg20
+I4263524715
+sba(iwhipper.result.result
+TrackResult
+p27
+(dp28
+g13
+I30436888
+sg14
+F1
+sg15
+I4
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/04. Destiny's Child - Confessions (feat. Missy Elliott).flac
+p29
+sg18
+F0.9322509765625
+sg19
+I0
+sg20
+I30436888
+sba(iwhipper.result.result
+TrackResult
+p30
+(dp31
+g13
+I1780180644
+sg14
+F1
+sg15
+I5
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/05. Destiny's Child - Bug a Boo.flac
+p32
+sg18
+F0.988555908203125
+sg19
+I0
+sg20
+I1780180644
+sba(iwhipper.result.result
+TrackResult
+p33
+(dp34
+g13
+I2209417071
+sg14
+F1
+sg15
+I6
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/06. Destiny's Child - Temptation.flac
+p35
+sg18
+F0.988555908203125
+sg19
+I0
+sg20
+I2209417071
+sba(iwhipper.result.result
+TrackResult
+p36
+(dp37
+g13
+I3797794701
+sg14
+F1
+sg15
+I7
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/07. Destiny's Child - Now That She's Gone.flac
+p38
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I3797794701
+sba(iwhipper.result.result
+TrackResult
+p39
+(dp40
+g13
+I3950896430
+sg14
+F1
+sg15
+I8
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/08. Destiny's Child - Where'd You Go.flac
+p41
+sg18
+F0.987518310546875
+sg19
+I0
+sg20
+I3950896430
+sba(iwhipper.result.result
+TrackResult
+p42
+(dp43
+g13
+I1794899732
+sg14
+F1
+sg15
+I9
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/09. Destiny's Child - Hey Ladies.flac
+p44
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I1794899732
+sba(iwhipper.result.result
+TrackResult
+p45
+(dp46
+g13
+I1955082442
+sg14
+F1
+sg15
+I10
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/10. Destiny's Child - If You Leave (feat. Next).flac
+p47
+sg18
+F0.987518310546875
+sg19
+I0
+sg20
+I1955082442
+sba(iwhipper.result.result
+TrackResult
+p48
+(dp49
+g13
+I1068452097
+sg14
+F1
+sg15
+I11
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/11. Destiny's Child - Jumpin', Jumpin'.flac
+p50
+sg18
+F0.987518310546875
+sg19
+I0
+sg20
+I1068452097
+sba(iwhipper.result.result
+TrackResult
+p51
+(dp52
+g13
+I745616805
+sg14
+F1
+sg15
+I12
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/12. Destiny's Child - Say My Name.flac
+p53
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I745616805
+sba(iwhipper.result.result
+TrackResult
+p54
+(dp55
+g13
+I4044254516
+sg14
+F1
+sg15
+I13
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/13. Destiny's Child - She Can't Love You.flac
+p56
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I4044254516
+sba(iwhipper.result.result
+TrackResult
+p57
+(dp58
+g13
+I1397142025
+sg14
+F1
+sg15
+I14
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/14. Destiny's Child - Stay.flac
+p59
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I1397142025
+sba(iwhipper.result.result
+TrackResult
+p60
+(dp61
+g13
+I379991554
+sg14
+F1
+sg15
+I15
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/15. Destiny's Child - Sweet Sixteen.flac
+p62
+sg18
+F0.98748779296875
+sg19
+I0
+sg20
+I379991554
+sba(iwhipper.result.result
+TrackResult
+p63
+(dp64
+g13
+I554404073
+sg14
+F1
+sg15
+I16
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/16. Destiny's Child - Outro (Amazing Grace... Dedicated to Andretta Tillman).flac
+p65
+sg18
+F0.987396240234375
+sg19
+I0
+sg20
+I554404073
+sba(iwhipper.result.result
+TrackResult
+p66
+(dp67
+g13
+I1166447811
+sg14
+F1
+sg15
+I17
+sg16
+Vwhipper/Destiny's Child - The Writing's on the Wall/17. Destiny's Child - Get on the Bus.flac
+p68
+sg18
+F0.988494873046875
+sg19
+I0
+sg20
+I1166447811
+sbasS'offset'
+p69
+I48
+sS'table'
+p70
+ccopy_reg
+_reconstructor
+p71
+(cwhipper.image.table
+Table
+p72
+c__builtin__
+object
+p73
+NtRp74
+(dp75
+S'catalog'
+p76
+V5099749439429
+p77
+sg9
+(lp78
+(iwhipper.image.table
+Track
+p79
+(dp80
+S'isrc'
+p81
+VUSSM19901053
+p82
+sS'audio'
+p83
+I01
+sg15
+I1
+sS'cdtext'
+p84
+(dp85
+sS'indexes'
+p86
+(dp87
+I1
+(iwhipper.image.table
+Index
+p88
+(dp89
+S'relative'
+p90
+I0
+sS'path'
+p91
+g17
+sS'counter'
+p92
+I1
+sg15
+I1
+sS'absolute'
+p93
+I0
+sbssba(iwhipper.image.table
+Track
+p94
+(dp95
+g81
+VUSSM19901043
+p96
+sg83
+I01
+sg15
+I2
+sg84
+(dp97
+sg86
+(dp98
+I1
+(iwhipper.image.table
+Index
+p99
+(dp100
+g90
+I0
+sg91
+g23
+sg92
+I2
+sg15
+I1
+sg93
+I9435
+sbssba(iwhipper.image.table
+Track
+p101
+(dp102
+g81
+VUSSM19900561
+p103
+sg83
+I01
+sg15
+I3
+sg84
+(dp104
+sg86
+(dp105
+I1
+(iwhipper.image.table
+Index
+p106
+(dp107
+g90
+I0
+sg91
+g26
+sg92
+I3
+sg15
+I1
+sg93
+I23980
+sbssba(iwhipper.image.table
+Track
+p108
+(dp109
+g81
+VUSSM19901050
+p110
+sg83
+I01
+sg15
+I4
+sg84
+(dp111
+sg86
+(dp112
+I1
+(iwhipper.image.table
+Index
+p113
+(dp114
+g90
+I0
+sg91
+g29
+sg92
+I4
+sg15
+I1
+sg93
+I43182
+sbssba(iwhipper.image.table
+Track
+p115
+(dp116
+g81
+VUSSM19901045
+p117
+sg83
+I01
+sg15
+I5
+sg84
+(dp118
+sg86
+(dp119
+I1
+(iwhipper.image.table
+Index
+p120
+(dp121
+g90
+I0
+sg91
+g32
+sg92
+I5
+sg15
+I1
+sg93
+I65482
+sbssba(iwhipper.image.table
+Track
+p122
+(dp123
+g81
+VUSSM19901046
+p124
+sg83
+I01
+sg15
+I6
+sg84
+(dp125
+sg86
+(dp126
+I1
+(iwhipper.image.table
+Index
+p127
+(dp128
+g90
+I0
+sg91
+g35
+sg92
+I6
+sg15
+I1
+sg93
+I81415
+sbssba(iwhipper.image.table
+Track
+p129
+(dp130
+g81
+VUSSM19901049
+p131
+sg83
+I01
+sg15
+I7
+sg84
+(dp132
+sg86
+(dp133
+I1
+(iwhipper.image.table
+Index
+p134
+(dp135
+g90
+I0
+sg91
+g38
+sg92
+I7
+sg15
+I1
+sg93
+I99835
+sbssba(iwhipper.image.table
+Track
+p136
+(dp137
+g81
+VUSSM19901048
+p138
+sg83
+I01
+sg15
+I8
+sg84
+(dp139
+sg86
+(dp140
+I1
+(iwhipper.image.table
+Index
+p141
+(dp142
+g90
+I0
+sg91
+g41
+sg92
+I8
+sg15
+I1
+sg93
+I124995
+sbssba(iwhipper.image.table
+Track
+p143
+(dp144
+g81
+VUSSM19901044
+p145
+sg83
+I01
+sg15
+I9
+sg84
+(dp146
+sg86
+(dp147
+I1
+(iwhipper.image.table
+Index
+p148
+(dp149
+g90
+I0
+sg91
+g44
+sg92
+I9
+sg15
+I1
+sg93
+I144140
+sbssba(iwhipper.image.table
+Track
+p150
+(dp151
+g81
+VUSSM19901055
+p152
+sg83
+I01
+sg15
+I10
+sg84
+(dp153
+sg86
+(dp154
+I1
+(iwhipper.image.table
+Index
+p155
+(dp156
+g90
+I0
+sg91
+g47
+sg92
+I10
+sg15
+I1
+sg93
+I163335
+sbssba(iwhipper.image.table
+Track
+p157
+(dp158
+g81
+VUSSM19901054
+p159
+sg83
+I01
+sg15
+I11
+sg84
+(dp160
+sg86
+(dp161
+I1
+(iwhipper.image.table
+Index
+p162
+(dp163
+g90
+I0
+sg91
+g50
+sg92
+I11
+sg15
+I1
+sg93
+I183972
+sbssba(iwhipper.image.table
+Track
+p164
+(dp165
+g81
+VUSSM19901056
+p166
+sg83
+I01
+sg15
+I12
+sg84
+(dp167
+sg86
+(dp168
+I1
+(iwhipper.image.table
+Index
+p169
+(dp170
+g90
+I0
+sg91
+g53
+sg92
+I12
+sg15
+I1
+sg93
+I201237
+sbssba(iwhipper.image.table
+Track
+p171
+(dp172
+g81
+VUSSM19901056
+p173
+sg83
+I01
+sg15
+I13
+sg84
+(dp174
+sg86
+(dp175
+I1
+(iwhipper.image.table
+Index
+p176
+(dp177
+g90
+I0
+sg91
+g56
+sg92
+I13
+sg15
+I1
+sg93
+I221587
+sbssba(iwhipper.image.table
+Track
+p178
+(dp179
+g81
+VUSSM19901051
+p180
+sg83
+I01
+sg15
+I14
+sg84
+(dp181
+sg86
+(dp182
+I1
+(iwhipper.image.table
+Index
+p183
+(dp184
+g90
+I0
+sg91
+g59
+sg92
+I14
+sg15
+I1
+sg93
+I239952
+sbssba(iwhipper.image.table
+Track
+p185
+(dp186
+g81
+VUSSM19901047
+p187
+sg83
+I01
+sg15
+I15
+sg84
+(dp188
+sg86
+(dp189
+I1
+(iwhipper.image.table
+Index
+p190
+(dp191
+g90
+I0
+sg91
+g62
+sg92
+I15
+sg15
+I1
+sg93
+I261795
+sbssba(iwhipper.image.table
+Track
+p192
+(dp193
+g81
+VUSSM19901052
+p194
+sg83
+I01
+sg15
+I16
+sg84
+(dp195
+sg86
+(dp196
+I1
+(iwhipper.image.table
+Index
+p197
+(dp198
+g90
+I0
+sg91
+g65
+sg92
+I16
+sg15
+I1
+sg93
+I280750
+sbssba(iwhipper.image.table
+Track
+p199
+(dp200
+g83
+I01
+sg15
+I17
+sg84
+(dp201
+sg86
+(dp202
+I1
+(iwhipper.image.table
+Index
+p203
+(dp204
+g90
+I0
+sg91
+g68
+sg92
+I17
+sg15
+I1
+sg93
+I292627
+sbssbasS'logName'
+p205
+S'Table 0x023B9D90'
+p206
+sg84
+(dp207
+sS'instanceVersion'
+p208
+I2
+sS'leadout'
+p209
+I313955
+sbsS'model'
+p210
+S'DVDR PX-810SA '
+p211
+sb.
diff --git a/morituri/test/capital.1.toc b/whipper/test/capital.1.toc
similarity index 100%
rename from morituri/test/capital.1.toc
rename to whipper/test/capital.1.toc
diff --git a/morituri/test/capital.2.toc b/whipper/test/capital.2.toc
similarity index 100%
rename from morituri/test/capital.2.toc
rename to whipper/test/capital.2.toc
diff --git a/morituri/test/capital.fast.toc b/whipper/test/capital.fast.toc
similarity index 100%
rename from morituri/test/capital.fast.toc
rename to whipper/test/capital.fast.toc
diff --git a/morituri/test/cdparanoia.progress b/whipper/test/cdparanoia.progress
similarity index 100%
rename from morituri/test/cdparanoia.progress
rename to whipper/test/cdparanoia.progress
diff --git a/morituri/test/cdparanoia.progress.error b/whipper/test/cdparanoia.progress.error
similarity index 100%
rename from morituri/test/cdparanoia.progress.error
rename to whipper/test/cdparanoia.progress.error
diff --git a/morituri/test/cdparanoia.progress.strokes b/whipper/test/cdparanoia.progress.strokes
similarity index 100%
rename from morituri/test/cdparanoia.progress.strokes
rename to whipper/test/cdparanoia.progress.strokes
diff --git a/morituri/test/cdparanoia/MATSHITA.cdparanoia-A.log b/whipper/test/cdparanoia/MATSHITA.cdparanoia-A.log
similarity index 100%
rename from morituri/test/cdparanoia/MATSHITA.cdparanoia-A.log
rename to whipper/test/cdparanoia/MATSHITA.cdparanoia-A.log
diff --git a/morituri/test/cdparanoia/MATSHITA.cdparanoia-A.stderr b/whipper/test/cdparanoia/MATSHITA.cdparanoia-A.stderr
similarity index 100%
rename from morituri/test/cdparanoia/MATSHITA.cdparanoia-A.stderr
rename to whipper/test/cdparanoia/MATSHITA.cdparanoia-A.stderr
diff --git a/morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.log b/whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.log
similarity index 100%
rename from morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.log
rename to whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.log
diff --git a/morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr b/whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr
similarity index 100%
rename from morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr
rename to whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr
diff --git a/morituri/test/cdrdao.readtoc.progress b/whipper/test/cdrdao.readtoc.progress
similarity index 100%
rename from morituri/test/cdrdao.readtoc.progress
rename to whipper/test/cdrdao.readtoc.progress
diff --git a/morituri/test/common.py b/whipper/test/common.py
similarity index 92%
rename from morituri/test/common.py
rename to whipper/test/common.py
index 9eba5a61..fb0833f0 100644
--- a/morituri/test/common.py
+++ b/whipper/test/common.py
@@ -5,7 +5,7 @@
import os
import sys
-import morituri
+import whipper
# twisted's unittests have skip support, standard unittest don't
from twisted.trial import unittest
@@ -70,8 +70,8 @@ def readCue(self, name):
ret = open(os.path.join(os.path.dirname(__file__), name)).read(
).decode('utf-8')
ret = re.sub(
- 'REM COMMENT "Morituri.*',
- 'REM COMMENT "Morituri %s"' % (morituri.__version__),
+ 'REM COMMENT "whipper.*',
+ 'REM COMMENT "whipper %s"' % (whipper.__version__),
ret, re.MULTILINE)
return ret
@@ -80,7 +80,7 @@ class UnicodeTestMixin:
# A helper mixin to skip tests if we're not in a UTF-8 locale
try:
- os.stat(u'morituri.test.B\xeate Noire.empty')
+ os.stat(u'whipper.test.B\xeate Noire.empty')
except UnicodeEncodeError:
skip = 'No UTF-8 locale'
except OSError:
diff --git a/morituri/test/cure.cue b/whipper/test/cure.cue
similarity index 97%
rename from morituri/test/cure.cue
rename to whipper/test/cure.cue
index ad2395aa..c31af3c8 100644
--- a/morituri/test/cure.cue
+++ b/whipper/test/cure.cue
@@ -1,5 +1,5 @@
REM DISCID B90C650D
-REM COMMENT "morituri 0.5.1"
+REM COMMENT "whipper 0.5.1"
CATALOG 0602517642256
FILE "data.wav" WAVE
TRACK 01 AUDIO
diff --git a/morituri/test/cure.toc b/whipper/test/cure.toc
similarity index 100%
rename from morituri/test/cure.toc
rename to whipper/test/cure.toc
diff --git a/morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin b/whipper/test/dBAR-011-0010e284-009228a3-9809ff0b.bin
similarity index 100%
rename from morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin
rename to whipper/test/dBAR-011-0010e284-009228a3-9809ff0b.bin
diff --git a/morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin b/whipper/test/dBAR-020-002e5023-029d8e49-040eaa14.bin
similarity index 100%
rename from morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin
rename to whipper/test/dBAR-020-002e5023-029d8e49-040eaa14.bin
diff --git a/morituri/test/jose.toc b/whipper/test/jose.toc
similarity index 100%
rename from morituri/test/jose.toc
rename to whipper/test/jose.toc
diff --git a/morituri/test/kanye.cue b/whipper/test/kanye.cue
similarity index 100%
rename from morituri/test/kanye.cue
rename to whipper/test/kanye.cue
diff --git a/morituri/test/kings-separate.cue b/whipper/test/kings-separate.cue
similarity index 100%
rename from morituri/test/kings-separate.cue
rename to whipper/test/kings-separate.cue
diff --git a/morituri/test/kings-single.cue b/whipper/test/kings-single.cue
similarity index 100%
rename from morituri/test/kings-single.cue
rename to whipper/test/kings-single.cue
diff --git a/morituri/test/ladyhawke.toc b/whipper/test/ladyhawke.toc
similarity index 100%
rename from morituri/test/ladyhawke.toc
rename to whipper/test/ladyhawke.toc
diff --git a/morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml b/whipper/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml
similarity index 100%
rename from morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml
rename to whipper/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml
diff --git a/morituri/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml b/whipper/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml
similarity index 100%
rename from morituri/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml
rename to whipper/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml
diff --git a/morituri/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml b/whipper/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml
similarity index 100%
rename from morituri/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml
rename to whipper/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml
diff --git a/morituri/test/silentalarm.result.pickle b/whipper/test/silentalarm.result.pickle
similarity index 90%
rename from morituri/test/silentalarm.result.pickle
rename to whipper/test/silentalarm.result.pickle
index 5a0e6b13..9ab6db62 100644
--- a/morituri/test/silentalarm.result.pickle
+++ b/whipper/test/silentalarm.result.pickle
@@ -1,5 +1,5 @@
(lp0
-(imorituri.result.result
+(iwhipper.result.result
TrackResult
p1
(dp2
@@ -22,7 +22,7 @@ sS'filename'
p8
V/home/thomas/Bloc Party - Silent Alarm/00. Bloc Party - Hidden Track One Audio.flac
p9
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p10
(dp11
@@ -57,7 +57,7 @@ p18
I15220
sg5
L1476997036L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p19
(dp20
@@ -86,7 +86,7 @@ sg18
I0
sg5
L2118180996L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p22
(dp23
@@ -115,7 +115,7 @@ sg18
I0
sg5
L2397618238L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p25
(dp26
@@ -144,7 +144,7 @@ sg18
I0
sg5
L1340624205L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p28
(dp29
@@ -173,7 +173,7 @@ sg18
I72
sg5
L183201985L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p31
(dp32
@@ -202,7 +202,7 @@ sg18
I41
sg5
L221401921L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p34
(dp35
@@ -231,7 +231,7 @@ sg18
I17
sg5
L3133726276L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p37
(dp38
@@ -260,7 +260,7 @@ sg18
I4
sg5
L2318646110L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p40
(dp41
@@ -289,7 +289,7 @@ sg18
I11
sg5
L3145161267L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p43
(dp44
@@ -318,7 +318,7 @@ sg18
I0
sg5
L3022257630L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p46
(dp47
@@ -347,7 +347,7 @@ sg18
I43
sg5
L2011827324L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p49
(dp50
@@ -376,7 +376,7 @@ sg18
I116
sg5
L933582879L
-sba(imorituri.result.result
+sba(iwhipper.result.result
TrackResult
p52
(dp53
diff --git a/morituri/test/strokes-someday.eac.cue b/whipper/test/strokes-someday.eac.cue
similarity index 100%
rename from morituri/test/strokes-someday.eac.cue
rename to whipper/test/strokes-someday.eac.cue
diff --git a/morituri/test/strokes-someday.toc b/whipper/test/strokes-someday.toc
similarity index 100%
rename from morituri/test/strokes-someday.toc
rename to whipper/test/strokes-someday.toc
diff --git a/morituri/test/surferrosa.eac.corrected.cue b/whipper/test/surferrosa.eac.corrected.cue
similarity index 100%
rename from morituri/test/surferrosa.eac.corrected.cue
rename to whipper/test/surferrosa.eac.corrected.cue
diff --git a/morituri/test/surferrosa.eac.currentgap.cue b/whipper/test/surferrosa.eac.currentgap.cue
similarity index 100%
rename from morituri/test/surferrosa.eac.currentgap.cue
rename to whipper/test/surferrosa.eac.currentgap.cue
diff --git a/morituri/test/surferrosa.eac.leftout.cue b/whipper/test/surferrosa.eac.leftout.cue
similarity index 100%
rename from morituri/test/surferrosa.eac.leftout.cue
rename to whipper/test/surferrosa.eac.leftout.cue
diff --git a/morituri/test/surferrosa.eac.noncompliant.cue b/whipper/test/surferrosa.eac.noncompliant.cue
similarity index 100%
rename from morituri/test/surferrosa.eac.noncompliant.cue
rename to whipper/test/surferrosa.eac.noncompliant.cue
diff --git a/morituri/test/surferrosa.eac.single.cue b/whipper/test/surferrosa.eac.single.cue
similarity index 100%
rename from morituri/test/surferrosa.eac.single.cue
rename to whipper/test/surferrosa.eac.single.cue
diff --git a/morituri/test/surferrosa.toc b/whipper/test/surferrosa.toc
similarity index 100%
rename from morituri/test/surferrosa.toc
rename to whipper/test/surferrosa.toc
diff --git a/morituri/test/test_common_accurip.py b/whipper/test/test_common_accurip.py
similarity index 84%
rename from morituri/test/test_common_accurip.py
rename to whipper/test/test_common_accurip.py
index e5e957dd..a61daaef 100644
--- a/morituri/test/test_common_accurip.py
+++ b/whipper/test/test_common_accurip.py
@@ -1,11 +1,11 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_accurip -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_accurip -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
-from morituri.common import accurip
+from whipper.common import accurip
-from morituri.test import common as tcommon
+from whipper.test import common as tcommon
class AccurateRipResponseTestCase(tcommon.TestCase):
diff --git a/morituri/test/test_common_cache.py b/whipper/test/test_common_cache.py
similarity index 76%
rename from morituri/test/test_common_cache.py
rename to whipper/test/test_common_cache.py
index 55460a5b..e0a7d23b 100644
--- a/morituri/test/test_common_cache.py
+++ b/whipper/test/test_common_cache.py
@@ -1,11 +1,11 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_cache -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_cache -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
-from morituri.common import cache
+from whipper.common import cache
-from morituri.test import common as tcommon
+from whipper.test import common as tcommon
class ResultCacheTestCase(tcommon.TestCase):
diff --git a/morituri/test/test_common_common.py b/whipper/test/test_common_common.py
similarity index 89%
rename from morituri/test/test_common_common.py
rename to whipper/test/test_common_common.py
index de9e8a43..91fc6680 100644
--- a/morituri/test/test_common_common.py
+++ b/whipper/test/test_common_common.py
@@ -1,18 +1,18 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_common -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_common -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
import tempfile
-from morituri.common import common
+from whipper.common import common
-from morituri.test import common as tcommon
+from whipper.test import common as tcommon
class ShrinkTestCase(tcommon.TestCase):
def testSufjan(self):
- path = (u'morituri/Sufjan Stevens - Illinois/02. Sufjan Stevens - '
+ path = (u'whipper/Sufjan Stevens - Illinois/02. Sufjan Stevens - '
'The Black Hawk War, or, How to Demolish an Entire '
'Civilization and Still Feel Good About Yourself in the '
'Morning, or, We Apologize for the Inconvenience but '
diff --git a/morituri/test/test_common_config.py b/whipper/test/test_common_config.py
similarity index 90%
rename from morituri/test/test_common_config.py
rename to whipper/test/test_common_config.py
index a90f8a17..0a0d3849 100644
--- a/morituri/test/test_common_config.py
+++ b/whipper/test/test_common_config.py
@@ -1,18 +1,18 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_config -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_config -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
import tempfile
-from morituri.common import config
+from whipper.common import config
-from morituri.test import common as tcommon
+from whipper.test import common as tcommon
class ConfigTestCase(tcommon.TestCase):
def setUp(self):
- fd, self._path = tempfile.mkstemp(suffix=u'.morituri.test.config')
+ fd, self._path = tempfile.mkstemp(suffix=u'.whipper.test.config')
os.close(fd)
self._config = config.Config(self._path)
diff --git a/morituri/test/test_common_directory.py b/whipper/test/test_common_directory.py
similarity index 65%
rename from morituri/test/test_common_directory.py
rename to whipper/test/test_common_directory.py
index 3629115e..c5a9dcf8 100644
--- a/morituri/test/test_common_directory.py
+++ b/whipper/test/test_common_directory.py
@@ -1,9 +1,9 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_directory -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_directory -*-
# vi:si:et:sw=4:sts=4:ts=4
-from morituri.common import directory
+from whipper.common import directory
-from morituri.test import common
+from whipper.test import common
class DirectoryTestCase(common.TestCase):
diff --git a/morituri/test/test_common_drive.py b/whipper/test/test_common_drive.py
similarity index 68%
rename from morituri/test/test_common_drive.py
rename to whipper/test/test_common_drive.py
index 4732742c..e3d13c49 100644
--- a/morituri/test/test_common_drive.py
+++ b/whipper/test/test_common_drive.py
@@ -1,8 +1,8 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_drive -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_drive -*-
# vi:si:et:sw=4:sts=4:ts=4
-from morituri.test import common
-from morituri.common import drive
+from whipper.test import common
+from whipper.common import drive
class ListifyTestCase(common.TestCase):
diff --git a/morituri/test/test_common_mbngs.py b/whipper/test/test_common_mbngs.py
similarity index 90%
rename from morituri/test/test_common_mbngs.py
rename to whipper/test/test_common_mbngs.py
index 6777bccd..5127c38d 100644
--- a/morituri/test/test_common_mbngs.py
+++ b/whipper/test/test_common_mbngs.py
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_mbngs -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_mbngs -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
@@ -6,7 +6,7 @@
import unittest
-from morituri.common import mbngs
+from whipper.common import mbngs
class MetadataTestCase(unittest.TestCase):
@@ -14,7 +14,7 @@ class MetadataTestCase(unittest.TestCase):
# Generated with rip -R cd info
def testJeffEverybodySingle(self):
path = os.path.join(os.path.dirname(__file__),
- 'morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json')
+ 'whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json')
handle = open(path, "rb")
response = json.loads(handle.read())
handle.close()
@@ -27,7 +27,7 @@ def testJeffEverybodySingle(self):
def test2MeterSessies10(self):
# various artists, multiple artists per track
path = os.path.join(os.path.dirname(__file__),
- 'morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json')
+ 'whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json')
handle = open(path, "rb")
response = json.loads(handle.read())
handle.close()
@@ -55,7 +55,7 @@ def test2MeterSessies10(self):
def testBalladOfTheBrokenSeas(self):
# various artists disc
path = os.path.join(os.path.dirname(__file__),
- 'morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json')
+ 'whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json')
handle = open(path, "rb")
response = json.loads(handle.read())
handle.close()
@@ -88,7 +88,7 @@ def testMalaInCuba(self):
# single artist disc, but with multiple artists tracks
# see https://github.com/thomasvs/morituri/issues/19
path = os.path.join(os.path.dirname(__file__),
- 'morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json')
+ 'whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json')
handle = open(path, "rb")
response = json.loads(handle.read())
handle.close()
diff --git a/morituri/test/test_common_path.py b/whipper/test/test_common_path.py
similarity index 85%
rename from morituri/test/test_common_path.py
rename to whipper/test/test_common_path.py
index 84a66d3d..bf7a5529 100644
--- a/morituri/test/test_common_path.py
+++ b/whipper/test/test_common_path.py
@@ -1,9 +1,9 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_path -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_path -*-
# vi:si:et:sw=4:sts=4:ts=4
-from morituri.common import path
+from whipper.common import path
-from morituri.test import common
+from whipper.test import common
class FilterTestCase(common.TestCase):
diff --git a/morituri/test/test_common_program.py b/whipper/test/test_common_program.py
similarity index 94%
rename from morituri/test/test_common_program.py
rename to whipper/test/test_common_program.py
index 0cc4601a..fd2eef18 100644
--- a/morituri/test/test_common_program.py
+++ b/whipper/test/test_common_program.py
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_common_program -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_common_program -*-
# vi:si:et:sw=4:sts=4:ts=4
@@ -7,9 +7,9 @@
import unittest
-from morituri.result import result
-from morituri.common import program, accurip, mbngs, config
-from morituri.command.cd import DEFAULT_DISC_TEMPLATE
+from whipper.result import result
+from whipper.common import program, accurip, mbngs, config
+from whipper.command.cd import DEFAULT_DISC_TEMPLATE
class TrackImageVerifyTestCase(unittest.TestCase):
diff --git a/morituri/test/test_common_renamer.py b/whipper/test/test_common_renamer.py
similarity index 90%
rename from morituri/test/test_common_renamer.py
rename to whipper/test/test_common_renamer.py
index 795d8d20..b99f48aa 100644
--- a/morituri/test/test_common_renamer.py
+++ b/whipper/test/test_common_renamer.py
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
@@ -6,13 +6,13 @@
import unittest
-from morituri.common import renamer
+from whipper.common import renamer
class RenameInFileTestcase(unittest.TestCase):
def setUp(self):
- (fd, self._path) = tempfile.mkstemp(suffix='.morituri.renamer.infile')
+ (fd, self._path) = tempfile.mkstemp(suffix='.whipper.renamer.infile')
os.write(fd, 'This is a test\nThis is another\n')
os.close(fd)
@@ -42,11 +42,11 @@ def testSerialize(self):
class RenameFileTestcase(unittest.TestCase):
def setUp(self):
- (fd, self._source) = tempfile.mkstemp(suffix='.morituri.renamer.file')
+ (fd, self._source) = tempfile.mkstemp(suffix='.whipper.renamer.file')
os.write(fd, 'This is a test\nThis is another\n')
os.close(fd)
(fd, self._destination) = tempfile.mkstemp(
- suffix='.morituri.renamer.file')
+ suffix='.whipper.renamer.file')
os.close(fd)
os.unlink(self._destination)
self._operation = renamer.RenameFile(self._source, self._destination)
@@ -82,15 +82,15 @@ def testSerialize(self):
class OperatorTestCase(unittest.TestCase):
def setUp(self):
- self._statePath = tempfile.mkdtemp(suffix='.morituri.renamer.operator')
+ self._statePath = tempfile.mkdtemp(suffix='.whipper.renamer.operator')
self._operator = renamer.Operator(self._statePath, 'test')
(fd, self._source) = tempfile.mkstemp(
- suffix='.morituri.renamer.operator')
+ suffix='.whipper.renamer.operator')
os.write(fd, 'This is a test\nThis is another\n')
os.close(fd)
(fd, self._destination) = tempfile.mkstemp(
- suffix='.morituri.renamer.operator')
+ suffix='.whipper.renamer.operator')
os.close(fd)
os.unlink(self._destination)
self._operator.addOperation(
diff --git a/morituri/test/test_image_cue.py b/whipper/test/test_image_cue.py
similarity index 88%
rename from morituri/test/test_image_cue.py
rename to whipper/test/test_image_cue.py
index ba57e851..b30b2c5b 100644
--- a/morituri/test/test_image_cue.py
+++ b/whipper/test/test_image_cue.py
@@ -1,15 +1,15 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
import tempfile
import unittest
-import morituri
+import whipper
-from morituri.image import table, cue
+from whipper.image import table, cue
-from morituri.test import common
+from whipper.test import common
class KingsSingleTestCase(unittest.TestCase):
@@ -59,7 +59,7 @@ def testGetTrackLength(self):
class WriteCueFileTestCase(unittest.TestCase):
def testWrite(self):
- fd, path = tempfile.mkstemp(suffix=u'.morituri.test.cue')
+ fd, path = tempfile.mkstemp(suffix=u'.whipper.test.cue')
os.close(fd)
it = table.Table()
@@ -77,7 +77,7 @@ def testWrite(self):
it.leadout = 3000
common.diffStrings(u"""REM DISCID 0C002802
-REM COMMENT "morituri %s"
+REM COMMENT "whipper %s"
FILE "track01.wav" WAVE
TRACK 01 AUDIO
INDEX 01 00:00:00
@@ -85,5 +85,5 @@ def testWrite(self):
INDEX 00 00:13:25
FILE "track02.wav" WAVE
INDEX 01 00:00:00
-""" % morituri.__version__, it.cue())
+""" % whipper.__version__, it.cue())
os.unlink(path)
diff --git a/morituri/test/test_image_table.py b/whipper/test/test_image_table.py
similarity index 95%
rename from morituri/test/test_image_table.py
rename to whipper/test/test_image_table.py
index b75784ed..c0b0038a 100644
--- a/morituri/test/test_image_table.py
+++ b/whipper/test/test_image_table.py
@@ -1,9 +1,9 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_table -*-
# vi:si:et:sw=4:sts=4:ts=4
-from morituri.image import table
+from whipper.image import table
-from morituri.test import common as tcommon
+from whipper.test import common as tcommon
def h(i):
diff --git a/morituri/test/test_image_toc.py b/whipper/test/test_image_toc.py
similarity index 98%
rename from morituri/test/test_image_toc.py
rename to whipper/test/test_image_toc.py
index 04285d2b..c2f16ba3 100644
--- a/morituri/test/test_image_toc.py
+++ b/whipper/test/test_image_toc.py
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_image_toc -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
@@ -6,9 +6,9 @@
import shutil
import tempfile
-from morituri.image import toc
+from whipper.image import toc
-from morituri.test import common
+from whipper.test import common
class CureTestCase(common.TestCase):
@@ -98,7 +98,7 @@ def testConvertCue(self):
def testGetRealPath(self):
self.assertRaises(KeyError, self.toc.getRealPath, u'track01.wav')
- (fd, path) = tempfile.mkstemp(suffix=u'.morituri.test.wav')
+ (fd, path) = tempfile.mkstemp(suffix=u'.whipper.test.wav')
self.assertEquals(self.toc.getRealPath(path), path)
winpath = path.replace('/', '\\')
diff --git a/morituri/test/test_program_cdparanoia.py b/whipper/test/test_program_cdparanoia.py
similarity index 92%
rename from morituri/test/test_program_cdparanoia.py
rename to whipper/test/test_program_cdparanoia.py
index 6c910b1f..712864f6 100644
--- a/morituri/test/test_program_cdparanoia.py
+++ b/whipper/test/test_program_cdparanoia.py
@@ -1,13 +1,13 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
-from morituri.extern.task import task
+from whipper.extern.task import task
-from morituri.program import cdparanoia
+from whipper.program import cdparanoia
-from morituri.test import common
+from whipper.test import common
class ParseTestCase(common.TestCase):
diff --git a/morituri/test/test_program_cdrdao.py b/whipper/test/test_program_cdrdao.py
similarity index 69%
rename from morituri/test/test_program_cdrdao.py
rename to whipper/test/test_program_cdrdao.py
index eeebb093..07a2e5ce 100644
--- a/morituri/test/test_program_cdrdao.py
+++ b/whipper/test/test_program_cdrdao.py
@@ -1,11 +1,11 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*-
# vi:si:et:sw=4:sts=4:ts=4
import os
-from morituri.program import cdrdao
+from whipper.program import cdrdao
-from morituri.test import common
+from whipper.test import common
# TODO: Current test architecture makes testing cdrdao difficult. Revisit.
diff --git a/morituri/test/test_program_sox.py b/whipper/test/test_program_sox.py
similarity index 63%
rename from morituri/test/test_program_sox.py
rename to whipper/test/test_program_sox.py
index c79cbbc3..a5cd6bb8 100644
--- a/morituri/test/test_program_sox.py
+++ b/whipper/test/test_program_sox.py
@@ -1,9 +1,9 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_program_sox -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_program_sox -*-
import os
-from morituri.program import sox
-from morituri.test import common
+from whipper.program import sox
+from whipper.test import common
class PeakLevelTestCase(common.TestCase):
def setUp(self):
diff --git a/morituri/test/test_program_soxi.py b/whipper/test/test_program_soxi.py
similarity index 79%
rename from morituri/test/test_program_soxi.py
rename to whipper/test/test_program_soxi.py
index ae1e7da0..ac98da47 100644
--- a/morituri/test/test_program_soxi.py
+++ b/whipper/test/test_program_soxi.py
@@ -1,12 +1,12 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_program_sox -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_program_sox -*-
import os
import tempfile
-from morituri.common import common
-from morituri.extern.task import task
-from morituri.program.soxi import AudioLengthTask
-from morituri.test import common as tcommon
+from whipper.common import common
+from whipper.extern.task import task
+from whipper.program.soxi import AudioLengthTask
+from whipper.test import common as tcommon
base_track_file = os.path.join(os.path.dirname(__file__), u'track.flac')
base_track_length = 10 * common.SAMPLES_PER_FRAME
@@ -37,12 +37,12 @@ def _testSuffix(self, suffix):
class NormalAudioLengthPathTestCase(AudioLengthPathTestCase):
def testSingleQuote(self):
- self._testSuffix(u"morituri.test.Guns 'N Roses.flac")
+ self._testSuffix(u"whipper.test.Guns 'N Roses.flac")
def testDoubleQuote(self):
# This test makes sure we can checksum files with double quote in
# their name
- self._testSuffix(u'morituri.test.12" edit.flac')
+ self._testSuffix(u'whipper.test.12" edit.flac')
class UnicodeAudioLengthPathTestCase(AudioLengthPathTestCase,
@@ -50,7 +50,7 @@ class UnicodeAudioLengthPathTestCase(AudioLengthPathTestCase,
def testUnicodePath(self):
# this test makes sure we can checksum a unicode path
- self._testSuffix(u'morituri.test.B\xeate Noire.empty.flac')
+ self._testSuffix(u'whipper.test.B\xeate Noire.empty.flac')
class AbsentFileAudioLengthPathTestCase(AudioLengthPathTestCase):
def testAbsentFile(self):
diff --git a/morituri/test/totbl.fast.toc b/whipper/test/totbl.fast.toc
similarity index 100%
rename from morituri/test/totbl.fast.toc
rename to whipper/test/totbl.fast.toc
diff --git a/morituri/test/track-separate.cue b/whipper/test/track-separate.cue
similarity index 100%
rename from morituri/test/track-separate.cue
rename to whipper/test/track-separate.cue
diff --git a/morituri/test/track-single.cue b/whipper/test/track-single.cue
similarity index 100%
rename from morituri/test/track-single.cue
rename to whipper/test/track-single.cue
diff --git a/morituri/test/track.flac b/whipper/test/track.flac
similarity index 100%
rename from morituri/test/track.flac
rename to whipper/test/track.flac
diff --git a/morituri/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json b/whipper/test/whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json
similarity index 100%
rename from morituri/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json
rename to whipper/test/whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json
diff --git a/morituri/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json b/whipper/test/whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json
similarity index 100%
rename from morituri/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json
rename to whipper/test/whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json
diff --git a/morituri/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json b/whipper/test/whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json
similarity index 100%
rename from morituri/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json
rename to whipper/test/whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json
diff --git a/morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json b/whipper/test/whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json
similarity index 100%
rename from morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json
rename to whipper/test/whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json