diff --git a/picard/formats/ac3.py b/picard/formats/ac3.py index a5206e3fb..98c270b8e 100644 --- a/picard/formats/ac3.py +++ b/picard/formats/ac3.py @@ -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: diff --git a/test/formats/test_ac3.py b/test/formats/test_ac3.py index 48446d61a..5c6ba6470 100644 --- a/test/formats/test_ac3.py +++ b/test/formats/test_ac3.py @@ -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',