Massive GUI code improvements!

Almost all data initialization and processing happens through druid

Tokio removed for now, web requests block again
This commit is contained in:
2022-09-25 23:50:07 -07:00
parent 762d96baee
commit 38c975b44c
4 changed files with 349 additions and 234 deletions

View File

@@ -0,0 +1,166 @@
use crate::AppData;
use druid::{
widget::*, BoxConstraints, Env, Event, EventCtx, FileDialogOptions, LayoutCtx, LifeCycle,
LifeCycleCtx, PaintCtx, Selector, Size, UpdateCtx, WidgetExt, WidgetPod,
};
use std::{fs, io, path::PathBuf};
pub const ATTEMPT_INSTALL: Selector = Selector::new("town-of-us-updater.attempt_install");
pub struct AmongUsLauncherWidget {
pub root: WidgetPod<AppData, Flex<AppData>>,
}
impl AmongUsLauncherWidget {
pub fn build_widget(&mut self, data: &AppData) {
let mut flex: Flex<AppData> = Flex::column();
// Find existing installs, make buttons for them
let install_iter = fs::read_dir(data.installs_path.clone());
if let Ok(iter) = install_iter {
let mut collection: Vec<Result<fs::DirEntry, io::Error>> = iter.collect();
collection.reverse();
if collection.is_empty() {
if data.among_us_path.is_empty() {
// We did not find an install path, let's add a button to prompt the user
// to find their install path
let open_button = Button::new("Locate Among Us")
.fix_height(45.0)
.on_click(move |ctx, _: &mut AppData, _| {
ctx.submit_command(
druid::commands::SHOW_OPEN_PANEL.with(FileDialogOptions::new()),
);
})
.center();
flex.add_flex_child(open_button, 1.0);
} else {
let label: druid::widget::Label<AppData> =
druid::widget::Label::new("We found Among Us but you have no installs");
flex.add_flex_child(label, 1.0);
}
} else {
// Iterate first to find labels:
let mut flexbox_array: Vec<druid::widget::Flex<AppData>> = Vec::new();
let mut auv_array: Vec<String> = Vec::new();
for i in &collection {
let existing_ver_smash = i.as_ref().unwrap().file_name();
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
let auv = ver_smash_split.next().unwrap();
if !auv_array.contains(&auv.to_string()) {
let label_text = format!("Among Us {}", auv);
let flex: druid::widget::Flex<AppData> = druid::widget::Flex::column()
.with_flex_child(
druid::widget::Label::new(label_text.as_str()).with_text_size(24.0),
1.0,
)
.with_default_spacer();
flexbox_array.push(flex);
auv_array.push(auv.to_string());
}
}
println!("Installs list:");
for i in collection {
let existing_ver_smash = i.unwrap().file_name();
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
let auv = ver_smash_split.next().unwrap();
let button_string: String =
format!("Town of Us {}", ver_smash_split.next().unwrap());
for (index, j) in auv_array.iter().enumerate() {
if j == auv {
let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
clone.push(existing_ver_smash.clone());
let mut button_row: Flex<AppData> = Flex::row();
let fybutton = druid::widget::Button::new(button_string.as_str())
.fix_height(45.0)
.center()
.on_click(move |_, _: &mut AppData, _| {
crate::attempt_run_among_us(&clone);
// crate::launch_better_crewlink().unwrap();
});
button_row.add_flex_child(fybutton, 1.0);
// TODO: Uncomment
// let delete_button = druid::widget::Button::new("Delete")
// .fix_height(45.0)
// .on_click(move |_, _: &mut AppData, _| {});
// button_row.add_flex_child(delete_button, 1.0);
flexbox_array
.get_mut(index)
.unwrap()
.add_flex_child(button_row, 1.0);
println!("- {}", existing_ver_smash.clone().to_str().unwrap());
}
}
}
for i in flexbox_array {
flex.add_flex_child(i, 1.0);
}
}
}
self.root = WidgetPod::new(flex);
}
}
impl Widget<AppData> for AmongUsLauncherWidget {
fn event(&mut self, ctx: &mut EventCtx, event: &Event, data: &mut AppData, env: &Env) {
// println!("{:?}", event);
// println!("{:?}", data);
match event {
Event::MouseDown(_a) => {
// println!("Mouse Down!");
self.root.event(ctx, event, data, env);
}
Event::WindowConnected => {
self.build_widget(data);
ctx.children_changed();
}
_ => {
self.root.event(ctx, event, data, env);
}
}
}
fn lifecycle(&mut self, ctx: &mut LifeCycleCtx, event: &LifeCycle, data: &AppData, env: &Env) {
self.root.lifecycle(ctx, event, data, env);
// println!("Lifecycle!")
}
fn update(&mut self, ctx: &mut UpdateCtx, old_data: &AppData, data: &AppData, env: &Env) {
self.root.update(ctx, data, env);
if old_data.among_us_path.is_empty() && !data.among_us_path.is_empty() {
ctx.submit_command(ATTEMPT_INSTALL);
println!("Detect Stuff");
}
// println!("Update!");
self.build_widget(data);
ctx.children_changed();
}
fn layout(
&mut self,
ctx: &mut LayoutCtx,
bc: &BoxConstraints,
data: &AppData,
env: &Env,
) -> Size {
self.root.layout(ctx, bc, data, env);
// println!("Layout!");
bc.constrain((400.0, 400.0))
}
fn paint(&mut self, ctx: &mut PaintCtx, data: &AppData, env: &Env) {
self.root.paint(ctx, data, env);
// println!("Paint!");
}
}

