From c719d9c0779517b5e477806251b223b957b97a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Wed, 26 Apr 2017 17:09:30 +0200 Subject: [PATCH] Update filenames. Note that the (internal) file names of "whipper/test/cache/result/fe105a11.pickle" did not get updated, since that breaks the tests for some reason. --- doc/.gitignore | 4 ++-- doc/Makefile.am | 12 ++++++------ misc/{morituri-uninstalled => whipper-uninstalled} | 0 whipper/command/offset.py | 2 +- whipper/common/cache.py | 2 +- whipper/common/config.py | 2 +- whipper/common/mbngs.py | 2 +- whipper/common/renamer.py | 2 +- whipper/program/cdparanoia.py | 4 ++-- whipper/test/common.py | 2 +- whipper/test/test_common_common.py | 2 +- whipper/test/test_common_config.py | 2 +- whipper/test/test_common_mbngs.py | 8 ++++---- whipper/test/test_common_renamer.py | 12 ++++++------ whipper/test/test_image_cue.py | 2 +- whipper/test/test_image_toc.py | 2 +- whipper/test/test_program_soxi.py | 6 +++--- ...elease.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json} | 0 ...elease.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json} | 0 ...elease.a76714e0-32b1-4ed4-b28e-f86d99642193.json} | 0 ...elease.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json} | 0 21 files changed, 33 insertions(+), 33 deletions(-) rename misc/{morituri-uninstalled => whipper-uninstalled} (100%) rename whipper/test/{morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json => whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json} (100%) rename whipper/test/{morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json => whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json} (100%) rename whipper/test/{morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json => whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json} (100%) rename whipper/test/{morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json => whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json} (100%) diff --git a/doc/.gitignore b/doc/.gitignore index bdb5ae5..02b1236 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 77a518a..9a31b5d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = morituri.rss2 morituri.ics $(man_MANS) +EXTRA_DIST = whipper.rss2 whipper.ics $(man_MANS) DISTCLEANFILES = $(man_MANS) all-local: feeds reference @@ -12,14 +12,14 @@ reference: 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 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/whipper/command/offset.py b/whipper/command/offset.py index 4a8734f..db47fe1 100644 --- a/whipper/command/offset.py +++ b/whipper/command/offset.py @@ -198,7 +198,7 @@ CD in the AccurateRip database.""" 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/whipper/common/cache.py b/whipper/common/cache.py index 874fc3f..3f07110 100644 --- a/whipper/common/cache.py +++ b/whipper/common/cache.py @@ -81,7 +81,7 @@ class Persister: # 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/whipper/common/config.py b/whipper/common/config.py index f89c3b5..b567932 100644 --- a/whipper/common/config.py +++ b/whipper/common/config.py @@ -51,7 +51,7 @@ class Config: 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/whipper/common/mbngs.py b/whipper/common/mbngs.py index b634146..a5c4e02 100644 --- a/whipper/common/mbngs.py +++ b/whipper/common/mbngs.py @@ -90,7 +90,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/whipper/common/renamer.py b/whipper/common/renamer.py index 177d6e7..042e38a 100644 --- a/whipper/common/renamer.py +++ b/whipper/common/renamer.py @@ -201,7 +201,7 @@ class RenameInFile(Operation): 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/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py index 205e35e..4ca1a29 100644 --- a/whipper/program/cdparanoia.py +++ b/whipper/program/cdparanoia.py @@ -454,7 +454,7 @@ class ReadVerifyTrackTask(task.MultiSeparateTask): 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 @@ -581,7 +581,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/whipper/test/common.py b/whipper/test/common.py index 64931b2..fb0833f 100644 --- a/whipper/test/common.py +++ b/whipper/test/common.py @@ -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/whipper/test/test_common_common.py b/whipper/test/test_common_common.py index d515140..91fc668 100644 --- a/whipper/test/test_common_common.py +++ b/whipper/test/test_common_common.py @@ -12,7 +12,7 @@ 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/whipper/test/test_common_config.py b/whipper/test/test_common_config.py index d6edd67..0a0d384 100644 --- a/whipper/test/test_common_config.py +++ b/whipper/test/test_common_config.py @@ -12,7 +12,7 @@ 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/whipper/test/test_common_mbngs.py b/whipper/test/test_common_mbngs.py index 008135b..5127c38 100644 --- a/whipper/test/test_common_mbngs.py +++ b/whipper/test/test_common_mbngs.py @@ -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 @@ class MetadataTestCase(unittest.TestCase): 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 @@ class MetadataTestCase(unittest.TestCase): 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 @@ class MetadataTestCase(unittest.TestCase): # 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/whipper/test/test_common_renamer.py b/whipper/test/test_common_renamer.py index 2122bfc..b99f48a 100644 --- a/whipper/test/test_common_renamer.py +++ b/whipper/test/test_common_renamer.py @@ -12,7 +12,7 @@ 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 @@ class RenameInFileTestcase(unittest.TestCase): 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 @@ class RenameFileTestcase(unittest.TestCase): 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/whipper/test/test_image_cue.py b/whipper/test/test_image_cue.py index 5e42d04..b30b2c5 100644 --- a/whipper/test/test_image_cue.py +++ b/whipper/test/test_image_cue.py @@ -59,7 +59,7 @@ class KanyeMixedTestCase(unittest.TestCase): 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() diff --git a/whipper/test/test_image_toc.py b/whipper/test/test_image_toc.py index 0942ec9..c2f16ba 100644 --- a/whipper/test/test_image_toc.py +++ b/whipper/test/test_image_toc.py @@ -98,7 +98,7 @@ class CureTestCase(common.TestCase): 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/whipper/test/test_program_soxi.py b/whipper/test/test_program_soxi.py index b06e4f8..ac98da4 100644 --- a/whipper/test/test_program_soxi.py +++ b/whipper/test/test_program_soxi.py @@ -37,12 +37,12 @@ class AudioLengthPathTestCase(tcommon.TestCase): 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/whipper/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 whipper/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json rename to whipper/test/whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json diff --git a/whipper/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 whipper/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json rename to whipper/test/whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json diff --git a/whipper/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 whipper/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json rename to whipper/test/whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json diff --git a/whipper/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 whipper/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json rename to whipper/test/whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json