Private GIT

Skip to content
Snippets Groups Projects
Commit 1b70d477 authored by azcom's avatar azcom
Browse files

Update to allow for Newzbin merging H.264 and x264 attributes into a single H.264/x264 attribute.

parent aa1a41fb
No related branches found
No related tags found
No related merge requests found
...@@ -115,8 +115,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -115,8 +115,8 @@ class NewzbinProvider(generic.NZBProvider):
def _is_SDTV(self, attrs): def _is_SDTV(self, attrs):
# Video Fmt: (XviD, DivX, x264 or H.264), NOT 720p, NOT 1080p, NOT 1080i # Video Fmt: (XviD, DivX, H.264/x264), 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']) \ video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt'] or 'H.264/x264' in attrs['Video Fmt']) \
and ('720p' not 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']) and ('1080i' not in attrs['Video Fmt'])
...@@ -131,8 +131,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -131,8 +131,8 @@ class NewzbinProvider(generic.NZBProvider):
def _is_SDDVD(self, attrs): def _is_SDDVD(self, attrs):
# Video Fmt: (XviD, DivX, x264 or H.264), NOT 720p, NOT 1080p, NOT 1080i # Video Fmt: (XviD, DivX, H.264/x264), 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']) \ video_fmt = 'Video Fmt' in attrs and ('XviD' in attrs['Video Fmt'] or 'DivX' in attrs['Video Fmt'] or 'H.264/x264' in attrs['Video Fmt']) \
and ('720p' not 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']) and ('1080i' not in attrs['Video Fmt'])
...@@ -146,8 +146,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -146,8 +146,8 @@ class NewzbinProvider(generic.NZBProvider):
return video_fmt and source and subs return video_fmt and source and subs
def _is_HDTV(self, attrs): def _is_HDTV(self, attrs):
# Video Fmt: x264, 720p # Video Fmt: H.264/x264, 720p
video_fmt = 'Video Fmt' in attrs and ('x264' in attrs['Video Fmt']) \ video_fmt = 'Video Fmt' in attrs and ('H.264/x264' in attrs['Video Fmt']) \
and ('720p' in attrs['Video Fmt']) and ('720p' in attrs['Video Fmt'])
# Source: TV Cap or HDTV or (None) # Source: TV Cap or HDTV or (None)
...@@ -160,8 +160,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -160,8 +160,8 @@ class NewzbinProvider(generic.NZBProvider):
def _is_WEBDL(self, attrs): def _is_WEBDL(self, attrs):
# Video Fmt: x264, H.264, 720p # Video Fmt: H.264/x264, 720p
video_fmt = 'Video Fmt' in attrs and ('x264' in attrs['Video Fmt'] or 'H.264' in attrs['Video Fmt']) \ video_fmt = 'Video Fmt' in attrs and ('H.264/x264' in attrs['Video Fmt']) \
and ('720p' in attrs['Video Fmt']) and ('720p' in attrs['Video Fmt'])
# Source: WEB-DL # Source: WEB-DL
...@@ -174,8 +174,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -174,8 +174,8 @@ class NewzbinProvider(generic.NZBProvider):
def _is_720pBluRay(self, attrs): def _is_720pBluRay(self, attrs):
# Video Fmt: x264, 720p # Video Fmt: H.264/x264, 720p
video_fmt = 'Video Fmt' in attrs and ('x264' in attrs['Video Fmt']) \ video_fmt = 'Video Fmt' in attrs and ('H.264/x264' in attrs['Video Fmt']) \
and ('720p' in attrs['Video Fmt']) and ('720p' in attrs['Video Fmt'])
# Source: Blu-ray or HD-DVD # Source: Blu-ray or HD-DVD
...@@ -185,8 +185,8 @@ class NewzbinProvider(generic.NZBProvider): ...@@ -185,8 +185,8 @@ class NewzbinProvider(generic.NZBProvider):
def _is_1080pBluRay(self, attrs): def _is_1080pBluRay(self, attrs):
# Video Fmt: x264, 1080p # Video Fmt: H.264/x264, 1080p
video_fmt = 'Video Fmt' in attrs and ('x264' in attrs['Video Fmt']) \ video_fmt = 'Video Fmt' in attrs and ('H.264/x264' in attrs['Video Fmt']) \
and ('1080p' in attrs['Video Fmt']) and ('1080p' in attrs['Video Fmt'])
# Source: Blu-ray or HD-DVD # Source: Blu-ray or HD-DVD
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment