From cc6a8306a82e5624555dac01555d1f5ae3e3d67c Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Mon, 21 Sep 2020 12:51:45 +0200
Subject: revert hacky Skorvald filter by updating evtclib

The CM detection in evtclib has been fixed in 0.4.3 so we can now rely
on that again.
---
 src/main.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 5711854..4052d59 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,7 +9,7 @@ use std::{
 
 use anyhow::{anyhow, Context, Result};
 use clap::Clap;
-use evtclib::{analyzers::helpers, Boss, Compression, Log};
+use evtclib::{Boss, Compression, Log};
 use log::{debug, error, info, warn};
 use notify::{self, DebouncedEvent, RecursiveMode, Watcher};
 use regex::Regex;
@@ -198,13 +198,7 @@ fn should_upload(config: &Config, log: &Log) -> bool {
         return false;
     }
     // Only upload Skorvald if it actually was in 100 CM (and not in in lower-tier or non-CM).
-    // Currently, CM detection is broken, so check that we are at least in T4 and assume that every
-    // T4 Skorvald is a CM Skorvald.
-    if log.encounter() == Some(Boss::Skorvald)
-        && helpers::boss_health(log)
-            .map(|h| h < 5_526_000)
-            .unwrap_or(false)
-    {
+    if log.encounter() == Some(Boss::Skorvald) && !log.is_cm() {
         return false;
     }
     // Only upload logs that are long enough
-- 
cgit v1.2.3