Merge pull request #2 from 8gudbits/development

v2.0

Author: 8gudbits

.gitignore

@@ -160,3 +160,5 @@ cython_debug/
 #.idea/
 
 todo.md
+z.*
+

LICENSE

@@ -1,55 +1,91 @@
-# EncryptoPack
+<div align="center"><img src="logo.png" alt="EncryptoPack Logo" width="100"></div>
 
-**An intuitive application for securing files and folders through encryption.**
+# EncryptoPack - AES-256 Encryption for Files and Folders
 
-_Encryption is a process of transforming data into an unreadable form, so that only authorized parties can access it. Encryption helps protect your privacy and security by preventing unauthorized access, modification, or theft of your files and folders._
+EncryptoPack is a lightweight application designed to safeguard sensitive data with industry-grade encryption. Whether protecting personal documents or securing work files, EncryptoPack makes it easy to encrypt and decrypt files and folders with confidence.
 
-_EncryptoPack is a simple and user-friendly application that allows you to encrypt and decrypt your files and folders using AES-256 encryption, one of the most secure and widely used encryption algorithms._
+## 🔒 Why Encryption Matters
+
+Encryption transforms readable data into a scrambled format that can only be accessed by authorized users. It's a critical layer of defense against:
+
+- Unauthorized access
+- Data tampering
+- Theft or leaks
+
+## ⚙️ What EncryptoPack Offers
+
+- Encryption of files and folders using AES-256 encryption.
+- Simple Interface - No technical expertise required
+- Fast Performance - Encrypt large folders quickly
+- Generate a recovery key to recover forgotten password
+- Supports a separate ivkey file for extra security
+
+Take control of your digital privacy with EncryptoPack - where security meets simplicity.
 
 ---
 
-## Features
+## 🖼️ Screenshots
+
+<div align="center">
+
+<table>
+  <tr>
+    <td>
+      <img src="./Preview/image_1.png" alt="Main Interface" width="400"/>
+    </td>
+    <td>
+      <img src="./Preview/image_2.png" alt="Main Interface" width="400"/>
+    </td>
+  </tr>
+</table>
+
+</div>
 
-- Encrypt files and folders using AES-256 encryption.
-- Generate a recovery key in case you forget your password.
-- Support a separate ivkey file for extra security.
+> Tip: You can also drag your files directly into the app - no browsing needed!
 
 ---
 
-## Get Started
+## 🚀 Get Started with EncryptoPack
 
-- To get started with **EncryptoPack**, you can clone the project using **Git**:
+#### 🧑‍💻 For Most Users - Download the Ready-to-Use App
 
