From 16c936b2cda63d0b4274dd9a2d532b193cc0980c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Sat, 4 Aug 2018 21:12:06 +0200
Subject: [PATCH] Add exclude_patterns support for CommandsEqual

---
 lib/tfw/components/commands_equal.py | 44 ++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/lib/tfw/components/commands_equal.py b/lib/tfw/components/commands_equal.py
index 22dbe86..5115c71 100644
--- a/lib/tfw/components/commands_equal.py
+++ b/lib/tfw/components/commands_equal.py
@@ -8,20 +8,32 @@ from tfw.decorators.lazy_property import lazy_property
 
 
 class CommandsEqual:
-    def __init__(self, command_1, command_2, fuzzyness=1, must_begin_similarly=True, must_contain_patterns=None):
+    def __init__(
+            self, command_1, command_2,
+            fuzzyness=1, begin_similarly=True,
+            include_patterns=None, exclude_patterns=None
+    ):
         self.command_1 = split(command_1)
         self.command_2 = split(command_2)
         self.fuzzyness = fuzzyness
-        self.must_begin_similarly = must_begin_similarly
-        self.must_contain_patterns = must_contain_patterns
+        self.begin_similarly = begin_similarly
+        self.include_patterns = include_patterns
+        self.exclude_patterns = exclude_patterns
 
     def __bool__(self):
-        if self.must_begin_similarly and not self.beginnings_are_equal:
-            return False
+        if self.begin_similarly:
+            if not self.beginnings_are_equal:
+                return False
 
-        if self.must_contain_patterns is not None and not self.commands_contain_necessary_parts:
-            return False
+        if self.include_patterns is not None:
+            if not self.commands_contain_include_patterns:
+                return False
 
+        if self.exclude_patterns is not None:
+            if not self.commands_contain_no_exclude_patterns:
+                return False
+
+        print(self.similarity)
         return self.similarity >= self.fuzzyness
 
     @lazy_property
@@ -29,15 +41,23 @@ class CommandsEqual:
         return self.command_1[0] == self.command_2[0]
 
     @lazy_property
-    def commands_contain_necessary_parts(self):
+    def commands_contain_include_patterns(self):
         return all((
-            self.contains_neccessary_parts(self.command_1),
-            self.contains_neccessary_parts(self.command_2)
+            self.contains_regex_patterns(self.command_1, self.include_patterns),
+            self.contains_regex_patterns(self.command_2, self.include_patterns)
         ))
 
-    def contains_neccessary_parts(self, command):
+    @lazy_property
+    def commands_contain_no_exclude_patterns(self):
+        return all((
+            not self.contains_regex_patterns(self.command_1, self.exclude_patterns),
+            not self.contains_regex_patterns(self.command_2, self.exclude_patterns)
+        ))
+
+    @staticmethod
+    def contains_regex_patterns(command, regex_parts):
         command = ' '.join(command)
-        for pattern in self.must_contain_patterns:
+        for pattern in regex_parts:
             if not search(pattern, command):
                 return False
         return True