Specified more values in toolchain file (#8)

* Specified more values in toolchain file

* fixed clippy errors and suppressed the placeholders

* fmt

* fixed pre releease for aarch64-unknown-linux-gnu

* implemented config loading. NOTE: need to specify non-linux systems

* Update rust-toolchain.toml

---------

Co-authored-by: shivanandvp <[email protected]>

.github/workflows/pre_release.yml

@@ -115,6 +115,9 @@ jobs:
         with:
           name: ${{ matrix.target }} Unstable
           path: output
+      - name: Install dependencies
+        id: install_dependencies
+        run: apt-get install libssl-dev openssl
       - name: 🖩 Generate CheckSum
         id: generate_checksum_step
         run: |

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "1"
 members = [
     "paxy",
     "paxy_build", "paxy_install",

paxy/Cargo.toml

@@ -17,9 +17,11 @@ categories = ["development-tools::build-utils", "command-line-utilities"]
 
 [dependencies]
 clap = { version = "4.0", features = ["derive", "help"] }
+home = "0.5.9"
 pollster = "0.3"
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 snafu = "0.7"
+toml = "0.8.10"
 url = { version = "2.3", features = ["serde"] }

paxy/src/config.rs

@@ -1,17 +1,72 @@
 use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
+use std::{
+    fs::{self, create_dir_all, File}, io::Write, path::PathBuf
+};
 use url::Url;
 
-#[derive(Default, Serialize, Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct Config {
-    pub repositories: Vec<Url>,
-    pub system_install_location: Option<PathBuf>,
-    pub user_install_location: Option<PathBuf>,
-    pub default_install_type: Option<InstallType>,
+    pub repositories: Option<Vec<Url>>,
+    pub system_install_location: PathBuf,
+    pub user_install_location: PathBuf,
+    pub default_install_type: InstallType,
 }
 
-#[derive(Serialize, Deserialize)]
+impl Default for Config {
+    fn default() -> Self {
+        let mut user: PathBuf = match home::home_dir() {
+            Some(path) => path,
+            None => panic!("Impossible to get your home dir!"),
+        };
+        user.push(".paxy");
+        user.push("pkgs");
+        let system = if cfg!(linux) {
+            PathBuf::from("/")
+        } else {
+            PathBuf::from("")
+        };
+
+        let conf = Config {
+            repositories: Some(vec![
+                Url::parse("https://github.com/Pax-Hub/Packages.git").unwrap()
+            ]),
+            user_install_location: user.clone(), // Not harmful since the value is dropped in the very next line
+            system_install_location: system,
+            default_install_type: InstallType::default(),
+        };
+        if !user.is_dir() {
+            create_dir_all(user.clone()).expect("No permission"); // Not harmful since the value is dropped in the soon
+            user.pop();
+            user.push("config.ini");
+            if user.is_file() {
+                fs::remove_file(user.clone()).unwrap();
+            }
+            if !user.is_file() {
+                let mut file = File::create(user).unwrap();
+                file.write_all(toml::to_string(&conf).unwrap().as_bytes()).expect("Permission error");
+            }
+        }
+        conf
+    }
+}
+
+#[derive(Serialize, Deserialize, Default)]
 pub enum InstallType {
     User,
+    #[default]
     System,
 }
+
+#[allow(dead_code)]
+fn load_conf() -> Config {
+    let mut conf_path: PathBuf = match home::home_dir() {
+        Some(path) => path,
+        None => panic!("Impossible to get your home dir!"),
+    };
+    conf_path.push(".paxy");
+    conf_path.push("config.ini");
+    match toml::from_str::<Config>(fs::read_to_string(&conf_path).unwrap().as_str()) {
+        Ok(val) => val,
+        Err(_) => Config::default()
+    }
+}

paxy_build/src/lib.rs

@@ -1 +1 @@
-pub mod package;
+pub mod package;

paxy_build/src/package.rs

@@ -4,9 +4,6 @@ use snafu::prelude::*;
 use std::{fmt::Display, path::PathBuf, str::FromStr};
 use url::Url;
 
-#[cfg(feature = "nested_sources")]
-pub use nested_sources::*;
-
 lazy_static! {
     static ref MANIFEST_FILE_STEM: &'static str = "manifest";
 }
@@ -187,7 +184,9 @@ mod nested_sources {
         static ref MAX_DEPTH: usize = 5;
     }
 
+    #[allow(dead_code)]
     fn parse_packages(package_path: &Path) -> Result<Vec<Package>, Error> {
+        #[allow(clippy::manual_try_fold)]
         let packages = WalkDir::new(package_path)
             .follow_links(true) // to respect symlinks
             .min_depth(*MIN_DEPTH) // to at least look inside the directory
@@ -202,10 +201,10 @@ mod nested_sources {
                 |mut acc: Result<Option<Vec<Package>>, Error>,
                  manifest_path: PathBuf|
                  -> Result<Option<Vec<Package>>, Error> {
-                    let package: Result<Package, Error> = match manifest_path.extension().map(|e| {
-                        e.to_str()
-                            .map(|es| TryInto::<ManifestFileExtensions>::try_into(es))
-                    }) {
+                    let package: Result<Package, Error> = match manifest_path
+                        .extension()
+                        .map(|e| e.to_str().map(TryInto::<ManifestFileExtensions>::try_into))
+                    {
                         Some(Some(Ok(ManifestFileExtensions::Yaml))) => serde_yaml::from_reader(
                             File::open(&manifest_path).context(ManifestCannotBeReadSnafu {
                                 path: &manifest_path,

rust-toolchain.toml

@@ -7,3 +7,4 @@ targets = [
     "aarch64-unknown-linux-gnu",
     "aarch64-apple-darwin",
 ]
+components = ["rustc", "cargo", "rust-std", "rustfmt"]