Added || support to filters expanding #273

outr · Feb 23, 2022 · 9ef2805 · 9ef2805
1 parent 1f5a9ee
commit 9ef2805
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...ain/scala/scribe/filter/MultiFilter.scala → ...main/scala/scribe/filter/AndFilters.scala b/...ain/scala/scribe/filter/MultiFilter.scala → ...main/scala/scribe/filter/AndFilters.scala
@@ -2,7 +2,7 @@ package scribe.filter
 
 import scribe.LogRecord
 
-case class MultiFilter(filters: List[Filter]) extends Filter {
+case class AndFilters(filters: List[Filter]) extends Filter {
   override def matches[M](record: LogRecord[M]): Boolean = filters.forall(_.matches(record))
 
   override def &&(that: Filter): Filter = copy(filters ::: List(that))

diff --git a/core/shared/src/main/scala/scribe/filter/Filter.scala b/core/shared/src/main/scala/scribe/filter/Filter.scala
@@ -8,5 +8,6 @@ import scribe.LogRecord
 trait Filter {
   def matches[M](record: LogRecord[M]): Boolean
 
-  def &&(that: Filter): Filter = MultiFilter(List(this, that))
+  def &&(that: Filter): Filter = AndFilters(List(this, that))
+  def ||(that: Filter): Filter = OrFilters(List(this, that))
 }
diff --git a/core/shared/src/main/scala/scribe/filter/OrFilters.scala b/core/shared/src/main/scala/scribe/filter/OrFilters.scala
@@ -0,0 +1,9 @@
+package scribe.filter
+
+import scribe.LogRecord
+
+case class OrFilters(filters: List[Filter]) extends Filter {
+  override def matches[M](record: LogRecord[M]): Boolean = filters.exists(_.matches(record))
+
+  override def ||(that: Filter): Filter = copy(filters ::: List(that))
+}