Merge pull request #785 from pymedusa/enhance-audio-channels-detection

Enhancing audio_channels detection
pymedusa · Jul 19, 2016 · ab21c9a · ab21c9a
2 parents 72031f3 + ef483bf
commit ab21c9a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/sickbeard/name_parser/rules/__init__.py b/sickbeard/name_parser/rules/__init__.py
@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 """Guessit customization."""
 from guessit.api import default_api
-from sickbeard.name_parser.rules.properties import (blacklist, format_, language, other, size, screen_size,
-                                                    subtitle_language)
+from sickbeard.name_parser.rules.properties import (audio_channels, blacklist, format_, language, other, size,
+                                                    screen_size, subtitle_language)
 from sickbeard.name_parser.rules.rules import rules
 
 
@@ -14,4 +14,5 @@
 default_api.rebulk.rebulk(size())
 default_api.rebulk.rebulk(language())
 default_api.rebulk.rebulk(subtitle_language())
+default_api.rebulk.rebulk(audio_channels())
 default_api.rebulk.rebulk(rules())
diff --git a/sickbeard/name_parser/rules/properties.py b/sickbeard/name_parser/rules/properties.py
@@ -145,6 +145,22 @@ def subtitle_language():
 
     return rebulk
 
+def audio_channels():
+    """Audio channels property.
+
+    :return:
+    :rtype: Rebulk
+    """
+    rebulk = Rebulk().regex_defaults(flags=re.IGNORECASE, abbreviations=[dash]).string_defaults(ignore_case=True)
+    rebulk.defaults(name='audio_channels')
+
+    # https://github.com/guessit-io/guessit/issues/328
+    rebulk.string('7.1ch', value='7.1')
+    rebulk.string('5.1ch', value='5.1')
+    rebulk.string('2.0ch', value='2.0')
+
+    return rebulk
+
 
 class ValidateHardcodedSubs(Rule):
     """Validate HC matches."""

diff --git a/tests/datasets/tvshows.yml b/tests/datasets/tvshows.yml
@@ -2734,3 +2734,16 @@
   size: 450MB
   release_group: iExTV
   type: episode
+
+# 5.1ch detection
+? Show.Name.S02E02.Episode.Title.1080p.WEB-DL.x264.5.1Ch.-.Group
+: title: Show Name
+  season: 2
+  episode: 2
+  episode_title: Episode Title
+  screen_size: 1080p
+  format: WEB-DL
+  video_codec: h264
+  audio_channels: '5.1'
+  release_group: Group
+  type: episode