From e66ac7d88c21f990c5fe4bce1787f1957835783d Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 26 Nov 2021 22:28:19 +0100 Subject: [PATCH] made some totally very important changes --- .VSCodeCounter/2021-11-26_22-26-06/details.md | 34 +++++++++++++ .../2021-11-26_22-26-06/results.csv | 21 ++++++++ .VSCodeCounter/2021-11-26_22-26-06/results.md | 26 ++++++++++ .../2021-11-26_22-26-06/results.txt | 48 +++++++++++++++++++ src/main.rs | 34 +++++++++++-- src/mods/inssort.rs | 3 +- 6 files changed, 160 insertions(+), 6 deletions(-) create mode 100644 .VSCodeCounter/2021-11-26_22-26-06/details.md create mode 100644 .VSCodeCounter/2021-11-26_22-26-06/results.csv create mode 100644 .VSCodeCounter/2021-11-26_22-26-06/results.md create mode 100644 .VSCodeCounter/2021-11-26_22-26-06/results.txt diff --git a/.VSCodeCounter/2021-11-26_22-26-06/details.md b/.VSCodeCounter/2021-11-26_22-26-06/details.md new file mode 100644 index 0000000..74ae13a --- /dev/null +++ b/.VSCodeCounter/2021-11-26_22-26-06/details.md @@ -0,0 +1,34 @@ +# Details + +Date : 2021-11-26 22:26:06 + +Directory /home/amy/crystal/ame + +Total : 19 files, 1427 codes, 1 comments, 98 blanks, all 1526 lines + +[summary](results.md) + +## Files +| filename | language | code | comment | blank | total | +| :--- | :--- | ---: | ---: | ---: | ---: | +| [Cargo.toml](/Cargo.toml) | TOML | 18 | 1 | 2 | 21 | +| [Makefile](/Makefile) | Makefile | 11 | 0 | 1 | 12 | +| [README.md](/README.md) | Markdown | 45 | 0 | 11 | 56 | +| [src/main.rs](/src/main.rs) | Rust | 105 | 0 | 9 | 114 | +| [src/mods.rs](/src/mods.rs) | Rust | 14 | 0 | 0 | 14 | +| [src/mods/clearcache.rs](/src/mods/clearcache.rs) | Rust | 8 | 0 | 4 | 12 | +| [src/mods/clone.rs](/src/mods/clone.rs) | Rust | 174 | 0 | 20 | 194 | +| [src/mods/database.rs](/src/mods/database.rs) | Rust | 167 | 0 | 5 | 172 | +| [src/mods/help.rs](/src/mods/help.rs) | Rust | 21 | 0 | 3 | 24 | +| [src/mods/inssort.rs](/src/mods/inssort.rs) | Rust | 180 | 0 | 6 | 186 | +| [src/mods/install.rs](/src/mods/install.rs) | Rust | 48 | 0 | 1 | 49 | +| [src/mods/purge.rs](/src/mods/purge.rs) | Rust | 118 | 0 | 3 | 121 | +| [src/mods/search.rs](/src/mods/search.rs) | Rust | 33 | 0 | 4 | 37 | +| [src/mods/strs.rs](/src/mods/strs.rs) | Rust | 111 | 0 | 7 | 118 | +| [src/mods/uninstall.rs](/src/mods/uninstall.rs) | Rust | 118 | 0 | 2 | 120 | +| [src/mods/update.rs](/src/mods/update.rs) | Rust | 14 | 0 | 3 | 17 | +| [src/mods/upgrade.rs](/src/mods/upgrade.rs) | Rust | 201 | 0 | 13 | 214 | +| [src/mods/ver.rs](/src/mods/ver.rs) | Rust | 26 | 0 | 2 | 28 | +| [src/mods/xargs.rs](/src/mods/xargs.rs) | Rust | 15 | 0 | 2 | 17 | + +[summary](results.md) \ No newline at end of file diff --git a/.VSCodeCounter/2021-11-26_22-26-06/results.csv b/.VSCodeCounter/2021-11-26_22-26-06/results.csv new file mode 100644 index 0000000..c2cebc9 --- /dev/null +++ b/.VSCodeCounter/2021-11-26_22-26-06/results.csv @@ -0,0 +1,21 @@ +"filename", "language", "Makefile", "TOML", "Rust", "Markdown", "comment", "blank", "total" +"/home/amy/crystal/ame/Cargo.toml", "TOML", 0, 18, 0, 0, 1, 2, 21 +"/home/amy/crystal/ame/Makefile", "Makefile", 11, 0, 0, 0, 0, 1, 12 +"/home/amy/crystal/ame/README.md", "Markdown", 0, 0, 0, 45, 0, 11, 56 +"/home/amy/crystal/ame/src/main.rs", "Rust", 0, 0, 105, 0, 0, 9, 114 +"/home/amy/crystal/ame/src/mods.rs", "Rust", 0, 0, 14, 0, 0, 0, 14 +"/home/amy/crystal/ame/src/mods/clearcache.rs", "Rust", 0, 0, 8, 0, 0, 4, 12 +"/home/amy/crystal/ame/src/mods/clone.rs", "Rust", 0, 0, 174, 0, 0, 20, 194 +"/home/amy/crystal/ame/src/mods/database.rs", "Rust", 0, 0, 167, 0, 0, 5, 172 +"/home/amy/crystal/ame/src/mods/help.rs", "Rust", 0, 0, 21, 0, 0, 3, 24 +"/home/amy/crystal/ame/src/mods/inssort.rs", "Rust", 0, 0, 180, 0, 0, 6, 186 +"/home/amy/crystal/ame/src/mods/install.rs", "Rust", 0, 0, 48, 0, 0, 1, 49 +"/home/amy/crystal/ame/src/mods/purge.rs", "Rust", 0, 0, 118, 0, 0, 3, 121 +"/home/amy/crystal/ame/src/mods/search.rs", "Rust", 0, 0, 33, 0, 0, 4, 37 +"/home/amy/crystal/ame/src/mods/strs.rs", "Rust", 0, 0, 111, 0, 0, 7, 118 +"/home/amy/crystal/ame/src/mods/uninstall.rs", "Rust", 0, 0, 118, 0, 0, 2, 120 +"/home/amy/crystal/ame/src/mods/update.rs", "Rust", 0, 0, 14, 0, 0, 3, 17 +"/home/amy/crystal/ame/src/mods/upgrade.rs", "Rust", 0, 0, 201, 0, 0, 13, 214 +"/home/amy/crystal/ame/src/mods/ver.rs", "Rust", 0, 0, 26, 0, 0, 2, 28 +"/home/amy/crystal/ame/src/mods/xargs.rs", "Rust", 0, 0, 15, 0, 0, 2, 17 +"Total", "-", 11, 18, 1353, 45, 1, 98, 1526 \ No newline at end of file diff --git a/.VSCodeCounter/2021-11-26_22-26-06/results.md b/.VSCodeCounter/2021-11-26_22-26-06/results.md new file mode 100644 index 0000000..8510639 --- /dev/null +++ b/.VSCodeCounter/2021-11-26_22-26-06/results.md @@ -0,0 +1,26 @@ +# Summary + +Date : 2021-11-26 22:26:06 + +Directory /home/amy/crystal/ame + +Total : 19 files, 1427 codes, 1 comments, 98 blanks, all 1526 lines + +[details](details.md) + +## Languages +| language | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| Rust | 16 | 1,353 | 0 | 84 | 1,437 | +| Markdown | 1 | 45 | 0 | 11 | 56 | +| TOML | 1 | 18 | 1 | 2 | 21 | +| Makefile | 1 | 11 | 0 | 1 | 12 | + +## Directories +| path | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| . | 19 | 1,427 | 1 | 98 | 1,526 | +| src | 16 | 1,353 | 0 | 84 | 1,437 | +| src/mods | 14 | 1,234 | 0 | 75 | 1,309 | + +[details](details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2021-11-26_22-26-06/results.txt b/.VSCodeCounter/2021-11-26_22-26-06/results.txt new file mode 100644 index 0000000..a45ace5 --- /dev/null +++ b/.VSCodeCounter/2021-11-26_22-26-06/results.txt @@ -0,0 +1,48 @@ +Date : 2021-11-26 22:26:06 +Directory : /home/amy/crystal/ame +Total : 19 files, 1427 codes, 1 comments, 98 blanks, all 1526 lines + +Languages ++----------+------------+------------+------------+------------+------------+ +| language | files | code | comment | blank | total | ++----------+------------+------------+------------+------------+------------+ +| Rust | 16 | 1,353 | 0 | 84 | 1,437 | +| Markdown | 1 | 45 | 0 | 11 | 56 | +| TOML | 1 | 18 | 1 | 2 | 21 | +| Makefile | 1 | 11 | 0 | 1 | 12 | ++----------+------------+------------+------------+------------+------------+ + +Directories ++----------------------------------------------+------------+------------+------------+------------+------------+ +| path | files | code | comment | blank | total | ++----------------------------------------------+------------+------------+------------+------------+------------+ +| . | 19 | 1,427 | 1 | 98 | 1,526 | +| src | 16 | 1,353 | 0 | 84 | 1,437 | +| src/mods | 14 | 1,234 | 0 | 75 | 1,309 | ++----------------------------------------------+------------+------------+------------+------------+------------+ + +Files ++----------------------------------------------+----------+------------+------------+------------+------------+ +| filename | language | code | comment | blank | total | ++----------------------------------------------+----------+------------+------------+------------+------------+ +| /home/amy/crystal/ame/Cargo.toml | TOML | 18 | 1 | 2 | 21 | +| /home/amy/crystal/ame/Makefile | Makefile | 11 | 0 | 1 | 12 | +| /home/amy/crystal/ame/README.md | Markdown | 45 | 0 | 11 | 56 | +| /home/amy/crystal/ame/src/main.rs | Rust | 105 | 0 | 9 | 114 | +| /home/amy/crystal/ame/src/mods.rs | Rust | 14 | 0 | 0 | 14 | +| /home/amy/crystal/ame/src/mods/clearcache.rs | Rust | 8 | 0 | 4 | 12 | +| /home/amy/crystal/ame/src/mods/clone.rs | Rust | 174 | 0 | 20 | 194 | +| /home/amy/crystal/ame/src/mods/database.rs | Rust | 167 | 0 | 5 | 172 | +| /home/amy/crystal/ame/src/mods/help.rs | Rust | 21 | 0 | 3 | 24 | +| /home/amy/crystal/ame/src/mods/inssort.rs | Rust | 180 | 0 | 6 | 186 | +| /home/amy/crystal/ame/src/mods/install.rs | Rust | 48 | 0 | 1 | 49 | +| /home/amy/crystal/ame/src/mods/purge.rs | Rust | 118 | 0 | 3 | 121 | +| /home/amy/crystal/ame/src/mods/search.rs | Rust | 33 | 0 | 4 | 37 | +| /home/amy/crystal/ame/src/mods/strs.rs | Rust | 111 | 0 | 7 | 118 | +| /home/amy/crystal/ame/src/mods/uninstall.rs | Rust | 118 | 0 | 2 | 120 | +| /home/amy/crystal/ame/src/mods/update.rs | Rust | 14 | 0 | 3 | 17 | +| /home/amy/crystal/ame/src/mods/upgrade.rs | Rust | 201 | 0 | 13 | 214 | +| /home/amy/crystal/ame/src/mods/ver.rs | Rust | 26 | 0 | 2 | 28 | +| /home/amy/crystal/ame/src/mods/xargs.rs | Rust | 15 | 0 | 2 | 17 | +| Total | | 1,427 | 1 | 98 | 1,526 | ++----------------------------------------------+----------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index bb0f15b..1ad6cd6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,37 @@ mod mods; -use mods::{clearcache::{clearcache}, clone::clone, help::help, inssort::{inssort, inssort_from_file}, install::install, purge::{purge, purge_from_file}, search::{a_search, r_search}, strs::err_rec, strs::err_unrec, strs::inf, uninstall::{uninstall, uninstall_from_file}, update::{update}, upgrade::{upgrade}, ver::ver, xargs::*}; -use std::{env, process::exit}; -use nix::unistd::Uid; +use mods::{ + clearcache::clearcache, + clone::clone, + help::help, + inssort::{ + inssort, + inssort_from_file}, + install::install, + purge::{ + purge, + purge_from_file}, + search::{ + a_search, + r_search}, + strs::err_rec, + strs::err_unrec, + strs::inf, + uninstall::{ + uninstall, + uninstall_from_file}, + update::update, + upgrade::upgrade, + ver::ver, + xargs::* +}; +use std::{ + env, + process::exit +}; fn main() { - if Uid::effective().is_root() { // check if user runs ame as root + if nix::unistd::Uid::effective().is_root() { // check if user runs ame as root err_unrec(format!("Do not run ame as root! this can cause serious damage to your system!")); } diff --git a/src/mods/inssort.rs b/src/mods/inssort.rs index 303b75a..8bc6d60 100644 --- a/src/mods/inssort.rs +++ b/src/mods/inssort.rs @@ -93,8 +93,7 @@ pub fn inssort(noconfirm: bool, as_dep: bool, pkgs: Vec) { // TODO: unde pub fn inssort_from_file(noconfirm: bool, as_dep: bool, file: &str) { // same thing as above but with a list of packages from a file let mut pkgs: Vec = Vec::new(); - let mut contents = String::new(); - contents = std::fs::read_to_string(&file).expect("Couldn't read file"); + let contents = std::fs::read_to_string(&file).expect("Couldn't read file"); for line in contents.lines() { pkgs.push(line.to_string()); }