monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-01 08:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
echel0n 2014-06-22 10:43:38 -07:00
commit b36292d83d
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sickbeard/name_parser/parser.py
View file

@ -231,17 +231,18 @@ class NameParser(object):
elif getattr(self.showObj, 'anime', None) and len(result.ab_episode_numbers):
result.score += 1
if self.convert:
result = result.convert()
result.score += 1
matches.append(result)
if len(matches):
result = max(matches, key=lambda x: x.score)
# get quality
if result.show:
if self.convert:
# scene convert result
result = result.convert()
# get quality
result.quality = common.Quality.nameQuality(name, bool(result.show and result.show.is_anime))
return result

10
sickbeard/webserve.py
View file

@ -873,8 +873,9 @@ class Manage(MainHandler):
for curResult in sqlResults:
curEpCat = curShow.getOverview(int(curResult["status"]))
epCats[str(curResult["season"]) + "x" + str(curResult["episode"])] = curEpCat
epCounts[curEpCat] += 1
if curEpCat:
epCats[str(curResult["season"]) + "x" + str(curResult["episode"])] = curEpCat
epCounts[curEpCat] += 1
showCounts[curShow.indexerid] = epCounts
showCats[curShow.indexerid] = epCats
@ -3429,8 +3430,9 @@ class Home(MainHandler):
for curResult in sqlResults:
curEpCat = showObj.getOverview(int(curResult["status"]))
epCats[str(curResult["season"]) + "x" + str(curResult["episode"])] = curEpCat
epCounts[curEpCat] += 1
if curEpCat:
epCats[str(curResult["season"]) + "x" + str(curResult["episode"])] = curEpCat
epCounts[curEpCat] += 1
def titler(x):
if not x or sickbeard.SORT_ARTICLE: