Private GIT

Skip to content
Snippets Groups Projects
Unverified Commit a4f016c5 authored by miigotu's avatar miigotu
Browse files

Merge branch 'develop'

parents 211e26f7 61338dec
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
gui/slick/images/network/cbs all access.png 0 → 100644
NaN GiB (NaN%)
View file @ a4f016c5
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
runscripts/init.openbsd 0 → 100644
+ 13
− 0
View file @ a4f016c5
#!/bin/sh
#
daemon_home="/path/to/sickrage_homedir"
daemon_user="sickrage"
daemon="/usr/local/bin/python2.7 $daemon_home/SickRage/SickBeard.py"
daemon_flags="-q --daemon --nolaunch --datadir=$daemon_home"
daemon_timeout=5
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1
sickbeard/common.py
+ 12
− 10
View file @ a4f016c5
......@@ -332,31 +332,31 @@ class Quality(object):
return Quality.UNKNOWN if result is None else result
# Is it UHD?
if ep.vres in [2160, 4320] and ep.scan == 'p':
if ep.vres in {2160, 4320} and ep.scan == 'p':
# BluRay
full_res = (ep.vres == 4320)
if ep.avc and ep.bluray:
result = Quality.UHD_4K_BLURAY if not full_res else Quality.UHD_8K_BLURAY
result = (Quality.UHD_4K_BLURAY, Quality.UHD_8K_BLURAY)[full_res]
# WEB-DL
elif (ep.avc and ep.itunes) or ep.web:
result = Quality.UHD_4K_WEBDL if not full_res else Quality.UHD_8K_WEBDL
elif (ep.avc and (ep.itunes or ep.amazon or ep.netflix)) or ep.web:
result = (Quality.UHD_4K_WEBDL, Quality.UHD_8K_WEBDL)[full_res]
# HDTV
elif ep.avc and ep.tv == 'hd':
result = Quality.UHD_4K_TV if not full_res else Quality.UHD_8K_TV
result = (Quality.UHD_4K_TV, Quality.UHD_8K_TV)[full_res]
# Is it HD?
elif ep.vres in [1080, 720]:
elif ep.vres in {1080, 720}:
if ep.scan == 'p':
# BluRay
full_res = (ep.vres == 1080)
if ep.avc and (ep.bluray or ep.hddvd):
result = Quality.FULLHDBLURAY if full_res else Quality.HDBLURAY
result = (Quality.HDBLURAY, Quality.FULLHDBLURAY)[full_res]
# WEB-DL
elif (ep.avc and ep.itunes) or ep.web:
result = Quality.FULLHDWEBDL if full_res else Quality.HDWEBDL
elif (ep.avc and (ep.itunes or ep.amazon or ep.netflix)) or ep.web:
result = (Quality.HDWEBDL, Quality.FULLHDWEBDL)[full_res]
# HDTV
elif ep.avc and ep.tv == 'hd':
result = Quality.FULLHDTV if full_res else Quality.HDTV #1080 HDTV h264
result = (Quality.HDTV, Quality.FULLHDTV)[full_res] # 1080 HDTV h264
# MPEG2 encoded
elif all([ep.vres == 1080, ep.tv == 'hd', ep.mpeg]):
result = Quality.RAWHDTV
......@@ -364,6 +364,8 @@ class Quality(object):
result = Quality.RAWHDTV
elif (ep.res == '1080i') and ep.tv == 'hd' and (ep.mpeg or (ep.raw and ep.avc_non_free)):
result = Quality.RAWHDTV
elif not ep.vres and ep.netflix or ep.amazon or ep.itunes:
result = Quality.HDWEBDL
elif ep.hrws:
result = Quality.HDTV
......
sickrage/recompiled/tags.py
+ 4
− 3
View file @ a4f016c5
......@@ -16,11 +16,12 @@ dvd = re.compile(r'(?P<hd>hd)?dvd(?P<rip>rip|mux)?', re.I)
web = re.compile(r'(web(?P<type>rip|mux|hd|.?dl|\b))', re.I)
bluray = re.compile(r'(blue?-?ray|b[rd](?:rip|mux))', re.I)
sat = re.compile(r'(dsr|satrip)', re.I)
itunes = re.compile(r'(itunes)', re.I)
netflix = re.compile(r'netflix(hd|uhd)', re.I)
itunes = re.compile(r'itunes(hd|uhd)?', re.I)
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)
......
sickrage/tagger/episode.py
+ 11
− 0
View file @ a4f016c5
......@@ -30,6 +30,7 @@ class EpisodeTags(object):
'mpeg': tags.mpeg,
'xvid': tags.xvid,
'netflix': tags.netflix,
'amazon': tags.amazon,
}
def _get_match_obj(self, attr, regex=None, flags=0):
......@@ -277,3 +278,13 @@ class EpisodeTags(object):
attr = 'netflix'
match = self._get_match_obj(attr)
return '' if not match else match.group()
@property
def amazon(self):
"""
Amazon tage found in name
:return: an empty string if not found
"""
attr = 'amazon'
match = self._get_match_obj(attr)
return '' if not match else match.group()
tests/common_tests.py
+ 37
− 2
View file @ a4f016c5
......@@ -98,7 +98,28 @@ class QualityStringTests(unittest.TestCase):
"Test Show S01E02 720p WEB-DL AAC2 0 H 264-GROUP",
"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.720p.iTunes.Rip.H264.AAC-GROUP",
"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",
......@@ -107,7 +128,21 @@ class QualityStringTests(unittest.TestCase):
"Test.Show.S01E02.WEBRip.1080p.H264.AAC.2.0-GROUP",
"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_1080p_iTunes_H_264_AAC-GROUP",
"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",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)