-```bash
-git clone --depth 1 https://github.com/8gudbits/EncryptoPack.git
-```
+No setup required! Just download the latest Windows binary from the [Releases Page](https://github.com/8gudbits/EncryptoPack/releases).
 
-- Next, install the required dependencies using **pip**:
+<a href="https://github.com/8gudbits/EncryptoPack/releases/tag/v2.0"> <img src="https://img.shields.io/badge/Version-v2.0-orange" alt="Latest Version Badge"> </a>
 
-```bash
-pip install -r requirements.txt
-```
+#### 🛠️ For Developers - Run from Source
 
-- Or if you are on **Linux**/**MacOS**:
+If you prefer to run EncryptoPack from source or you're on Linux/macOS, follow these steps:
 
-```bash
-pip3 install -r requirements.txt
+1. Clone the repository using git:
+
+```
+git clone --depth 1 https://github.com/8gudbits/EncryptoPack.git
+cd EncryptoPack/src
 ```
 
-- You can also get the windows binary **[here](https://github.com/8gudbits/EncryptoPack/releases)**.
+2. Install dependencies:
 
-<ul><a href="https://github.com/8gudbits/EncryptoPack/releases/tag/v1.0"><img src="https://img.shields.io/badge/Version-v1.1-orange"></a></ul>
+- On Windows:
+  ```
+  pip install -r requirements.txt
+  ```
+- On Linux/macOS:
+  ```
+  pip3 install -r requirements.txt
+  ```
 
----
+Once installed, you're ready to run EncryptoPack locally and start encrypting your files securely.
 
-<div align="center">
+> Note: Encrypted with an older format? You'll be informed about the compatible version for decryption - no surprises, no broken files.
 
-## Screenshots
+---
 
-![App_Image](./Preview/image_1.png)
-![App_Image](./Preview/image_2.png)
+## Documentation
 
-</div>
+Specification files are in [/specs](/specs):
+- [Format Specification](/specs/format_spec.md)
+- [Diagrams](/specs/diagrams)
 
 ---
 

Preview/image_1.png

@@ -1,8 +1,20 @@
-EncryptoPack 1.1
-- Updated GUI module from PyQt5 to PyQt6
-- Updated GUI design
-- Added threading to prevent random freezing during encryption/decryption
+📦 EncryptoPack Changelog
 
-EncryptoPack 1.0
+🔐 Version 2.0 [in-dev]
+- Updated: File extension from .pack (v1.x) to .pv2
+- Updated: Encrypted file format (incompatible with v1.x)
+- Added: Password verification before decryption
+- Added: File association support for .pv2 files (auto-select)
+- Added: Drag-and-drop support for file and folder input
+- Added: Adaptive theming support for system light/dark mode
+- Improved: File selection interface with dedicated file/folder buttons
+- Improved: Minor UI refinements
+
+🖼️ Version 1.1 [Aug 3, 2025]
+- Upgraded: GUI module migrated from PyQt5 to PyQt6
+- Improved: Refreshed GUI design
+- Fixed: Added threading to prevent freezing during encryption/decryption
+
+🚀 Version 1.0 [Aug 17, 2023]
 - Initial release
 

Preview/image_2.png

@@ -0,0 +1,42 @@
+%% specs/diagrams/block_size.mmd
+%%{init: {'theme': 'base', 'themeVariables': {'primaryColor': '#F5F5F5'}}}%%
+flowchart TD
+    A("Start: Check Available RAM")
+    B{"Available RAM (GB)?"}
+    C["Return 64 KB<br>(65,536 bytes)"]
+    D["Return 128 KB<br>(131,072 bytes)"]
+    E["Return 256 KB<br>(262,144 bytes)"]
+    F["Return 512 KB<br>(524,288 bytes)"]
+    G["Return 1 MB<br>(1,048,576 bytes)"]
+    H["Return 1.5 MB<br>(1,572,864 bytes)"]
+    I["Return 3 MB<br>(3,145,728 bytes)"]
+    J["Error: Fallback to 512 KB<br>(524,288 bytes)"]
+    K("Return")
+
+    A --> B
+    B -->|"< 1 GB"| C
+    B -->|"1 - 2 GB"| D
+    B -->|"2 - 3 GB"| E
+    B -->|"3 - 4 GB"| F
+    B -->|"4 - 6 GB"| F
+    B -->|"6 - 8 GB"| G
+    B -->|"8 - 12 GB"| G
+    B -->|"12 - 16 GB"| H
+    B -->|"16 - 24 GB"| H
+    B -->|"24 - 32 GB"| I
+    B -->|"\>= 32 GB"| I
+    B -->|"Error Occurred"| J
+    C --> K
+    D --> K
+    E --> K
+    F --> K
+    G --> K
+    H --> K
+    I --> K
+    J --> K
+
+    style A fill:#4CAF50,stroke:#388E3C
+    style B fill:#64B5F6,stroke:#1976D2
+    style J fill:#F44336,stroke:#D32F2F
+    style K fill:#4CAF50,stroke:#388E3C
+

README.md

@@ -0,0 +1,76 @@
+%% specs/diagrams/decryption.mmd
+%%{init: {'theme': 'base', 'themeVariables': { 'primaryColor': '#F5F5F5'}}}%%
+flowchart TD
+    Start([Start]) --> A["Input 'File/Folder'"]
+    A --> B{Is it a folder?}
+    B -->|Yes| C["Search for file with same name + 'CURRENT_EXT'"]
+    C --> D{Does the file exist?}
+    D -->|Yes| E["Set 'file_to_decrypt' to the found file"]
+    D -->|No| F["Emit 'File Not Found' error"] --> End
+    B -->|No| G["Set input file as 'file_to_decrypt'"]
+    E --> H
+    G --> H{Is a separate IV file provided?}
+    H -->|Yes| I["Check legacy format using IV file"]
+    H -->|No| J["Check legacy format without IV file"]
+    I --> K{Is legacy format detected?}
+    J --> K
+    K -->|Yes| L["Emit 'Legacy File' error"] --> End
+    K -->|No| M["Read 'FILE_HEADER'"]
+    M --> N{Does the header match?}
+    N -->|No| O["Emit 'Invalid File' error"] --> End
+    N -->|Yes| P{Is a recovery key provided?}
+    P -->|Yes| Q["Read key from recovery file"]
+    P -->|No| R{Is a password provided?}
+    R -->|No| S["Emit 'Missing Credentials' error"] --> End
+    R -->|Yes| T["Derive key from password"]
+    Q --> U
+    T --> U["Retrieve IV from file or separate file"]
+    U --> V["Verify IV hash"]
+    V --> W{Does the hash match?}
+    W -->|No| X["Emit 'Integrity Error'"] --> End
+    W -->|Yes| Y["Decrypt password check"]
+    Y --> Z{Does it match 'PASS_TEXT'?}
+    Z -->|No| AA["Emit 'Decryption Error'"] --> End
+    Z -->|Yes| AB["Decrypt data with progress reporting"]
+    AB --> AC["Create extraction directory"]
+    AC --> AD["Write decrypted data"]
+    AD --> AE["Verify data hash"]
+    AE --> AF{Does the hash match?}
+    AF -->|No| AG["Emit 'Data Integrity Warning'"]
+    AG --> AH
+    AF -->|Yes| AH["Verify 'EOF_MARKER'"]
+    AH --> AI{Is the marker present?}
+    AI -->|No| AJ["Emit 'File Format Error'"]
+    AJ --> AK
+    AI -->|Yes| AK{Is it a tar file?}
+    AK -->|Yes| AL["Check for 'MARKER_FILE'"]
+    AL --> AM{Is the marker present?}
+    AM -->|Yes| AN["Extract archive"]
+    AN --> AO["Remove marker and tar file"]
+    AM -->|No| AK
+    AK -->|No| AP
+    AO --> AP
+    AK --> AP["Perform cleanup operations"]
+    AP --> AQ{Should files be removed afterward?}
+    AQ -->|Yes| AR["Delete encrypted file and keys"]
+    AQ -->|No| AS
+    AR --> AS["Emit 'Decryption Successful'"]
+    AS --> End([End])
+
+    style Start fill:#4CAF50,stroke:#388E3C
+    style End fill:#F44336,stroke:#D32F2F
+    style B fill:#64B5F6,stroke:#1976D2
+    style D fill:#64B5F6,stroke:#1976D2
+    style H fill:#64B5F6,stroke:#1976D2
+    style K fill:#64B5F6,stroke:#1976D2
+    style N fill:#64B5F6,stroke:#1976D2
+    style P fill:#64B5F6,stroke:#1976D2
+    style R fill:#64B5F6,stroke:#1976D2
+    style W fill:#64B5F6,stroke:#1976D2
+    style Z fill:#64B5F6,stroke:#1976D2
+    style AF fill:#64B5F6,stroke:#1976D2
+    style AI fill:#64B5F6,stroke:#1976D2
+    style AK fill:#64B5F6,stroke:#1976D2
+    style AM fill:#64B5F6,stroke:#1976D2
+    style AQ fill:#64B5F6,stroke:#1976D2
+

changelog.txt

@@ -0,0 +1,41 @@
+%% specs/diagrams/encryption.mmd
+%%{init: {'theme': 'base', 'themeVariables': {'primaryColor': '#F5F5F5'}}}%%
+flowchart TD
+    Start([Start]) --> A["Input 'File/Folder'"]
+    A --> B{Is it a folder?}
+    B -->|Yes| C["Compress into a temporary file"]
+    C --> D["Create 'MARKER_FILE' containing 'MARKER_FILE_TEXT'"]
+    D --> E["Set 'file_to_encrypt' to the compressed file"]
+    E --> F["Add file to 'temp_files_to_cleanup' list"]
+    B -->|No| G["Set 'file_to_encrypt' to input file"]
+    F --> H
+    G --> H["Generate IV using 'get_random_bytes(16)'"]
+    H --> I["Write 'FILE_HEADER' to the output file"]
+    I --> J{Is separate IV requested?}
+    J -->|No| K["Write IV to the output file"]
+    J -->|Yes| L["Generate IV key file"]
+    L --> M["Write IV to the separate file"]
+    K --> N
+    M --> N["Write IV hash using 'sha256(iv)' to the output file"]
+    N --> O["Write encrypted 'PASS_TEXT' to the output file"]
+    O --> P["Encrypt data in blocks with progress reporting"]
+    P --> Q["Write data hash using 'sha256(encrypted)' to the output file"]
+    Q --> R["Write 'EOF_MARKER' to the output file"]
+    R --> S{Is recovery key requested?}
+    S -->|Yes| T["Generate recovery key"]
+    T --> U["Write password hash to the recovery file"]
+    S -->|No| U
+    U --> V["Execute cleanup operations"]
+    V --> W{Were there any failed files?}
+    W -->|Yes| X["Emit warning with list of failed files"]
+    W -->|No| Y["Emit operation completed signal"]
+    X --> Y
+    Y --> End([End])
+
+    style Start fill:#4CAF50,stroke:#388E3C
+    style End fill:#F44336,stroke:#D32F2F
+    style B fill:#64B5F6,stroke:#1976D2
+    style J fill:#64B5F6,stroke:#1976D2
+    style S fill:#64B5F6,stroke:#1976D2
+    style W fill:#64B5F6,stroke:#1976D2
+