Some improvements

Author: madprops

Cargo.lock

@@ -2,7 +2,7 @@
 
 [package]
 name = "effer"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["madprops <[email protected]>"]
 edition = "2018"
 

Cargo.toml

@@ -81,12 +81,6 @@ To check using a debug version:
 To build an optimized binary
 >cargo build --release
 
-Or just use the binary provided in the latest release.
-
-There's a simple bash script to move the release binary to /bin
-
-The version in Cargo.toml doesn't reflect the program's version.
-
 # Arguments
 
 Check --help to find out about arguments that can be used.

README.md

@@ -0,0 +1,2 @@
+
@t
+�PD��t��,z��Q��*@ѡS�h� ��қC�p��٧��|��<D�r1v8-��QL`�nu���{��

install.sh

@@ -153,7 +153,7 @@ impl EncryptedData {
 
     fn decrypt(&self, password: &str) -> Result<Vec<u8>, ()> {
         if self.derivation == 0 {
-            return Ok(self.ciphertext.clone());
+            Ok(self.ciphertext.clone())
         } else {
             let key = key_from_pw(password, self.salt, self.derivation)?;
             aead::open(&self.ciphertext, Some(&self.salt.0), &self.nonce, &key)
@@ -165,10 +165,10 @@ impl EncryptedData {
         bytes.extend(self.salt.0.iter());
         bytes.extend(self.nonce.0.iter());
         bytes.extend(self.ciphertext.iter());
-        return bytes;
+        bytes
     }
 
-    fn from_bytes(bytes: &Vec<u8>) -> Result<Self, base64::DecodeError> {
+    fn from_bytes(bytes: &[u8]) -> Result<Self, base64::DecodeError> {
         let n = 2;
         let sbytes = pwhash::SALTBYTES;
         let nbytes = aead::NONCEBYTES;
@@ -199,7 +199,7 @@ pub fn encrypt_text(plaintext: &str) -> Vec<u8> {
 }
 
 // Decrypt the file's bytes
-pub fn decrypt_bytes(bytes: &Vec<u8>) -> String {
+pub fn decrypt_bytes(bytes: &[u8]) -> String {
     let ciphertext = EncryptedData::from_bytes(bytes).unwrap();
     let password = get_password(false);
 

pom

@@ -158,7 +158,7 @@ pub fn get_file_bytes() -> Vec<u8> {
     };
 
     file.read_to_end(&mut bytes).unwrap();
-    return bytes;
+    bytes
 }
 
 // Generic function to read text from files
@@ -435,13 +435,11 @@ pub fn do_open_path(pth: String, create: bool) {
     opath = path;
     g_set_path(pth);
 
-    if create {
-        if !create_file() {
-            g_set_password(opassword);
-            g_set_path(opath);
-            show_message("< Can't Create File >");
-            return;
-        }
+    if create && !create_file() {
+        g_set_password(opassword);
+        g_set_path(opath);
+        show_message("< Can't Create File >");
+        return;
     }
 
     let notes = get_notes(true);

src/encryption.rs

@@ -12,7 +12,7 @@ use std::{
 };
 
 // Constants
-pub const VERSION: &str = "v2.0.0";
+pub const VERSION: &str = "v2.0.1";
 pub const DEFAULT_PAGE_SIZE: usize = 10;
 pub const MAX_PAGE_SIZE: usize = 100;
 pub const PAGE_SIZE_DIFF: usize = 1;

src/file.rs

@@ -1,6 +1,3 @@
-#![allow(clippy::suspicious_else_formatting)]
-#![allow(clippy::collapsible_if)]
-
 mod arguments;
 mod colors;
 mod encryption;

src/globals.rs

@@ -30,7 +30,7 @@ pub fn show_stats() {
 
     let enc_size = get_file_bytes().len();
     let dec_size = notes.as_bytes().len();
-    let path = shell_contract(&g_get_path().to_string());
+    let path = shell_contract(&g_get_path());
 
     let s = format!("Stats For: {}\n\nNotes: {}\nWords: {}\nLetters: {}\nEncrypted Size: {} Bytes\nDecrypted Size: {} Bytes",
         path, len, wcount, lcount, enc_size, dec_size);