Merge pull request #4 from auax/master

fixed bugs and improved code quality

Author: Auax

resources/main.ui

@@ -432,6 +432,8 @@ p, li { white-space: pre-wrap; }
     <property name="title">
      <string>Options</string>
     </property>
+    <addaction name="clear_log"/>
+    <addaction name="separator"/>
     <addaction name="open_github"/>
     <addaction name="report_issue"/>
     <addaction name="donate"/>
@@ -459,6 +461,11 @@ p, li { white-space: pre-wrap; }
     <string>Donate</string>
    </property>
   </action>
+  <action name="clear_log">
+   <property name="text">
+    <string>Clear Log</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

secauax.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Union
 
-from cryptography.fernet import Fernet
+from cryptography.fernet import Fernet, InvalidToken
 
 
 class Secauax:
@@ -107,12 +107,20 @@ def bulk_encrypt(self,
         assert os.path.isdir(pathname), "pathname path doesn't exist"
         assert os.path.isdir(output_directory), "output_directory path doesn't exist"
 
-        try:
-            for file in glob.glob(os.path.join(pathname, file_extension)):
-                self.encrypt_file(file, os.path.join(output_directory, os.path.basename(file)))
-        except:
-            return False
-        return True
+        files_encrypted = 0
+
+        for file in glob.glob(os.path.join(pathname, file_extension)):
+            try:
+                filename = os.path.join(output_directory, os.path.basename(file))
+                if os.path.isdir(file):  # Skip folders
+                    continue
+                self.encrypt_file(file, filename)
+                files_encrypted += 1
+
+            except InvalidToken:
+                pass
+
+        return True if files_encrypted >= 1 else False
 
     def decrypt_file(self, path: Union[Path, str], filename: Union[Path, str] = None) -> bytes:
         """
@@ -138,26 +146,36 @@ def decrypt_file(self, path: Union[Path, str], filename: Union[Path, str] = None
             decrypted_file.write(decrypted_data)
             decrypted_file.close()
 
+        return decrypted_data
+
     def bulk_decrypt(self,
                      pathname: Union[Path, str],
                      output_directory: Union[Path, str] = None,
                      file_extension: str = "*") -> bool:
         """
         Decrypt all the files inside a directory and save them into another directory.
         Attention: If the output_directory parameter is not specified, the new file(s) will overwrite the original(s).
-        This method returns a true boolean if the files are saved successfully. Any error will result in a false boolean.
+        This method returns a true boolean if at least one file was decrypted.
         :param pathname: path to encrypted folder
         :param output_directory: path to save the decrypted files
-        :param file_extension: select which files will be decrypted. Format: ".png" or, for all type of files: "*"
+        :param file_extension: filter files by extension: ".png" / ".txt" / ...
         :return: bool
         """
 
         assert os.path.isdir(pathname), "pathname path doesn't exist"
         assert os.path.isdir(output_directory), "output_directory path doesn't exist"
 
-        try:
-            for file in glob.glob(os.path.join(pathname, file_extension)):
-                self.decrypt_file(file, os.path.join(output_directory, os.path.basename(file)))
-        except:
-            return False
-        return True
+        files_decrypted = 0
+
+        for file in glob.glob(os.path.join(pathname, file_extension)):
+            try:
+                filename = os.path.join(output_directory, os.path.basename(file))
+                if os.path.isdir(file):  # Skip folders
+                    continue
+                self.decrypt_file(file, filename)
+                files_decrypted += 1
+
+            except InvalidToken:
+                pass
+
+        return True if files_decrypted >= 1 else False

window.py

@@ -6,11 +6,10 @@
 from PyQt5 import QtGui
 from PyQt5.QtWidgets import QMainWindow, QApplication, QFileDialog, QMessageBox
 from PyQt5.uic import loadUi
+from cryptography.fernet import InvalidToken
 
 from secauax import Secauax
 
-log = []
-
 
 def resource_path(relative_path: str) -> str:
     """
@@ -27,6 +26,8 @@ class MainWindow(QMainWindow):
     def __init__(self):
         super(MainWindow, self).__init__()
 
+        self.log_data = []
+
         # Set Window settings
         loadUi(resource_path("resources/main.ui"), self)
         self.setWindowTitle("Secauax by Auax")
@@ -35,6 +36,7 @@ def __init__(self):
         self.enable = False  # Enable the encrypt and decrypt buttons
 
         # Connect Menu
+        self.clear_log.triggered.connect(self.reset_logger)
         self.open_github.triggered.connect(lambda: webbrowser.open("https://github.com/auax"))
         self.report_issue.triggered.connect(lambda: webbrowser.open("https://github.com/auax/secauax/issues/new"))
         self.donate.triggered.connect(lambda: webbrowser.open("https://paypal.me/zellius"))
@@ -160,16 +162,17 @@ def encrypt(self) -> None:
             if self.save_key_path.text():
                 # Save key to the desired path
                 secauax.save_key(self.save_key_path.text())
-                self.logger(f"Key loaded from {self.save_key_path.text()}!")
+                self.logger(f"Key saved in {self.save_key_path.text()}!")
 
             if self.load_key_path.text():
                 # Load key from the desired path
                 secauax.load_key_into_class(self.load_key_path.text())
-                self.logger(f"Key saved in {self.load_key_path.text()}!")
+                self.logger(f"Key loaded from {self.load_key_path.text()}!")
 
             if self.mode_cb.isChecked():
                 # Directory mode
-                secauax.bulk_encrypt(self.input_path.text(), self.output_path.text())
+                if not secauax.bulk_encrypt(self.input_path.text(), self.output_path.text()):
+                    raise InvalidToken
             else:
                 # File mode
                 secauax.encrypt_file(self.input_path.text(), self.output_path.text())
@@ -180,8 +183,11 @@ def encrypt(self) -> None:
             # Show a message
             MainWindow.create_dialog("File(s) encrypted successfuly!", "", "Success!", QMessageBox.Information)
 
+        except InvalidToken:
+            self.logger("InvalidToken! Make sure to select the correct key.")
+
         except Exception as E:
-            self.logger("Something went wrong! Please try again.")  # Log error
+            self.logger(f"Unhandled error: {type(E).__name__}")
 
     def decrypt(self) -> None:
         """
@@ -195,16 +201,17 @@ def decrypt(self) -> None:
             if self.save_key_path.text():
                 # Save key to the desired path
                 secauax.save_key(self.save_key_path.text())
-                self.logger(f"Key loaded from {self.save_key_path.text()}!")
+                self.logger(f"Key saved in {self.save_key_path.text()}!")
 
             if self.load_key_path.text():
                 # Load key from the desired path
                 secauax.load_key_into_class(self.load_key_path.text())
-                self.logger(f"Key saved in {self.load_key_path.text()}!")
+                self.logger(f"Key loaded from {self.load_key_path.text()}!")
 
             if self.mode_cb.isChecked():
                 # Directory mode
-                secauax.bulk_decrypt(self.input_path.text(), self.output_path.text())
+                if not secauax.bulk_decrypt(self.input_path.text(), self.output_path.text()):
+                    raise InvalidToken
             else:
                 # File mode
                 secauax.decrypt_file(self.input_path.text(), self.output_path.text())
@@ -215,8 +222,11 @@ def decrypt(self) -> None:
             # Show message
             MainWindow.create_dialog("File(s) decrypted successfuly!", "", "Success!", QMessageBox.Information)
 
-        except:
-            self.logger("Something went wrong! Please try again.")  # Log error
+        except InvalidToken:
+            self.logger("InvalidToken! Make sure to select the correct key.")
+
+        except Exception as E:
+            self.logger(f"Unhandled error: {type(E).__name__}")
 
     def logger(self, message: str, color: str = "red") -> None:
         """
@@ -225,13 +235,20 @@ def logger(self, message: str, color: str = "red") -> None:
         :param color: the color of the message
         :return: None
         """
-        global log
-        log.append(message)
+        self.log_data.append(message)
         to_html = ""
-        for i in log:
+        for i in self.log_data:
             to_html += f"<p style='margin: 2px 4px 2px 4px !important;'><code style='color:red'>>></code> {i}</p>"
         self.log.setHtml(to_html)
 
+    def reset_logger(self) -> None:
+        """
+        Clear all log data
+        :return: None
+        """
+        self.log_data = []
+        self.log.setHtml("")
+
     @staticmethod
     def create_dialog(message: str, informative_text: str, title: str = "Info", icon=QMessageBox.Critical) -> None:
         """