FilterUnnecessaryEvents (#102)

* Added func exclude_unpopular: removes unnecessary events that was
referred in issue #87

* Less patterns

* Redundant parameter "r"

Author: nadyr-mg

surebet/handling/excluding.py

@@ -1,6 +1,11 @@
+from re import search
+
 from surebet import find_in_iter, reverse_enum
 from surebet.handling.surebets import Surebets, Surebet
 
+women_patterns = ["\([Ww]\)"]
+other_patterns = ["\([Rr]\)", "U\d+", "\(U\d+\)", "U-\d+", "Reserves"]
+
 
 def _del_equal(found_obj, posit_obj) -> None:
     for attr, found_iter in found_obj.__dict__.items():
@@ -20,3 +25,23 @@ def _del_equal(found_obj, posit_obj) -> None:
 def exclude_posit(found_surebets: Surebets, posit_surebets: Surebets) -> None:
     _del_equal(found_surebets, posit_surebets)
     found_surebets.format()
+
+
+def exclude_unpopular(surebets):
+    for book in surebets.books_surebets:
+        for sport_name, sport in book.attrs_dict().items():
+            patterns = list(other_patterns)
+            if sport_name != "volley":  # volleyball women teams are allowed
+                patterns += women_patterns
+
+            for idx, event in reverse_enum(sport):
+                if is_unpopular(patterns, event):
+                    del sport[idx]
+
+
+def is_unpopular(patterns, event):
+    for pattern in patterns:
+        for teams in (event.teams1, event.teams2):
+            if search(pattern, teams[0]) or search(pattern, teams[1]):
+                return True
+    return False

surebet/main.py

@@ -1,6 +1,6 @@
 from surebet.bookmakers import Posit, Fonbet, Marat, Olimp
 from surebet.handling.detailed_surebets import convert_to_detailed
-from surebet.handling.excluding import exclude_posit
+from surebet.handling.excluding import exclude_posit, exclude_unpopular
 from surebet.handling.searching import find_surebets
 from surebet.handling.surebets import Surebets
 from surebet.loading.selenium import SeleniumService
@@ -29,6 +29,8 @@ def start_scanning(iter_num):
 
         exclude_posit(surebets, posit_surebets)
 
+        exclude_unpopular(surebets)
+
         surebets.set_timestamps(old_surebets)
         old_surebets = surebets
 

surebet/tests/handling/test_exclude.py

@@ -29,7 +29,7 @@ def test_known_result():
     surebets_other, surebets_posit = read_sample("known.pkl")
     exclude_posit(surebets_other, surebets_posit)
 
-    with open(path.join(resource_dir, "knownResult.json"), "r") as file_result:
+    with open(path.join(resource_dir, "knownResult.json")) as file_result:
         surebets_result = json.load(file_result)
 
     assert obj_dumps(surebets_other) == json_dumps(surebets_result)

surebet/tests/handling/test_unpopular.py

@@ -0,0 +1,37 @@
+import logging
+import pickle
+import json
+from os import path
+
+from surebet.tests.handling import package_dir
+from surebet.json_funcs import json_dumps, obj_dumps
+from surebet.handling.excluding import exclude_unpopular
+
+resource_dir = path.join(package_dir, "unpopular")
+
+
+def read_sample(filename):
+    with open(path.join(resource_dir, filename), "rb") as found_file:
+        obj = pickle.load(found_file)
+    return obj
+
+
+def test_sample():
+    for sample_num in range(3):
+        filename = 'sample{}.pkl'.format(sample_num)
+        surebets = read_sample(filename)
+        exclude_unpopular(surebets)
+
+    logging.info("PASS: samples")
+
+
+def test_known_result():
+    surebets = read_sample("known.pkl")
+    exclude_unpopular(surebets)
+
+    with open(path.join(resource_dir, "knownResult.json")) as file_result:
+        surebets_result = json.load(file_result)
+
+    assert obj_dumps(surebets) == json_dumps(surebets_result)
+
+    logging.info("PASS: known")