fix(frame_rate): enhance frame_rate when ending with .000 or spac…

…e separated (#693)

guessit/config/options.json

@@ -538,15 +538,15 @@
     },
     "screen_size": {
       "frame_rates": [
-        "23.976",
-        "24",
-        "25",
-        "29.970",
-        "30",
-        "48",
-        "50",
-        "60",
-        "120"
+        "23\\.976",
+        "24(?:\\.0{1,3})?",
+        "25(?:\\.0{1,3})?",
+        "29\\.970",
+        "30(?:\\.0{1,3})?",
+        "48(?:\\.0{1,3})?",
+        "50(?:\\.0{1,3})?",
+        "60(?:\\.0{1,3})?",
+        "120(?:\\.0{1,3})?"
       ],
       "min_ar": 1.333,
       "max_ar": 1.898,

guessit/rules/properties/screen_size.py

@@ -26,7 +26,7 @@ def screen_size(config):
     """
     interlaced = frozenset(config['interlaced'])
     progressive = frozenset(config['progressive'])
-    frame_rates = [re.escape(rate) for rate in config['frame_rates']]
+    frame_rates = frozenset(config['frame_rates'])
     min_ar = config['min_ar']
     max_ar = config['max_ar']
 
@@ -49,7 +49,7 @@ def screen_size(config):
     rebulk.regex(r'(?P<width>\d{3,4})-?(?:x|\*)-?(?P<height>\d{3,4})',
                  conflict_solver=lambda match, other: '__default__' if other.name == 'screen_size' else other)
 
-    rebulk.regex(frame_rate_pattern + '(p|fps)', name='frame_rate',
+    rebulk.regex(frame_rate_pattern + '-?(?:p|fps)', name='frame_rate',
                  formatter=FrameRate.fromstring, disabled=lambda context: is_disabled(context, 'frame_rate'))
 
     rebulk.rules(PostProcessScreenSize(progressive, min_ar, max_ar), ScreenSizeOnlyOne, ResolveScreenSizeConflicts)