PICARD-125: AC3 codec is now stored in info.codec

This commit is contained in:
Philipp Wolfer
2019-10-17 08:22:21 +02:00
parent 29a9ee7fd0
commit 0776741f5a
2 changed files with 8 additions and 7 deletions

View File

@@ -31,14 +31,14 @@ from .mutagenext import ac3
class AC3File(APEv2File):
EXTENSIONS = [".ac3", ".eac3"]
NAME = "AC3"
NAME = "AC-3"
_File = ac3.AC3APEv2
def _info(self, metadata, file):
super()._info(metadata, file)
if hasattr(file.info, 'type_') and file.info.type_:
format = file.info.type_
if hasattr(file.info, 'codec') and file.info.codec == 'ec-3':
format = 'Enhanced AC-3'
else:
format = self.NAME
if file.tags:

View File

@@ -59,18 +59,18 @@ class AC3NoTagsTest(CommonTests.BaseFileTestCase):
'artist': 'Foo'
})
metadata = save_and_load_metadata(self.filename, metadata)
self.assertEqual('AC3', metadata['~format'])
self.assertEqual('AC-3', metadata['~format'])
self.assertNotIn('title', metadata)
self.assertNotIn('artist', metadata)
def test_info_format(self):
metadata = load_metadata(os.path.join('test', 'data', 'test.ac3'))
self.assertEqual('AC3', metadata['~format'])
self.assertEqual('AC-3', metadata['~format'])
metadata = load_metadata(os.path.join('test', 'data', 'test-apev2.ac3'))
self.assertEqual('AC3 (APEv2)', metadata['~format'])
self.assertEqual('AC-3 (APEv2)', metadata['~format'])
if native_ac3:
metadata = load_metadata(os.path.join('test', 'data', 'test.eac3'))
self.assertEqual('EAC3', metadata['~format'])
self.assertEqual('Enhanced AC-3', metadata['~format'])
def test_supports_tag(self):
config.setting['ac3_save_ape'] = True
@@ -83,6 +83,7 @@ class AC3NoTagsTest(CommonTests.BaseFileTestCase):
class EAC3Test(CommonTests.SimpleFormatsTestCase):
testfile = 'test.eac3'
expected_info = {
'~format': 'Enhanced AC-3',
'length': 107,
'~sample_rate': '44100',
'~channels': '2',