View File

@@ -1,6 +1,7 @@
use druid::Data;
use std::fmt; use std::fmt;
#[derive(Ord, PartialOrd, Eq, PartialEq)] #[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug, Data)]
pub struct AmongUsVersion { pub struct AmongUsVersion {
year: i32, year: i32,
month: i32, month: i32,
@@ -13,6 +14,16 @@ impl fmt::Display for AmongUsVersion {
} }
} }
impl Default for AmongUsVersion {
fn default() -> Self {
AmongUsVersion {
year: 0,
month: 0,
day: 0,
}
}
}
impl From<&str> for AmongUsVersion { impl From<&str> for AmongUsVersion {
fn from(s: &str) -> AmongUsVersion { fn from(s: &str) -> AmongUsVersion {
// Ignore a prepending "v" // Ignore a prepending "v"

View File

@@ -1,19 +1,18 @@
// Modules // Modules
mod among_us_launcher_widget;
mod among_us_version; mod among_us_version;
mod semver; mod semver;
// Uses // Uses
use among_us_launcher_widget::*;
use among_us_version::*; use among_us_version::*;
use semver::*; use semver::*;
use std::{ use std::{
cell::RefCell, fs,
fs, io,
path::{Path, PathBuf}, path::{Path, PathBuf},
process, process, str,
rc::Rc,
str,
}; };
use fs_extra::{copy_items, dir}; use fs_extra::{copy_items, dir};
@@ -24,16 +23,20 @@ use registry::Hive;
// GUI stuff // GUI stuff
use druid::{ use druid::{
commands, widget::*, AppDelegate, AppLauncher, Application, Data, DelegateCtx, Env, commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
FileDialogOptions, Handled, Target, WidgetExt, WindowDesc, WidgetPod, WindowDesc, WindowId,
}; };
struct Delegate; struct Delegate;
#[derive(Data, Clone)] #[derive(Data, Clone, Debug)]
struct AppData { pub struct AppData {
pub among_us_path: Rc<RefCell<String>>, pub among_us_path: String,
pub installs_path: String, pub installs_path: String,
pub version: SemVer,
pub initialized: bool,
pub among_us_version: AmongUsVersion,
pub data_path: String,
} }
static AMONG_US_APPID: &str = "945360"; static AMONG_US_APPID: &str = "945360";
@@ -69,7 +72,7 @@ fn unmod_among_us_folder(folder_path: &Path) {
fs::remove_dir_all(mono_path).unwrap_or_default(); fs::remove_dir_all(mono_path).unwrap_or_default();
} }
async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error> { async fn _get_latest_updater_version() -> Result<(String, String), reqwest::Error> {
let version = env!("CARGO_PKG_VERSION"); let version = env!("CARGO_PKG_VERSION");
let local_sem_ver = SemVer::from(version); let local_sem_ver = SemVer::from(version);
@@ -115,6 +118,14 @@ async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error
} }
impl AppDelegate<AppData> for Delegate { impl AppDelegate<AppData> for Delegate {
fn window_added(
&mut self,
_id: WindowId,
_data: &mut AppData,
_env: &Env,
_ctx: &mut DelegateCtx,
) {
}
fn command( fn command(
&mut self, &mut self,
_ctx: &mut DelegateCtx, _ctx: &mut DelegateCtx,
@@ -123,119 +134,41 @@ impl AppDelegate<AppData> for Delegate {
data: &mut AppData, data: &mut AppData,
_env: &Env, _env: &Env,
) -> Handled { ) -> Handled {
// println!("Command!");
if let Some(file_info) = cmd.get(commands::OPEN_FILE) { if let Some(file_info) = cmd.get(commands::OPEN_FILE) {
println!("{:?}", file_info);
let among_us_folder = file_info.path(); let among_us_folder = file_info.path();
let mut buf = among_us_folder.to_path_buf(); let mut buf = among_us_folder.to_path_buf();
buf.pop(); buf.pop();
let mut borrow = data.among_us_path.borrow_mut(); data.among_us_path = String::from(buf.to_str().unwrap());
*borrow = String::from(buf.to_str().unwrap());
// Pop the selected file off the end of the path // Pop the selected file off the end of the path
// among_us_folder.pop(); // among_us_folder.pop();
println!("{}", buf.to_str().unwrap()); println!("{}", buf.to_str().unwrap());
println!("Handled!"); // println!("Handled!");
Application::global().quit(); //Application::global().quit();
return Handled::Yes; return Handled::Yes;
} } else if let Some(_a) = cmd.get(among_us_launcher_widget::ATTEMPT_INSTALL) {
Handled::No
}
}
#[tokio::main]
async fn main() {
let version = env!("CARGO_PKG_VERSION");
let title_string: String = format!("Town of Us Updater - {}", version);
println!("Updater Version: {}", version);
get_latest_updater_version().await.unwrap();
// CREATE PROGRAM DIRECTORY
let mut data_path = dirs::data_dir().unwrap();
data_path.push("town-of-us-updater");
fs::create_dir(data_path.clone()).unwrap_or(());
let mut installs_path = data_path.clone();
installs_path.push("installs");
fs::create_dir(installs_path.clone()).unwrap_or(());
let app_data: AppData = AppData {
among_us_path: Rc::new(RefCell::new(String::from(""))),
installs_path: String::from(""),
};
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
// DETERMINE AMONG US VERSION
let mut among_us_folder = PathBuf::new();
let mut existing_file_path = data_path.clone();
existing_file_path.push("existing_among_us_dir.txt");
let existing_found_folder = fs::read_to_string(existing_file_path.clone());
if let Ok(existing_folder) = existing_found_folder {
among_us_folder.push(existing_folder);
} else {
let folder_opt = detect_among_us_folder();
if folder_opt.is_some() {
among_us_folder.push(folder_opt.unwrap());
} else {
let open_button = Button::new("Locate Among Us").fix_height(45.0).on_click(
move |ctx, _: &mut AppData, _| {
ctx.submit_command(
druid::commands::SHOW_OPEN_PANEL.with(FileDialogOptions::new()),
);
},
);
// If we can't find Among Us, add the locate button.
// TODO: make this button then update the UI assuming it's valid
root_column.add_flex_child(open_button, 1.0);
// Pop the selected file off the end of the path
// among_us_folder.pop();
}
if among_us_folder.exists() {
fs::write(existing_file_path, among_us_folder.to_str().unwrap()).unwrap();
}
}
if let Some(among_us_folder_str) = among_us_folder.to_str() {
if among_us_folder_str.len() > 0 {
println!("Among Us Folder: {}", among_us_folder_str);
} else {
println!("Among Us Folder not automatically determined");
}
}
if let Some(among_us_version) = if let Some(among_us_version) =
determine_among_us_version(String::from(among_us_folder.to_str().unwrap())) determine_among_us_version(String::from(data.among_us_path.clone()))
{ {
data.among_us_version = among_us_version.clone();
println!("AmongUsVersion: {}", among_us_version); println!("AmongUsVersion: {}", among_us_version);
let ver_url: (String, String, bool) = let ver_url: (String, String, bool) =
determine_town_of_us_url(among_us_version.to_string().clone()) determine_town_of_us_url(among_us_version.to_string().clone()).unwrap();
.await
.unwrap();
let version_smash = format!("{}-{}", among_us_version, ver_url.0.clone()); let version_smash = format!("{}-{}", among_us_version, ver_url.0.clone());
let new_installed_path: PathBuf = [installs_path.to_str().unwrap(), version_smash.as_str()] let new_installed_path: PathBuf =
[data.installs_path.as_str(), version_smash.as_str()]
.iter() .iter()
.collect(); .collect();
if !Path::exists(&new_installed_path) { if !Path::exists(&new_installed_path) {
println!("Copying Among Us to cache location..."); println!("Copying Among Us to cache location...");
copy_folder_to_target( copy_folder_to_target(data.among_us_path.clone(), data.installs_path.clone());
among_us_folder.to_str().unwrap(),
installs_path.to_str().unwrap(),
);
let among_us_path: PathBuf = [installs_path.to_str().unwrap(), "Among Us\\"] let among_us_path: PathBuf =
.iter() [data.installs_path.as_str(), "Among Us\\"].iter().collect();
.collect();
if !among_us_path.to_str().unwrap().contains("Among Us") { if !among_us_path.to_str().unwrap().contains("Among Us") {
process::exit(0); process::exit(0);
@@ -255,18 +188,19 @@ async fn main() {
fs::set_permissions(among_us_path.clone(), perms).unwrap(); fs::set_permissions(among_us_path.clone(), perms).unwrap();
fs::rename(among_us_path, new_installed_path.clone()).unwrap(); fs::rename(among_us_path, new_installed_path.clone()).unwrap();
let mut download_path = data_path.clone(); let mut download_path: PathBuf = [data.data_path.as_str()].iter().collect();
let downloaded_filename = ver_url.1.rsplit('/').next().unwrap(); let downloaded_filename: &str = ver_url.1.rsplit('/').next().unwrap();
download_path.push(downloaded_filename.clone()); download_path.push(downloaded_filename);
if !Path::exists(&download_path) { if !download_path.exists() {
// println!("{:?}", download_path); // println!("{:?}", download_path);
println!("Downloading Town of Us... [{}]", ver_url.1.clone()); println!(
let zip = reqwest::get(ver_url.1.clone()) "Downloading Town of Us... Please be patient! [{}]",
.await ver_url.1.clone()
);
let zip = reqwest::blocking::get(ver_url.1.clone())
.unwrap() .unwrap()
.bytes() .bytes()
.await
.unwrap(); .unwrap();
fs::write(download_path.clone(), zip).unwrap(); fs::write(download_path.clone(), zip).unwrap();
} }
@@ -274,7 +208,7 @@ async fn main() {
let opened_zip = fs::File::open(download_path.clone()).unwrap(); let opened_zip = fs::File::open(download_path.clone()).unwrap();
println!("Extracting mod zip file..."); println!("Extracting mod zip file...");
let mut archive = zip::ZipArchive::new(opened_zip).unwrap(); let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
archive.extract(data_path.clone()).unwrap(); archive.extract(data.data_path.clone()).unwrap();
fs::remove_file(download_path).unwrap(); fs::remove_file(download_path).unwrap();
@@ -284,7 +218,7 @@ async fn main() {
break; break;
} }
let extracted_path: PathBuf = let extracted_path: PathBuf =
[data_path.to_str().unwrap(), root_folder_path.as_str(), "."] [data.data_path.as_str(), root_folder_path.as_str(), "."]
.iter() .iter()
.collect(); .collect();
println!("{}", extracted_path.to_str().unwrap()); println!("{}", extracted_path.to_str().unwrap());
@@ -292,84 +226,71 @@ async fn main() {
extracted_path.to_str().unwrap(), extracted_path.to_str().unwrap(),
new_installed_path.to_str().unwrap(), new_installed_path.to_str().unwrap(),
); );
}
}
return Handled::Yes;
}
Handled::No
}
}
fn main() {
let version = env!("CARGO_PKG_VERSION");
let title_string: String = format!("Town of Us Updater - {}", version);
// println!("Updater Version: {}", version);
// get_latest_updater_version().await.unwrap();
// CREATE PROGRAM DIRECTORY
let mut data_path = dirs::data_dir().unwrap();
data_path.push("town-of-us-updater");
fs::create_dir(data_path.clone()).unwrap_or(());
let mut installs_path = data_path.clone();
installs_path.push("installs");
fs::create_dir(installs_path.clone()).unwrap_or(());
let version = env!("CARGO_PKG_VERSION");
let mut among_us_folder = PathBuf::new();
let mut existing_file_path = data_path.clone();
existing_file_path.push("existing_among_us_dir.txt");
let existing_found_folder = fs::read_to_string(existing_file_path.clone());
if let Ok(existing_folder) = existing_found_folder {
among_us_folder.push(existing_folder);
} else { } else {
println!("Modded install already found"); let folder_opt: Option<String> = detect_among_us_folder();
if folder_opt.is_some() {
among_us_folder.push(folder_opt.unwrap());
} }
// Find existing installs, make buttons for them if among_us_folder.exists() {
let install_iter = fs::read_dir(installs_path.clone()); fs::write(existing_file_path, among_us_folder.to_str().unwrap()).unwrap();
if let Ok(iter) = install_iter {
let mut collection: Vec<Result<fs::DirEntry, io::Error>> = iter.collect();
collection.reverse();
// Iterate first to find labels:
let mut flexbox_array: Vec<druid::widget::Flex<AppData>> = Vec::new();
let mut auv_array: Vec<String> = Vec::new();
for i in &collection {
let existing_ver_smash = i.as_ref().unwrap().file_name();
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
let auv = ver_smash_split.next().unwrap();
if !auv_array.contains(&auv.to_string()) {
let label_text = format!("Among Us {}", auv);
let flex: druid::widget::Flex<AppData> = druid::widget::Flex::column()
.with_flex_child(
druid::widget::Label::new(label_text.as_str()).with_text_size(24.0),
1.0,
)
.with_default_spacer();
flexbox_array.push(flex);
auv_array.push(auv.to_string());
} }
} }
println!("Installs list:"); let app_data: AppData = AppData {
among_us_path: String::from(among_us_folder.clone().to_str().unwrap()),
installs_path: String::from(installs_path.clone().to_str().unwrap()),
version: SemVer::from(version),
initialized: false,
among_us_version: AmongUsVersion::default(),
data_path: String::from(data_path.clone().to_str().unwrap()),
};
for i in collection { let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
let existing_ver_smash = i.unwrap().file_name();
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
let auv = ver_smash_split.next().unwrap();
let button_string: String =
format!("Town of Us {}", ver_smash_split.next().unwrap());
for (index, j) in auv_array.iter().enumerate() { // DETERMINE AMONG US VERSION
if j == auv {
let mut clone = installs_path.clone();
clone.push(existing_ver_smash.clone());
let mut button_row: Flex<AppData> = Flex::row(); if let Some(among_us_folder_str) = among_us_folder.to_str() {
if among_us_folder_str.len() > 0 {
let fybutton = druid::widget::Button::new(button_string.as_str()) println!("Among Us Folder: {}", among_us_folder_str);
.fix_height(45.0) } else {
.center() println!("Among Us Folder not automatically determined");
.on_click(move |_, _: &mut AppData, _| {
attempt_run_among_us(&clone);
});
button_row.add_flex_child(fybutton, 1.0);
// TODO: Uncomment
// let delete_button = druid::widget::Button::new("Delete")
// .fix_height(45.0)
// .on_click(move |_, _: &mut AppData, _| {});
// button_row.add_flex_child(delete_button, 1.0);
flexbox_array
.get_mut(index)
.unwrap()
.add_flex_child(button_row, 1.0);
println!("- {}", existing_ver_smash.clone().to_str().unwrap());
}
}
}
for i in flexbox_array {
root_column.add_flex_child(i, 1.0);
}
} }
} }
@@ -381,38 +302,55 @@ async fn main() {
println!("Launching main window..."); println!("Launching main window...");
let _main_menu: druid::MenuDesc<AppData> =
druid::MenuDesc::empty().append(druid::MenuItem::new(
druid::LocalizedString::new("File"),
druid::Command::new(druid::Selector::new("test"), 0, Target::Auto),
));
let widget: AmongUsLauncherWidget = AmongUsLauncherWidget {
root: WidgetPod::new(Flex::column()),
};
root_column.add_flex_child(widget, 1.0);
launch_better_crewlink().unwrap_or(());
let main_window = WindowDesc::new(|| root_column) let main_window = WindowDesc::new(|| root_column)
.title(title_string) .title(title_string)
// .menu(main_menu)
.window_size((400.0, 400.0)); .window_size((400.0, 400.0));
let app_launcher = AppLauncher::with_window(main_window); let app_launcher = AppLauncher::with_window(main_window).delegate(Delegate {});
let _external_handler = app_launcher.get_external_handle(); let _external_handler = app_launcher.get_external_handle();
app_launcher.launch(app_data).unwrap(); app_launcher.launch(app_data).unwrap();
}
// let mut install_folder_path = installs_path.clone(); fn launch_better_crewlink() -> std::result::Result<(), String> {
// install_folder_path.push(version_smash); let mut dir = dirs::data_local_dir().unwrap();
// fs::create_dir(install_folder_path.clone()).unwrap_or(()); dir.push("Programs");
dir.push("bettercrewlink");
// Copy Among Us Out dir.push("Better-CrewLink.exe");
// Create destination path println!("Attempting to launch Better Crew Link");
if dir.exists() {
// let executable_path: path::PathBuf = [new_installed_path.to_str().unwrap(), "Among Us.exe"] process::Command::new(dir.as_path().to_str().unwrap())
// .iter() .stdout(process::Stdio::null())
// .collect(); .stderr(process::Stdio::null())
.spawn()
// process::Command::new(executable_path.to_str().unwrap()) .unwrap();
// .spawn() Ok(())
// .unwrap(); } else {
Err("Better Crew Link not found".to_string())
}
} }
// Returns (Version, URL) // Returns (Version, URL)
async fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> { fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> {
let markdown = let markdown = reqwest::blocking::get(
reqwest::get("https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md") "https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md",
.await )
.unwrap() .unwrap()
.text() .text()
.await
.unwrap(); .unwrap();
let mut line = markdown.find(&among_us_version); let mut line = markdown.find(&among_us_version);
let mut line_offset = 0; let mut line_offset = 0;
let mut official_compatibility = false; let mut official_compatibility = false;
@@ -500,12 +438,12 @@ fn copy_folder_contents_to_target<T: AsRef<Path>>(source: T, dest: T) {
fs_extra::dir::copy(source, dest, &copy_opts).unwrap(); fs_extra::dir::copy(source, dest, &copy_opts).unwrap();
} }
fn detect_steam() -> Option<String> { fn _detect_steam() -> Option<String> {
None None
} }
fn detect_epic() -> Option<String> { fn _detect_epic() -> Option<String> {
let default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs"); let _default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs");
None None
} }

View File

@@ -5,7 +5,7 @@
// Uses // Uses
use std::fmt; use std::fmt;
#[derive(Clone, Ord, PartialOrd, Eq, PartialEq)] #[derive(druid::Data, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)]
pub struct SemVer { pub struct SemVer {
pub major: i32, pub major: i32,
pub minor: i32, pub minor: i32,