From 61338dece4334c7771c0e71dded4f40c3cd159b1 Mon Sep 17 00:00:00 2001 From: miigotu <miigotu@gmail.com> Date: Sun, 25 Mar 2018 04:38:35 -0700 Subject: [PATCH] Add AVC to recompiled.tags.avc, add more names to tests per #4439 Signed-off-by: miigotu <miigotu@gmail.com> --- sickrage/recompiled/tags.py | 2 +- tests/common_tests.py | 45 ++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/sickrage/recompiled/tags.py b/sickrage/recompiled/tags.py index cacf023fb..00f09acda 100644 --- a/sickrage/recompiled/tags.py +++ b/sickrage/recompiled/tags.py @@ -21,7 +21,7 @@ netflix = re.compile(r'netflix(hd|uhd)?', re.I) amazon = re.compile(r'(amzn|amazon)(hd|uhd)?', re.I) # Codecs -avc = re.compile(r'([xh].?26[45])', re.I) +avc = re.compile(r'([xh].?26[45]|AVC)', re.I) xvid = re.compile(r'(xvid|divx)', re.I) mpeg = re.compile(r'(mpeg-?2)', re.I) diff --git a/tests/common_tests.py b/tests/common_tests.py index e9f22ee54..7e90ed267 100644 --- a/tests/common_tests.py +++ b/tests/common_tests.py @@ -99,12 +99,27 @@ class QualityStringTests(unittest.TestCase): "Test_Show.S01E02_720p_WEB-DL_AAC2.0_H264-GROUP", "Test.Show.S01E02.720p.WEB-DL.AAC2.0.H264-GROUP", "Test.Show.S01E02.720p.iTunes.Rip.H264.AAC-GROUP", - "Test.Show.S01E02.Show.Name.AMZN.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.Amazon.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.Itunes.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.720p.AMZN.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.720p.Amazon.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.720p.Itunes.WEB-DL.x264" + "Test.Show.S01E02.Episode.Name.Itunes.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.ItunesHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.ItunesUHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.Itunes.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.ItunesHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.ItunesUHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.AMZN.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.Amazon.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.AmazonHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.AmazonUHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.AMZN.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.Amazon.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.AmazonHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.720p.AmazonUHD.WEB-DL.x264", + + # German dubs + "Test.Show.S01E02.Episode.Name.German.DD51.Synced.DL.iTunesHD.AVC", + "Test.Show.S01E02.Episode.Name.German.DD51.Synced.DL.AmazonHD.x264", + "Test.Show.S01E02.Episode.Name.German.Dubbed.DL.iTunesHD.x264", + "Test.Show.S01E02.Episode.Name.German.DD51.DL.NetflixHD.x264", + "Test.Show.S01E02.Episode.Name.German.DD51.DL.NetflixUHD.x264" ], 'full_hd_web_dl': [ "Test.Show.S01E02.1080p.WEB-DL-GROUP", @@ -114,10 +129,20 @@ class QualityStringTests(unittest.TestCase): "Test.Show.S01E02.1080p.iTunes.H.264.AAC-GROUP", "Test Show S01E02 1080p iTunes H 264 AAC-GROUP", "Test_Show_S01E02_1080p_iTunes_H_264_AAC-GROUP", - "Test.Show.S01E02.Show.Name.1080p.AMZN.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.1080p.Amazon.WEB-DL.x264", - "Test.Show.S01E02.Show.Name.1080p.ItunesHD.WEB-DL.x264" - + "Test.Show.S01E02.Episode.Name.1080p.Itunes.WEB-DL.x264" + "Test.Show.S01E02.Episode.Name.1080p.ItunesHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.1080p.ItunesUHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.1080p.AMZN.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.1080p.Amazon.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.1080p.AmazonUHD.WEB-DL.x264", + "Test.Show.S01E02.Episode.Name.1080p.AmazonHD.WEB-DL.x264", + + # German dubs + "Test.Show.S01E02.Episode.Name.German.DD51.Synced.DL.1080p.iTunesHD.AVC", + "Test.Show.S01E02.Episode.Name.German.DD51.Synced.DL.1080p.AmazonHD.x264", + "Test.Show.S01E02.Episode.Name.German.Dubbed.DL.1080p.iTunesHD.x264", + "Test.Show.S01E02.Episode.Name.German.DD51.DL.1080p.NetflixHD.x264", + "Test.Show.S01E02.Episode.Name.German.DD51.DL.1080p.NetflixUHD.x264" ], 'hd_bluray': [ "Test.Show.S01E02.720p.BluRay.x264-GROUP", -- GitLab