From ca64b8d41db7428e277ac19aaf1e4c3f46021d1b Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Fri, 4 Aug 2023 20:22:30 +0200
Subject: [PATCH] feat: updated wishes url extractor to use new cache storage

---
 src/ui/main/mod.rs | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/ui/main/mod.rs b/src/ui/main/mod.rs
index ede1533..db1380b 100644
--- a/src/ui/main/mod.rs
+++ b/src/ui/main/mod.rs
@@ -728,19 +728,28 @@ impl SimpleComponent for App {
 
                 let web_cache = config.game.path.for_edition(config.launcher.edition)
                     .join(config.launcher.edition.data_folder())
-                    .join("webCaches/Cache/Cache_Data/data_2");
+                    .join("webCaches");
 
-                if !web_cache.exists() {
-                    tracing::error!("Couldn't find wishes URL: cache file doesn't exist");
+                // Find newest cache folder
+                let mut web_cache_id = None;
 
-                    sender.input(AppMsg::Toast {
-                        title: tr!("wish-url-search-failed"),
-                        description: None
-                    });
+                if let Ok(entries) = web_cache.read_dir() {
+                    for entry in entries.flatten() {
+                        if entry.path().is_dir() &&
+                           entry.file_name().to_string_lossy().trim_matches(|c| "0123456789.".contains(c)).is_empty() &&
+                           Some(entry.file_name()) > web_cache_id
+                        {
+                            web_cache_id = Some(entry.file_name());
+                        }
+                    }
                 }
 
-                else {
-                    match std::fs::read(&web_cache) {
+                if let Some(web_cache_id) = web_cache_id {
+                    let web_cache = web_cache
+                        .join(web_cache_id)
+                        .join("Cache/Cache_Data/data_2");
+
+                    match std::fs::read(web_cache) {
                         Ok(web_cache) => {
                             let web_cache = String::from_utf8_lossy(&web_cache);
 
@@ -779,6 +788,15 @@ impl SimpleComponent for App {
                         }
                     }
                 }
+
+                else {
+                    tracing::error!("Couldn't find wishes URL: cache file doesn't exist");
+
+                    sender.input(AppMsg::Toast {
+                        title: tr!("wish-url-search-failed"),
+                        description: None
+                    });
+                }
             }));
         })));