Merge branch 'main' into patching

This commit is contained in:
SpikeHD
2022-07-15 21:14:16 -07:00
25 changed files with 331 additions and 150 deletions

View File

@@ -1,22 +1,22 @@
#![cfg_attr(
all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows"
all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows"
)]
use once_cell::sync::Lazy;
use std::{sync::Mutex, collections::HashMap};
use std::{collections::HashMap, sync::Mutex};
use std::thread;
use structs::APIQuery;
use sysinfo::{System, SystemExt};
use structs::{APIQuery};
mod structs;
mod system_helpers;
mod file_helpers;
mod unzip;
mod downloader;
mod file_helpers;
mod lang;
mod proxy;
mod structs;
mod system_helpers;
mod unzip;
mod web;
mod metadata_patcher;
@@ -163,7 +163,7 @@ async fn get_theme_list(data_dir: String) -> Vec<HashMap<String, String>> {
map.insert("json".to_string(), theme_json);
map.insert("path".to_string(), path.to_str().unwrap().to_string());
// Push key-value pair containing "json" and "path"
themes.push(map);
}