monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-30 16:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'hotfix/0.16.7'

Browse source
This commit is contained in:
JackDandy 2018-05-14 02:52:17 +01:00
commit 602d61c99e
2 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -1,4 +1,9 @@
### 0.16.6 (2018-05-14 01:00:00 UTC)
### 0.16.7 (2018-05-14 02:40:00 UTC)
* Fix name_parser_tests for test_extra_info_no_name
### 0.16.6 (2018-05-14 01:00:00 UTC)
* Change improve tolerance to parse a release title with a badly placed episode name
* Change improve handling tvdb_api data when adding upcoming shows with unfilled data

42
tests/name_parser_tests.py
View file

@ -374,13 +374,13 @@ extra_info_no_name_tests = [('The Show Name', [('Episode 302', 3, 2)],
'The.Show.Name.S03E02E03.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'720p.AMZN.WEBRip.DDP5.1.x264'),
('The Show Name', [('Episode 302', 3, 2), ('Name 2', 3, 3)],
'The.Show.Name.S03E02E03.Episode.302.Name2.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'The.Show.Name.S03E02E03.Episode.302.Name.2.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'720p.AMZN.WEBRip.DDP5.1.x264'),
('The Show Name', [('Episode 302', 3, 2), ('Name 2', 3, 3)],
'The.Show.Name.S03E02E03.REPACK.Episode.302.Name2.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'The.Show.Name.S03E02E03.REPACK.Episode.302.Name.2.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'REPACK.720p.AMZN.WEBRip.DDP5.1.x264'),
('The Show Name', [('Episode 302', 3, 2), ('Name 2', 3, 3)],
'The.Show.Name.S03E02E03.Episode.302.Name2.REPACK.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'The.Show.Name.S03E02E03.Episode.302.Name.2.REPACK.720p.AMZN.WEBRip.DDP5.1.x264-GROUP',
'REPACK.720p.AMZN.WEBRip.DDP5.1.x264'),
]
@ -656,20 +656,34 @@ class TVEpisode(tv.TVEpisode):
class ExtraInfoNoNameTests(test.SickbeardTestDBCase):
def setUp(self):
super(ExtraInfoNoNameTests, self).setUp()
self.oldregex = parser.regex
def tearDown(self):
super(ExtraInfoNoNameTests, self).tearDown()
parser.regex = self.oldregex
def test_extra_info_no_name(self):
for case in extra_info_no_name_tests:
tvs = TVShow(False, case[0], 2, 1)
for e in case[1]:
tvs.episodes.setdefault(e[1], {}).update({e[2]: TVEpisode(e[0])})
for i in range(2):
if 1 == i:
if None is parser.regex:
# only retest if regex lib is installed, now test re lib
continue
parser.regex = None
for case in extra_info_no_name_tests:
tvs = TVShow(False, case[0], 2, 1)
for e in case[1]:
tvs.episodes.setdefault(e[1], {}).update({e[2]: TVEpisode(e[0])})
sickbeard.showList = [tvs]
name_cache.nameCache = {}
name_cache.buildNameCache()
sickbeard.showList = [tvs]
name_cache.nameCache = {}
name_cache.buildNameCache()
np = parser.NameParser()
r = np.parse(case[2])
n_ep = r.extra_info_no_name()
self.assertEqual(n_ep, case[3])
np = parser.NameParser()
r = np.parse(case[2], cache_result=False)
n_ep = r.extra_info_no_name()
self.assertEqual(n_ep, case[3])
if __name__ == '__main__':