Merge branch 'gamemode-filters'

1 files changed, 15 insertions, 5 deletions

diff --git a/src/main.rs b/src/main.rs
index b35f769..365a400 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,7 +17,7 @@ use structopt::StructOpt;
 use walkdir::{DirEntry, WalkDir};
 
 use evtclib::raw::parser::PartialEvtc;
-use evtclib::{Encounter, EventKind, Log, Outcome};
+use evtclib::{Encounter, EventKind, GameMode, Log, Outcome};
 
 mod fexpr;
 mod filters;
@@ -61,16 +61,23 @@ const RETCODE_ERROR: i32 = 2;
 ///     -after DATE             Only include logs from after the given date.
 ///     -boss BOSSES            Only include logs from the given bosses.
 ///     -cm                     Only include logs with challenge mote enabled.
+///     -gamemode MODE          Only include logs from the given game modes.
+///     -raid                   Only include raid logs.
+///     -fractal                Only include fractal logs.
+///     -strike                 Only include strike mission logs.
+///     -golem                  Only include golem logs.
+///     -wvw                    Only include WvW logs.
 ///     -player REGEX           Shorthand to check if any player in the log has the given name.
 ///     -include                Always evaluates to including the log.
 ///     -exclude                Always evaluates to excluding the log.
 ///
 /// BOSS NAMES:
 ///     The following names can be used with the -boss filter:
-///       vg, gorseval, sabetha, slothasor, matthias, kc, xera, cairn,
-///       mo, samarog, deimos, desmina, dhuum, ca, largos, qadim,
-///       adina, sabir, qadimp, ai, skorvald, artsariiv, arkk, mama, siax,
-///       ensolyss, icebrood, fraenir, kodans, boneskinner, whisper.
+///       vg, gorseval, sabetha, slothasor, trio, matthias, kc, xera, cairn,
+///       mo, samarog, deimos, desmina, river, broken king, eater, eyes,
+///       dhuum, ca, largos, qadim, adina, sabir, qadimp, ai, skorvald,
+///       artsariiv, arkk, mama, siax, ensolyss, icebrood, fraenir, kodans,
+///       boneskinner, whisper, standard golem, medium golem, large golem.
 ///     Names can also be comma separated.
 #[derive(StructOpt, Debug)]
 #[structopt(verbatim_doc_comment)]
@@ -180,6 +187,8 @@ pub struct LogResult {
     outcome: FightOutcome,
     /// Whether the fight had the Challenge Mote turned on.
     is_cm: bool,
+    /// The game mode of the fight.
+    game_mode: Option<GameMode>,
 }
 
 /// A player.
@@ -578,6 +587,7 @@ fn extract_info(path: &Path, log: &Log) -> LogResult {
         players,
         outcome: get_fight_outcome(log),
         is_cm: log.is_cm(),
+        game_mode: log.game_mode(),
     }
 }