diff --git a/docs/migration2to3.rst b/docs/migration2to3.rst index f24701a..726e32f 100644 --- a/docs/migration2to3.rst +++ b/docs/migration2to3.rst @@ -66,6 +66,10 @@ The following values were changed: ``audio_codec`` ^^^^^^^^^^^^^^^ - ``DTS-HD`` was added. +- ``AC3`` is now ``Dolby Digital`` +- ``EAC3`` is now ``Dolby Digital Plus`` +- ``TrueHD`` is now ``Dolby TrueHD`` +- ``DolbyAtmos`` is now ``Dolby Atmos``. ``audio_profile`` ^^^^^^^^^^^^^^^^^ diff --git a/guessit/rules/properties/audio_codec.py b/guessit/rules/properties/audio_codec.py index ffc75ce..bbdfeb1 100644 --- a/guessit/rules/properties/audio_codec.py +++ b/guessit/rules/properties/audio_codec.py @@ -39,20 +39,20 @@ def audio_codec(): rebulk.defaults(name="audio_codec", conflict_solver=audio_codec_priority) rebulk.regex("MP3", "LAME", r"LAME(?:\d)+-?(?:\d)+", value="MP3") - rebulk.regex('Dolby', 'DolbyDigital', 'Dolby-Digital', 'DD', 'AC3D?', value='AC3') - rebulk.regex("DolbyAtmos", "Dolby-Atmos", "Atmos", value="DolbyAtmos") + rebulk.regex('Dolby', 'DolbyDigital', 'Dolby-Digital', 'DD', 'AC3D?', value='Dolby Digital') + rebulk.regex('Dolby-?Atmos', 'Atmos', value='Dolby Atmos') rebulk.string("AAC", value="AAC") - rebulk.string('EAC3', 'DDP', 'DD+', value="EAC3") + rebulk.string('EAC3', 'DDP', 'DD+', value='Dolby Digital Plus') rebulk.string("Flac", value="FLAC") rebulk.string("DTS", value="DTS") rebulk.regex('DTS-?HD', value='DTS-HD') - rebulk.regex("True-?HD", value="TrueHD") + rebulk.regex('True-?HD', value='Dolby TrueHD') rebulk.defaults(name='audio_profile') rebulk.string('MA', value='Master Audio', tags='DTS-HD') rebulk.string('HE', value='High Efficiency', tags='AAC') rebulk.string('LC', value='Low Complexity', tags='AAC') - rebulk.string('HQ', value='High Quality', tags='AC3') + rebulk.string('HQ', value='High Quality', tags='Dolby Digital') rebulk.defaults(name="audio_channels") rebulk.regex(r'(7[\W_][01](?:ch)?)(?:[^\d]|$)', value='7.1', children=True) @@ -66,7 +66,7 @@ def audio_codec(): rebulk.string('2ch', 'stereo', value='2.0') rebulk.string('1ch', 'mono', value='1.0') - rebulk.rules(DtsHDRule, AacRule, Ac3Rule, AudioValidatorRule, HqConflictRule, AudioChannelsValidatorRule) + rebulk.rules(DtsHDRule, AacRule, DolbyDigitalRule, AudioValidatorRule, HqConflictRule, AudioChannelsValidatorRule) return rebulk @@ -141,13 +141,13 @@ class AacRule(AudioProfileRule): super(AacRule, self).__init__("AAC") -class Ac3Rule(AudioProfileRule): +class DolbyDigitalRule(AudioProfileRule): """ - Rule to validate AC3 profile + Rule to validate Dolby Digital profile """ def __init__(self): - super(Ac3Rule, self).__init__("AC3") + super(DolbyDigitalRule, self).__init__('Dolby Digital') class HqConflictRule(Rule): @@ -155,7 +155,7 @@ class HqConflictRule(Rule): Solve conflict between HQ from other property and from audio_profile. """ - dependency = [DtsHDRule, AacRule, Ac3Rule] + dependency = [DtsHDRule, AacRule, DolbyDigitalRule] consequence = RemoveMatch def when(self, matches, context): diff --git a/guessit/test/episodes.yml b/guessit/test/episodes.yml index 6ce44ea..9d84e11 100644 --- a/guessit/test/episodes.yml +++ b/guessit/test/episodes.yml @@ -334,7 +334,7 @@ screen_size: 720p source: Web audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: CtrlHD @@ -360,7 +360,7 @@ screen_size: 720p source: Web audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: CtrlHD @@ -392,7 +392,7 @@ screen_size: 720p source: Web audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 ? Game of Thrones S03E06 1080i HDTV DD5.1 MPEG2-TrollHD.ts @@ -402,7 +402,7 @@ screen_size: 1080i source: HDTV audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: MPEG-2 release_group: TrollHD @@ -554,7 +554,7 @@ screen_size: 720p season: 1 # video_profile: BP # TODO: related to https://github.com/guessit-io/guessit/issues/458#issuecomment-305719715 - audio_codec: AC3 + audio_codec: Dolby Digital ? Sleepy.Hollow.S01E09.720p.WEB-DL.DD5.1.H.264-BS.mkv : episode: 9 @@ -565,7 +565,7 @@ screen_size: 720p season: 1 release_group: BS - audio_codec: AC3 + audio_codec: Dolby Digital ? Battlestar.Galactica.S00.Pilot.FRENCH.DVDRip.XviD-NOTAG.avi : title: Battlestar Galactica @@ -630,7 +630,7 @@ source: Web other: Rip audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: NTb @@ -1139,7 +1139,7 @@ episode: 21 episode_title: Al Sah-Him screen_size: 1080p - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: "5.1" video_codec: H.264 release_group: BS @@ -1665,7 +1665,7 @@ ? The.Good.Wife.S06E01.E10.720p.WEB-DL.DD5.1.H.264-CtrlHD/The.Good.Wife.S06E09.Trust.Issues.720p.WEB-DL.DD5.1.H.264-CtrlHD.mkv : audio_channels: '5.1' - audio_codec: AC3 + audio_codec: Dolby Digital episode: 9 source: Web release_group: CtrlHD @@ -1866,7 +1866,7 @@ ? Game.of.Thrones.S6.Ep5.X265.Dolby.2.0.KTM3.mp4 : audio_channels: '2.0' - audio_codec: AC3 + audio_codec: Dolby Digital container: mp4 episode: 5 release_group: KTM3 @@ -2000,7 +2000,7 @@ video_codec: H.264 ? Family.Guy.S13E14.JOLO.German.AC3D.DL.720p.WebHD.x264-CDD -: audio_codec: AC3 +: audio_codec: Dolby Digital episode: 14 episode_title: JOLO German source: Web @@ -2039,7 +2039,7 @@ ? Fear.the.Walking.Dead.-.Season.2.epi.02.XviD.Eng.Ac3-5.1.sub.ita.eng.iCV-MIRCrew : options: -t episode audio_channels: '5.1' - audio_codec: AC3 + audio_codec: Dolby Digital episode: 2 episode_title: epi language: en @@ -2075,7 +2075,7 @@ ? The.Walking.Dead.S06E01.FRENCH.1080p.WEB-DL.DD5.1.HEVC.x265-GOLF68 : audio_channels: '5.1' - audio_codec: AC3 + audio_codec: Dolby Digital episode: 1 source: Web language: fr @@ -2216,7 +2216,7 @@ season: 1 screen_size: 720p source: HDTV - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: Group @@ -2258,7 +2258,7 @@ streaming_service: Amazon Prime source: Web other: Rip - audio_codec: EAC3 + audio_codec: Dolby Digital Plus audio_channels: '5.1' video_codec: H.264 type: episode @@ -2430,7 +2430,7 @@ streaming_service: Netflix source: Web other: Rip - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: NTb @@ -2735,7 +2735,7 @@ streaming_service: Amazon Prime source: Web other: Rip - audio_codec: EAC3 + audio_codec: Dolby Digital Plus audio_channels: '5.1' video_codec: H.264 release_group: Group @@ -2762,7 +2762,7 @@ language: [it, en] source: Web other: Mux - audio_codec: AC3 + audio_codec: Dolby Digital subtitle_language: [it, en] release_group: GiuseppeTnT Littlelinx type: episode @@ -2961,7 +2961,7 @@ episode: 10 screen_size: 1080p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: KINGS @@ -2988,7 +2988,7 @@ streaming_service: Netflix source: Web other: Rip - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: ViSUM @@ -3009,7 +3009,7 @@ episode: 5 screen_size: 1080p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: HKD @@ -3052,7 +3052,7 @@ episode_title: The Brain In The Bot screen_size: 1080p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: R2D2 @@ -3066,7 +3066,7 @@ episode: 7 screen_size: 1080p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 subtitle_language: nl @@ -3094,7 +3094,7 @@ episode: 12 screen_size: 1080p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' release_group: Het.Robot.Team.OYM type: episode @@ -3369,7 +3369,7 @@ other: Rip video_codec: H.264 container: mkv - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' release_group: Ehhhh type: episode @@ -3425,7 +3425,7 @@ season: 2 episode: 7 episode_title: Shiva - audio_codec: AC3 + audio_codec: Dolby Digital language: und source: Web other: Rip @@ -3495,7 +3495,7 @@ season: 6 episode: 5 language: de - audio_codec: AC3 + audio_codec: Dolby Digital source: HDTV type: episode @@ -3560,7 +3560,7 @@ streaming_service: Amazon Prime source: Web other: Rip - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: GROUP @@ -3651,7 +3651,7 @@ episode: 13 episode_details: Final language: mul - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' screen_size: 2160p streaming_service: Netflix @@ -3687,7 +3687,7 @@ episode_title: eps1 0 hellofriend other: HD streaming_service: iTunes - audio_codec: AC3 + audio_codec: Dolby Digital language: spa year: 2015 container: avi @@ -3892,7 +3892,7 @@ other: East Coast Feed screen_size: 720p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: NTb @@ -3932,7 +3932,7 @@ streaming_service: Amazon Prime source: Web other: Rip - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: casstudio @@ -3971,7 +3971,7 @@ episode_title: Super Title screen_size: 720p source: Web - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' video_codec: H.264 release_group: ABC @@ -3996,7 +3996,7 @@ source: Web other: Rip video_codec: H.264 - audio_codec: EAC3 + audio_codec: Dolby Digital Plus release_group: KiNGS container: mkv type: episode diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 9af7b82..d86006a 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -38,7 +38,7 @@ other: Rip screen_size: 720p video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital release_group: SEPTiC ? Movies/Borat (2006)/Borat.(2006).R5.PROPER.REPACK.DVDRip.XviD-PUKKA.avi @@ -102,7 +102,7 @@ source: DVD language: [ english, spanish ] video_codec: Xvid - audio_codec: AC3 + audio_codec: Dolby Digital ? Movies/Wild Zero (2000)/Wild.Zero.DVDivX-EPiC.avi : title: Wild Zero @@ -122,7 +122,7 @@ source: DVD other: Rip video_codec: Xvid - audio_codec: AC3 + audio_codec: Dolby Digital release_group: WAF ? movies/American.The.Bill.Hicks.Story.2009.DVDRip.XviD-EPiSODE.[UsaBit.com]/UsaBit.com_esd-americanbh.avi @@ -201,7 +201,7 @@ source: DVD other: Rip video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital release_group: FtS website: sharethefiles.com @@ -220,7 +220,7 @@ year: 2008 source: DVD other: Rip - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: Xvid release_group: CrazyTeam @@ -238,7 +238,7 @@ source: Blu-ray other: Rip screen_size: 720p - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: HiS@SiLUHD language: english @@ -252,7 +252,7 @@ source: Blu-ray other: Rip screen_size: 720p - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: HiS@SiLUHD language: english @@ -363,7 +363,7 @@ source: HDTV screen_size: 720p video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: "5.1" release_group: REDµX @@ -374,7 +374,7 @@ video_codec: H.264 video_api: DXVA screen_size: 720p - audio_codec: AC3 + audio_codec: Dolby Digital release_group: de[42] @@ -463,7 +463,7 @@ other: [Reencoded, Rip] video_codec: Xvid audio_channels: "5.1" - audio_codec: AC3 + audio_codec: Dolby Digital uuid: XD607ebb-BRc59935-5155473f-1c5f49 ? Pacific.Rim.3D.2013.COMPLETE.BLURAY-PCH.avi @@ -565,7 +565,7 @@ source: Blu-ray other: [Reencoded, Rip] video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital release_group: FUNKY ? REDLINE (BD 1080p H264 10bit FLAC) [3xR].mkv @@ -595,7 +595,7 @@ source: DVD other: [Rip, Line Audio] year: 2012 - audio_codec: AC3 + audio_codec: Dolby Digital audio_profile: High Quality release_group: Hive-CM8 @@ -611,7 +611,7 @@ source: DVD other: [Rip, Line Audio] year: 2012 - audio_codec: AC3 + audio_codec: Dolby Digital audio_profile: High Quality release_group: Hive-CM8 @@ -621,7 +621,7 @@ source: DVD other: Rip year: 2012 - audio_codec: AC3 + audio_codec: Dolby Digital audio_profile: High Quality release_group: Hive-CM8 @@ -790,7 +790,7 @@ ? '[h265 - hevc] transformers 2 1080p french ac3 6ch.' : audio_channels: '5.1' - audio_codec: AC3 + audio_codec: Dolby Digital language: fr screen_size: 1080p title: transformers 2 @@ -813,7 +813,7 @@ title: Looney Tunes ? Das.Appartement.German.AC3D.DL.720p.BluRay.x264-TVP -: audio_codec: AC3 +: audio_codec: Dolby Digital source: Blu-ray language: mul release_group: TVP @@ -823,7 +823,7 @@ video_codec: H.264 ? Das.Appartement.GERMAN.AC3D.DL.720p.BluRay.x264-TVP -: audio_codec: AC3 +: audio_codec: Dolby Digital source: Blu-ray language: - de @@ -906,7 +906,7 @@ source: Blu-ray video_codec: H.265 video_profile: 10bit - audio_codec: [DTS-HD, DolbyAtmos] + audio_codec: [DTS-HD, Dolby Atmos] audio_channels: '7.1' release_group: DDR container: mkv @@ -938,7 +938,7 @@ source: Blu-ray video_codec: H.265 video_profile: 10bit - audio_codec: DolbyAtmos + audio_codec: Dolby Atmos audio_channels: '7.1' release_group: DDR type: movie @@ -1003,7 +1003,7 @@ screen_size: 1080p source: Web video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital audio_channels: '5.1' release_group: FGT type: movie @@ -1173,7 +1173,7 @@ screen_size: 720p source: Camera video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital release_group: TiTAN type: movie diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index 3dc93c4..aa79704 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -12,18 +12,18 @@ ? +DD ? +Dolby Digital ? +AC3 -: audio_codec: AC3 +: audio_codec: Dolby Digital ? +DDP ? +DD+ ? +EAC3 -: audio_codec: EAC3 +: audio_codec: Dolby Digital Plus ? +DolbyAtmos ? +Dolby Atmos ? +Atmos ? -Atmosphere -: audio_codec: DolbyAtmos +: audio_codec: Dolby Atmos ? +AAC : audio_codec: AAC @@ -36,11 +36,11 @@ ? +True-HD ? +trueHD -: audio_codec: TrueHD +: audio_codec: Dolby TrueHD ? +True-HD51 ? +trueHD51 -: audio_codec: TrueHD +: audio_codec: Dolby TrueHD audio_channels: '5.1' ? +DTSHD @@ -53,7 +53,7 @@ audio_profile: Master Audio ? +AC3-hq -: audio_codec: AC3 +: audio_codec: Dolby Digital audio_profile: High Quality ? +AAC-HE @@ -90,7 +90,7 @@ ? DD5.1 ? DD51 -: audio_codec: AC3 +: audio_codec: Dolby Digital audio_channels: '5.1' ? -51 diff --git a/guessit/test/various.yml b/guessit/test/various.yml index 5b9a294..8647a1b 100644 --- a/guessit/test/various.yml +++ b/guessit/test/various.yml @@ -53,7 +53,7 @@ date: 2008-03-09 source: Blu-ray screen_size: 720p - audio_codec: AC3 + audio_codec: Dolby Digital video_codec: H.264 release_group: HiS@SiLUHD language: english @@ -193,7 +193,7 @@ source: Web audio_channels: "5.1" video_codec: H.264 - audio_codec: AC3 + audio_codec: Dolby Digital release_group: NTb ? Despicable.Me.2.2013.1080p.BluRay.x264-VeDeTT.nfo @@ -207,7 +207,7 @@ ? Le Cinquieme Commando 1971 SUBFORCED FRENCH DVDRiP XViD AC3 Bandix.mkv : type: movie - audio_codec: AC3 + audio_codec: Dolby Digital source: DVD other: Rip release_group: Bandix @@ -552,7 +552,7 @@ ? TEST.S01E02.2160p.NF.WEBRip.x264.DD5.1-ABC : audio_channels: '5.1' - audio_codec: AC3 + audio_codec: Dolby Digital episode: 2 source: Web other: Rip @@ -715,8 +715,8 @@ : audio_channels: '7.1' audio_codec: - DTS-HD - - TrueHD - - DolbyAtmos + - Dolby TrueHD + - Dolby Atmos audio_profile: Master Audio source: Blu-ray other: 3D @@ -731,8 +731,8 @@ : audio_channels: '7.1' audio_codec: - DTS-HD - - TrueHD - - DolbyAtmos + - Dolby TrueHD + - Dolby Atmos audio_profile: Master Audio source: Blu-ray other: 3D @@ -747,8 +747,8 @@ : audio_channels: '7.1' audio_codec: - DTS-HD - - TrueHD - - DolbyAtmos + - Dolby TrueHD + - Dolby Atmos audio_profile: Master Audio source: Blu-ray other: Remux