From 2409dcee390be129f1cb43897b9887c66845507b Mon Sep 17 00:00:00 2001
From: Kai-Denzel_jane <kaijanedev@icloud.com>
Date: Thu, 18 Jan 2024 13:04:07 +0800
Subject: [PATCH] Change some things and file encryption is done

---
 .env => Encryption/Fernet (Local-Files)/.env |  0
 Encryption/Fernet (Local-Files)/Fernet.py    | 82 ++++++++++++--------
 Encryption/Fernet (Local-Files)/File.txt     |  1 +
 3 files changed, 52 insertions(+), 31 deletions(-)
 rename .env => Encryption/Fernet (Local-Files)/.env (100%)
 create mode 100644 Encryption/Fernet (Local-Files)/File.txt

diff --git a/.env b/Encryption/Fernet (Local-Files)/.env
similarity index 100%
rename from .env
rename to Encryption/Fernet (Local-Files)/.env
diff --git a/Encryption/Fernet (Local-Files)/Fernet.py b/Encryption/Fernet (Local-Files)/Fernet.py
index a5918e4..429d97d 100644
--- a/Encryption/Fernet (Local-Files)/Fernet.py	
+++ b/Encryption/Fernet (Local-Files)/Fernet.py	
@@ -71,6 +71,8 @@ def welcome():
         print("6. Set password (Advanced Users only!!!)")
         print("7. Reset Password and Key")
         print("8. Manage Keys")
+        print("9. Encrypt a file")
+        print("10. Decrypt a file")
 
         choice = validate_input("Input a number: ", int, "Please input a number")
 
@@ -319,46 +321,64 @@ def encrypt_file():
     
     """
 
-    if pass_check() == True:
-        print(os.curdir)
-        file = input("Input file name: ")
-        file = open(file, "rb")
+    
+    cwd_contents = os.listdir(os.curdir)
+
+    for item in cwd_contents:
+        print(item)
+
+    filename = input("Input file name: ")
+    
+    with open(filename, "rb") as file:
+
         data = file.read()
-        file.close()
-        encryption_tool = Fernet(KEY)
-        encrypted = encryption_tool.encrypt(data)
-        file = open(file, "wb")
+
+    encryption_tool = Fernet(KEY)
+    encrypted = encryption_tool.encrypt(data)
+
+    with open(filename, "wb") as file:
+
         file.write(encrypted)
-        file.close()
-    else:
-        pass_check()
+        print("File encrypted")
+
 
 def decrypt_file():
     
-        """
-        Decrypts a file
+    """
+    Decrypts a file
+
+    Args:
+        None
     
-        Args:
-            None
-        
-        Returns:
-            None
-        
-        """
+    Returns:
+        None
+    
+    """
+
+    if pass_check() == True:
+        cwd_contents = os.listdir(os.curdir)
+
+        for item in cwd_contents:
+            print(item)
+
+        filename = input("Input file name: ")
     
-        if pass_check() == True:
-            print(os.curdir)
-            file = input("Input file name: ")
-            file = open(file, "rb")
+        with open(filename, "rb") as file:
+
             data = file.read()
-            file.close()
-            encryption_tool = Fernet(KEY)
-            decrypted = encryption_tool.decrypt(data)
-            file = open(file, "wb")
+
+        encryption_tool = Fernet(KEY)
+        decrypted = encryption_tool.decrypt(data)
+
+        with open(filename, "wb") as file:
+
             file.write(decrypted)
-            file.close()
-        else:
-            pass_check()
+            print("File decrypted")
+
+    else:
+        pass_check()
+    
+        
 
 # Prompts user if they would like to end the script 
 def end():
diff --git a/Encryption/Fernet (Local-Files)/File.txt b/Encryption/Fernet (Local-Files)/File.txt
new file mode 100644
index 0000000..b1478fa
--- /dev/null
+++ b/Encryption/Fernet (Local-Files)/File.txt	
@@ -0,0 +1 @@
+This file will be encrypted
\ No newline at end of file