From 28aa65d3bed7d5c3833ee1c808d6d65c985bc34e Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sat, 19 Oct 2024 19:42:51 +0100
Subject: [PATCH] Refactor to use Info enum (in case we want to add more info
 like game & Java version)

---
 .../analyze_logs/{heuristics.rs => info.rs}   | 20 +++++++++++++++++--
 src/handlers/event/analyze_logs/mod.rs        | 17 ++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)
 rename src/handlers/event/analyze_logs/{heuristics.rs => info.rs} (76%)

diff --git a/src/handlers/event/analyze_logs/heuristics.rs b/src/handlers/event/analyze_logs/info.rs
similarity index 76%
rename from src/handlers/event/analyze_logs/heuristics.rs
rename to src/handlers/event/analyze_logs/info.rs
index 76d9fbd..5979b52 100644
--- a/src/handlers/event/analyze_logs/heuristics.rs
+++ b/src/handlers/event/analyze_logs/info.rs
@@ -3,7 +3,23 @@ use std::sync::OnceLock;
 use log::trace;
 use regex::Regex;
 
-pub fn looks_like_launcher_log(log: &str) -> bool {
+// in future, we can add extra data to display in log analysis like Java version
+pub enum Info {
+	Game,
+	Launcher
+}
+
+pub fn find(log: &str) -> Option<Info> {
+	if looks_like_launcher_log(log) { // launcher logs can sometimes seem like a game log
+		Some(Info::Launcher)
+	} else if looks_like_game_log(log) {
+		Some(Info::Game)
+	} else {
+		None
+	}
+}
+
+fn looks_like_launcher_log(log: &str) -> bool {
 	static QT_LOG_REGEX: OnceLock<Regex> = OnceLock::new();
 
 	trace!("Guessing whether log is launcher log");
@@ -12,7 +28,7 @@ pub fn looks_like_launcher_log(log: &str) -> bool {
 	qt_log.is_match(log)
 }
 
-pub fn looks_like_mc_log(log: &str) -> bool {
+fn looks_like_game_log(log: &str) -> bool {
 	static LOG4J_REGEX: OnceLock<Regex> = OnceLock::new();
 
 	trace!("Guessing whether log is Minecraft log");
diff --git a/src/handlers/event/analyze_logs/mod.rs b/src/handlers/event/analyze_logs/mod.rs
index 316515b..87fec33 100644
--- a/src/handlers/event/analyze_logs/mod.rs
+++ b/src/handlers/event/analyze_logs/mod.rs
@@ -7,6 +7,7 @@ use crate::{
 
 use color_eyre::owo_colors::OwoColorize;
 use eyre::{eyre, OptionExt, Result};
+use info::{find, Info};
 use log::{debug, trace};
 use poise::serenity_prelude::{
 	ButtonStyle, ComponentInteraction, Context, CreateAllowedMentions, CreateButton, CreateEmbed,
@@ -14,7 +15,7 @@ use poise::serenity_prelude::{
 	Message, MessageId, MessageType,
 };
 
-mod heuristics;
+mod info;
 mod issues;
 mod providers;
 
@@ -66,13 +67,10 @@ pub async fn handle_message(ctx: &Context, message: &Message, data: &Data) -> Re
 	};
 
 	let issues = issues::find(&log, data).await?;
-	let launcher_log = heuristics::looks_like_launcher_log(&log);
-	let mc_log = !launcher_log && heuristics::looks_like_mc_log(&log);
+	let info = info::find(&log);
 
-	debug!("Detections: mc_log = {mc_log}, launcher_log = {launcher_log}");
-
-	let show_analysis = !issues.is_empty() || mc_log;
-	let show_upload_prompt = attachment.is_some() && (mc_log || launcher_log);
+	let show_analysis = !issues.is_empty() || matches!(info, Some(Info::Game));
+	let show_upload_prompt = attachment.is_some() && info.is_some();
 
 	if !show_analysis && !show_upload_prompt {
 		debug!("Found log but there is nothing to respond with");
@@ -238,10 +236,7 @@ pub async fn handle_component_interaction(
 			.description(url)
 			.color(Colors::Blue);
 
-		let display_upload_guide =
-			!heuristics::looks_like_launcher_log(&body) && heuristics::looks_like_mc_log(&body);
-
-		if display_upload_guide {
+		if matches!(info::find(&body), Some(Info::Game)) {
 			interaction
 				.create_response(
 					ctx,