diff --git a/sickbeard/providers/newzbin.py b/sickbeard/providers/newzbin.py index c0b2360a666e7450b4919a04f0c7340a3d9f966c..c93ed52900a6bc203f5505a0d658508fb223875c 100644 --- a/sickbeard/providers/newzbin.py +++ b/sickbeard/providers/newzbin.py @@ -115,10 +115,11 @@ class NewzbinProvider(generic.NZBProvider): def _is_SDTV(self, attrs): - # Video Fmt: (XviD or DivX), NOT 720p, NOT 1080p - video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt']) \ + # Video Fmt: (XviD, DivX, x264 or H.264), NOT 720p, NOT 1080p, NOT 1080i + video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt'] or 'x264' in attrs['Video Fmt'] or 'H.264' in attrs['Video Fmt']) \ and ('720p' not in attrs['Video Fmt']) \ - and ('1080p' not in attrs['Video Fmt']) + and ('1080p' not in attrs['Video Fmt']) \ + and ('1080i' not in attrs['Video Fmt']) # Source: TV Cap or HDTV or (None) source = 'Source' not in attrs or 'TV Cap' in attrs['Source'] or 'HDTV' in attrs['Source'] @@ -130,11 +131,12 @@ class NewzbinProvider(generic.NZBProvider): def _is_SDDVD(self, attrs): - # Video Fmt: (XviD or DivX), NOT 720p, NOT 1080p - video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt']) \ + # Video Fmt: (XviD, DivX, x264 or H.264), NOT 720p, NOT 1080p, NOT 1080i + video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt'] or 'x264' in attrs['Video Fmt'] or 'H.264' in attrs['Video Fmt']) \ and ('720p' not in attrs['Video Fmt']) \ - and ('1080p' not in attrs['Video Fmt']) - + and ('1080p' not in attrs['Video Fmt']) \ + and ('1080i' not in attrs['Video Fmt']) + # Source: DVD source = 'Source' in attrs and 'DVD' in attrs['Source'] @@ -158,14 +160,17 @@ class NewzbinProvider(generic.NZBProvider): def _is_WEBDL(self, attrs): - # Video Fmt: H.264, 720p - video_fmt = 'Video Fmt' in attrs and ('H.264' in attrs['Video Fmt']) \ + # Video Fmt: x264, H.264, 720p + video_fmt = 'Video Fmt' in attrs and ('x264' in attrs['Video Fmt'] or 'H.264' in attrs['Video Fmt']) \ and ('720p' in attrs['Video Fmt']) + # Source: Web-DL + source = 'Source' in attrs and 'Web-dl' in attrs['Source'] + # Subtitles: (None) subs = 'Subtitles' not in attrs - return video_fmt and subs + return video_fmt and source and subs def _is_720pBluRay(self, attrs):