From 337b7c431435543a95270792df4d7895748d58ba Mon Sep 17 00:00:00 2001
From: Leonard Lesinski <84378319+Le0X8@users.noreply.github.com>
Date: Fri, 2 Aug 2024 16:46:29 +0200
Subject: [PATCH] chore: Added CI and fixed Clippy warnings

---
 .github/workflows/ci.yml | 20 ++++++++++++++++++++
 .vscode/extensions.json  | 16 ++++++++++++++++
 .vscode/settings.json    | 11 ++++++++++-
 src/commands/create.rs   |  9 +++------
 src/commands/list.rs     | 12 ++++--------
 src/commands/metadata.rs |  6 ++----
 src/main.rs              |  3 ++-
 7 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .vscode/extensions.json

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..0008304
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,20 @@
+name: Run CI
+on: [push, pull_request]
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: full
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up Rust
+        uses: actions/checkout@v4
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
+      - name: Build
+        run: cargo build --verbose
+      - name: Run clippy
+        run: cargo clippy --verbose -- -D warnings
+      - name: Run audit
+        run: cargo audit
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..d486f31
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,16 @@
+{
+    "recommendations": [
+        "github.vscode-github-actions",
+        "ms-vscode.hexeditor",
+        "wakatime.vscode-wakatime",
+        "github.vscode-pull-request-github",
+        "fill-labs.dependi",
+        "tamasfe.even-better-toml",
+        "github.remotehub",
+        "dustypomerleau.rust-syntax",
+        "rust-lang.rust-analyzer",
+        "vadimcn.vscode-lldb",
+        "usernamehw.errorlens",
+        "gruntfuggly.todo-tree"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 68ebc15..5a89bd3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,12 @@
 {
-    "editor.tabSize": 4
+    "editor.tabSize": 4,
+    "errorLens.enabled": true,
+    "errorLens.gutterIconsEnabled": true,
+    "errorLens.gutterIconSet": "squareRounded",
+    "todo-tree.regex.regex": "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!|unimplemented!",
+    "rust-analyzer.check.command": "clippy",
+    "[rust]": {
+        "editor.defaultFormatter": "rust-lang.rust-analyzer",
+        "editor.formatOnSave": true,
+    },
 }
\ No newline at end of file
diff --git a/src/commands/create.rs b/src/commands/create.rs
index f5525af..d8fb3e2 100644
--- a/src/commands/create.rs
+++ b/src/commands/create.rs
@@ -9,13 +9,10 @@ pub fn create(format: String, input: String, output: String, buffer_size: u64) {
         .split(';')
         .map(|file| {
             let file = file.split(':').collect::<Vec<&str>>();
-            let source_path = file.get(0).unwrap();
+            let source_path = file.first().unwrap();
             let mut target_path = source_path;
-            match file.get(1) {
-                Some(path) => {
-                    target_path = path;
-                }
-                None => {}
+            if let Some(path) = file.get(1) {
+                target_path = path;
             }
             EntrySource {
                 path: target_path.to_string(),
diff --git a/src/commands/list.rs b/src/commands/list.rs
index 2cdf732..1d276e4 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -9,13 +9,10 @@ pub fn list(format_string: String, input: String, check_integrity: bool, buffer_
 
     match format {
         Formats::Zip => {
-            let metadata = match *metadata {
-                OriginalArchiveMetadata::Zip(metadata) => metadata,
-            };
+            let OriginalArchiveMetadata::Zip(metadata) = *metadata;
 
-            let mut i: u32 = 0;
-            println!("");
-            for file in &metadata.files {
+            println!();
+            for (i, file) in (0_u32..).zip(metadata.files.iter()) {
                 println!("{}", file.path);
                 println!("{}", "=".repeat(file.path.len()));
                 println!("Index: {}", i);
@@ -26,7 +23,7 @@ pub fn list(format_string: String, input: String, check_integrity: bool, buffer_
                         "Size: {} ({} compressed)",
                         byte_unit::Byte::from_u64(file.uncompressed_size.into())
                             .get_appropriate_unit(byte_unit::UnitType::Decimal),
-                        byte_unit::Byte::from_u64(file.size.into())
+                        byte_unit::Byte::from_u64(file.size)
                             .get_appropriate_unit(byte_unit::UnitType::Decimal)
                     );
                     println!(
@@ -36,7 +33,6 @@ pub fn list(format_string: String, input: String, check_integrity: bool, buffer_
                     println!("CRC-32 checksum: 0x{:x}", file.checksum);
                     println!("Compression method: {}\n", file.compression);
                 };
-                i += 1;
             }
         }
     }
diff --git a/src/commands/metadata.rs b/src/commands/metadata.rs
index a2e45db..51f9c33 100644
--- a/src/commands/metadata.rs
+++ b/src/commands/metadata.rs
@@ -9,9 +9,7 @@ pub fn metadata(format_string: String, input: String, check_integrity: bool, buf
 
     match format {
         Formats::Zip => {
-            let metadata = match *metadata {
-                OriginalArchiveMetadata::Zip(metadata) => metadata,
-            };
+            let OriginalArchiveMetadata::Zip(metadata) = *metadata;
 
             println!("Type: {}", format_string);
             let mut file_count: u32 = 0;
@@ -36,7 +34,7 @@ pub fn metadata(format_string: String, input: String, check_integrity: bool, buf
             for file in &metadata.files {
                 total_size += file.size;
             }
-            let total_size = byte_unit::Byte::from_u64(total_size.into())
+            let total_size = byte_unit::Byte::from_u64(total_size)
                 .get_appropriate_unit(byte_unit::UnitType::Decimal);
             println!("Total size (compressed): {}", total_size);
         }
diff --git a/src/main.rs b/src/main.rs
index 26392a4..34be598 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
-//mod text;
+#![allow(clippy::too_many_arguments)]
+
 mod commands;
 
 use clap::Parser;