From 248bdbbb7b8e1aeb5fb11a145a81923a88632a43 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 31 Jan 2018 14:36:29 +1100 Subject: [PATCH] Add database for version information --- Cargo.lock | 1 + Cargo.toml | 2 +- src/installer.rs | 47 +++++++++++++++++++++++++++++++++++++++++++- src/sources/types.rs | 2 +- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 306f531..9b8b5b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -680,6 +680,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a1c96ce..59a938b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ toml = "0.4" nfd = "0.0.4" -semver = "0.9.0" +semver = {version = "0.9.0", features = ["serde"]} regex = "0.2" zip = "0.2.8" diff --git a/src/installer.rs b/src/installer.rs index 4068d54..a92dcff 100644 --- a/src/installer.rs +++ b/src/installer.rs @@ -6,6 +6,8 @@ use regex::Regex; use zip::ZipArchive; +use serde_json; + use number_prefix::{decimal_prefix, Prefixed, Standalone}; use std::fs::create_dir_all; @@ -21,6 +23,7 @@ use std::path::PathBuf; use std::io::Cursor; use std::io::copy; +use std::io::Write; use std::sync::Arc; use std::sync::Mutex; @@ -30,6 +33,8 @@ use config::Config; use http::stream_file; +use sources::types::Version; + /// A message thrown during the installation of packages. #[derive(Serialize)] pub enum InstallMessage { @@ -49,6 +54,14 @@ struct DownloadProgress { downloaded: usize, } +/// Tracks the state of a local installation +#[derive(Debug, Serialize, Deserialize)] +struct LocalInstallation { + name: String, + version: Version, + files: Vec, +} + impl InstallerFramework { /// Returns a copy of the configuration. pub fn get_config(&self) -> Config { @@ -117,6 +130,8 @@ impl InstallerFramework { let mut count = 0.0 as f64; let max = to_install.len() as f64; + let mut installed_packages = Vec::new(); + for package in to_install.iter() { let base_package_percentage = count / max; let base_package_range = ((count + 1.0) / max) - base_package_percentage; @@ -161,6 +176,8 @@ impl InstallerFramework { None => return Err(format!("No release with correct file found")), }; + let latest_version = latest_result.version.clone(); + // Find the matching file in here let latest_file = latest_result .files @@ -221,6 +238,8 @@ impl InstallerFramework { println!("File downloaded successfully"); // Extract this downloaded file + let mut installed_files = Vec::new(); + // TODO: Handle files other then zips // TODO: Make database for uninstall let data = data_storage.lock().unwrap(); @@ -252,6 +271,8 @@ impl InstallerFramework { let target_path = path.join(file.name()); println!("target_path: {:?}", target_path); + installed_files.push(file.name().to_owned()); + // Check to make sure this isn't a directory if file.name().ends_with("/") || file.name().ends_with("\\") { // Create this directory and move on @@ -278,13 +299,37 @@ impl InstallerFramework { // Cross the streams match copy(&mut file, &mut target_file) { Ok(v) => v, - Err(v) => return Err(format!("Unable to open write file: {:?}", v)), + Err(v) => return Err(format!("Unable to write to file: {:?}", v)), }; } + // Save metadata about this package + installed_packages.push(LocalInstallation { + name: package.name.to_owned(), + version: latest_version, + files: installed_files, + }); + count += 1.0; } + // Make copy of metadata + // TODO: Combine with already installed database, if needed + let metadata_compiled = serde_json::to_string(&installed_packages).unwrap(); + + { + let metadata_path = path.join("metadata.json"); + let mut metadata_file = match File::create(metadata_path) { + Ok(v) => v, + Err(v) => return Err(format!("Unable to open file handle: {:?}", v)), + }; + + match metadata_file.write_all(metadata_compiled.as_bytes()) { + Ok(v) => v, + Err(v) => return Err(format!("Unable to write to file: {:?}", v)), + }; + } + // Copy installer binary to target directory messages .send(InstallMessage::Status( diff --git a/src/sources/types.rs b/src/sources/types.rs index 5c740e9..8847e28 100644 --- a/src/sources/types.rs +++ b/src/sources/types.rs @@ -9,7 +9,7 @@ pub use semver::Version as SemverVersion; pub use toml::value::Value as TomlValue; /// The version of an application. -#[derive(Debug, Eq, PartialEq, Clone)] +#[derive(Debug, Eq, PartialEq, Clone, Serialize, Deserialize)] pub enum Version { Semver(SemverVersion), Integer(u64),