From 4589a6dfd6828c1934d48c82cf30b929685b9a9e Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 20 Nov 2021 01:53:47 +0100
Subject: update dependencies

This also comes with an update to evtclib 0.6.0, therefore we get access
to some new boss enums.
---
 src/categories.rs | 15 +++++++++++++--
 src/main.rs       | 10 +++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/categories.rs b/src/categories.rs
index cf4c3de..20d540d 100644
--- a/src/categories.rs
+++ b/src/categories.rs
@@ -11,13 +11,20 @@ impl Categorizable for Log {
                 Encounter::ValeGuardian | Encounter::Gorseval | Encounter::Sabetha => {
                     "Wing 1 (Spirit Vale)"
                 }
-                Encounter::Slothasor | Encounter::Matthias => "Wing 2 (Salvation Pass)",
+                Encounter::Slothasor | Encounter::BanditTrio | Encounter::Matthias => {
+                    "Wing 2 (Salvation Pass)"
+                }
                 Encounter::KeepConstruct | Encounter::Xera => "Wing 3 (Stronghold of the Faithful)",
                 Encounter::Cairn
                 | Encounter::MursaatOverseer
                 | Encounter::Samarog
                 | Encounter::Deimos => "Wing 4 (Bastion of the Penitent)",
-                Encounter::SoullessHorror | Encounter::VoiceInTheVoid => "Wing 5 (Hall of Chains)",
+                Encounter::SoullessHorror
+                | Encounter::RiverOfSouls
+                | Encounter::BrokenKing
+                | Encounter::EaterOfSouls
+                | Encounter::StatueOfDarkness
+                | Encounter::VoiceInTheVoid => "Wing 5 (Hall of Chains)",
                 Encounter::ConjuredAmalgamate | Encounter::TwinLargos | Encounter::Qadim => {
                     "Wing 6 (Mythwright Gambit)"
                 }
@@ -37,6 +44,10 @@ impl Categorizable for Log {
                 | Encounter::Boneskinner
                 | Encounter::WhisperOfJormag => "Strike Mission",
 
+                Encounter::StandardKittyGolem
+                | Encounter::MediumKittyGolem
+                | Encounter::LargeKittyGolem => "Special Forces Training Area",
+
                 _ => "Unknown",
             }
         } else {
diff --git a/src/main.rs b/src/main.rs
index cc1bb78..bdaf13a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Context, Result};
-use clap::Clap;
+use clap::Parser;
 use evtclib::{Compression, Encounter, Log};
 use log::{debug, error, info, warn};
 use notify::{self, DebouncedEvent, RecursiveMode, Watcher};
@@ -31,7 +31,7 @@ const DPS_REPORT_API: &str = "https://dps.report/uploadContent";
 const WATCH_DELAY_SECONDS: u64 = 2;
 const RETRY_DELAY: Duration = Duration::from_secs(5);
 
-#[derive(Clap, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)]
 #[clap(version = "0.1")]
 struct Opts {
     /// The configuration file path.
@@ -41,7 +41,7 @@ struct Opts {
     subcmd: SubCommand,
 }
 
-#[derive(Clap, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)]
 enum SubCommand {
     Watch(Watch),
     Upload(Upload),
@@ -50,14 +50,14 @@ enum SubCommand {
 /// Use the watch mode to automatically handle new logs.
 ///
 /// This watches the given directory for new files and then zips and uploads them.
-#[derive(Clap, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)]
 struct Watch {
     /// The directory to watch.
     dirname: PathBuf,
 }
 
 /// Upload a single log, as it would be done by the automatic watcher.
-#[derive(Clap, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)]
 struct Upload {
     /// The log to upload.
     path: PathBuf,
-- 
cgit v1.2.3