GyulyVGC · Dec 10, 2023 · Jun 8, 2023 · Jun 11, 2023 · Jun 12, 2023 · Jun 15, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,6 @@ strip = true
 pcap = "1.1.0"
 etherparse = "0.13.0"
 chrono = { version = "0.4.31", default_features = false, features = ["clock"] }
-indexmap = "2.1.0"
 plotters = { version = "0.3.5", default_features = false, features = ["area_series"] }
 iced = { version = "0.10.0", features = ["tokio", "svg", "advanced", "lazy"] }
 plotters-iced = "0.9.0"
@@ -45,6 +44,7 @@ confy = "0.5.1"
 serde = { version = "1.0.193", default_features = false, features = ["derive"] }
 rodio = { version = "0.17.3", default_features = false, features = ["mp3"] }
 dns-lookup = "2.0.4"
+toml = "0.8.8"
 
 [target.'cfg(not(target_arch = "powerpc64"))'.dependencies]
 reqwest = { version = "0.11.22", default-features = false, features = ["json", "blocking", "rustls-tls"] }
@@ -55,6 +55,7 @@ reqwest = { version = "0.11.22", features = ["json", "blocking"] }
 #───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
 [dev-dependencies]
+serde_test = "1.0.176"
 rstest = "0.18.2"
 
 #───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 <p align="center"><a href="https://www.sniffnet.net"><img alt="" src="https://github.com/GyulyVGC/sniffnet/blob/main/resources/repository/header_repository.png?raw=true" width="100%"/></a></p>
 
-<p align="center"> 
+<p align="center">
 <a href="https://github.com/GyulyVGC/sniffnet/blob/main/LICENSE-APACHE"><img alt="" src="https://img.shields.io/crates/l/sniffnet?&color=orange"/></a>
 &nbsp;
 <a href="https://crates.io/crates/sniffnet"><img alt="" src="https://img.shields.io/crates/v/sniffnet?&logo=rust&color=blue"/></a> <br>
 </p>
 
-<p align="center"> 
+<p align="center">
 Application to comfortably monitor your Internet traffic <br>
 Multithreaded, cross-platform, reliable <br>
 🌐 <a href="https://www.sniffnet.net">www.sniffnet.net</a>
@@ -80,17 +80,17 @@ You can install Sniffnet in one of the following ways:
 [32-bit](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_Windows_32-bit.msi)
 
   ### macOS
-  
+
   - [Intel](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_macOS_Intel.dmg) |
 [Apple silicon](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_macOS_AppleSilicon.dmg)
 
   ### Linux
 
   - deb: [amd64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_amd64.deb) |
-[arm64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_arm64.deb) | 
+[arm64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_arm64.deb) |
 [i386](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_i386.deb) |
 [armhf](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_armhf.deb)
-  
+
   - rpm: [x86_64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxRPM_x86_64.rpm) |
 [aarch64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxRPM_aarch64.rpm)
 
@@ -273,7 +273,7 @@ sudo sniffnet
 - 🌍 get information about the country of the remote hosts (IP geolocation)
 - ⭐ save your favorite network hosts
 - 🔉 set custom notifications to inform you when defined network events occur
-- 🎨 choose the style that fits you the most from 4 different available themes
+- 🎨 choose the style that fits you the most from 12 different available themes, plus custom theme support
 - 🕵️ inspect each of your network connections in real time
 - 📁 save complete textual reports with detailed information for each network connection:
   * source and destination IP addresses
@@ -295,13 +295,13 @@ sudo sniffnet
   Geolocation and network providers (ASN) refer to the remote IP address of each connection. They are retrieved performing lookups against [MMDB files](https://maxmind.github.io/MaxMind-DB/):
 
   > **Note**
-  > 
+  >
   > The MMDB (MaxMind database) format has been developed especially for IP lookup.<br>
   > It is optimized to perform lookups on data indexed by IP network ranges quickly and efficiently.<br>
   > It permits the best performance on IP lookups, and it's suitable for use in a production environment.
-  > 
+  >
   > This product includes GeoLite2 data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com </a>
-  
+
   This file format potentially allows Sniffnet to execute hundreds of different IP lookups in a matter of a few milliseconds.
 
 </details>
@@ -312,23 +312,23 @@ sudo sniffnet
 <details>
 
   <summary>See details</summary>
-  
+
   <br>
-  
+
   Application layer protocols are inferred from the transport port numbers,
   following the convention maintained by [IANA](https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml).
 
   Please, remember that this is just a convention:
 
   > **Warning**
-  > 
+  >
   > The Internet Assigned Numbers Authority (IANA) is responsible for maintaining
   > the official assignments of port numbers for specific uses. <br>
   > However, many unofficial uses of well-known port numbers occur in practice.
 
   The following table reports the port-to-service mappings used by Sniffnet,
   chosen from the most common assignments by IANA.
-  
+
 <div align="center">
 
 |Port number(s)|Application protocol  |  Description |
@@ -400,6 +400,38 @@ The currently usable hotkeys are reported in the following.
 
 </details>
 
+## Custom themes
+<details>
+
+  <summary>See details</summary>
+
+  Custom themes are specified as a TOML file.
+
+  The TOML must follow this format:
+  ```toml
+  # Colors are in RGB/RGBA hexadecimal.
+  primary = "#1e1e2e"           # Background
+  secondary = "#89b4fa"         # Headers / incoming connections
+  buttons = "#313244"           # Buttons
+  outgoing = "#f5c2e7"          # Outgoing connections
+  text_headers = "#11111b"      # Text headers
+  text_body = "#cdd6f4"         # Text body
+  starred = "#f9e2afaa"         # Favorites
+
+  # The following parameters are in the range [0.0, 1.0].
+  round_borders_alpha = 0.3     # Borders opacity
+  round_containers_alpha = 0.15 # Containers opacity
+  chart_badge_alpha = 0.2       # Chart opacity
+
+  # Set to true if the theme is dark, false if it's light.
+  nightly = true
+  ```
+
+  The example theme above uses colors from [Catppuccin Mocha](https://github.com/catppuccin/catppuccin).
+
+  To use a custom theme for your instance of Sniffnet, specify the path of your TOML file in the application's 
+  settings (at the bottom of the style tab).
+</details>
 
 ## Troubleshooting
 
@@ -416,9 +448,9 @@ Check the [required dependencies](#required-dependencies) section for instructio
 ### Rendering problems
 
 In some circumstances, especially if you are running on an old architecture or your graphical drivers are not up-to-date,
-the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced) 
+the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced)
 may cause problems (country icons are completely black, or the interface glitches). <br>
-In these cases you can download an alternative version of the application, 
+In these cases you can download an alternative version of the application,
 which is based on `tiny-skia`, a CPU-only software renderer that should work properly on every environment: <br>
 [Windows](https://github.com/GyulyVGC/sniffnet/suites/18338999542/artifacts/1061225849) |
 [macOS](https://github.com/GyulyVGC/sniffnet/suites/18338999542/artifacts/1061225848) |
@@ -439,5 +471,3 @@ which is based on `tiny-skia`, a CPU-only software renderer that should work pro
 <p align="center"><a href="https://github.com/iced-rs/iced"><img alt="" src="https://user-images.githubusercontent.com/100347457/219339409-0a44722b-416d-410b-93a4-8b0e84c0031d.svg" width="50%"/></a></p>
 
 - Last but not least, thanks to [every single stargazer](https://github.com/GyulyVGC/sniffnet/stargazers): all forms of support made it possible to keep improving Sniffnet!
-
-<p align="center"><a href="https://github.com/GyulyVGC/sniffnet/stargazers"><img alt="" src="https://reporoster.com/stars/dark/GyulyVGC/sniffnet"/></a></p>
diff --git a/resources/fonts/subset/icons.ttf b/resources/fonts/subset/icons.ttf
diff --git a/resources/themes/catppuccin_mocha.toml b/resources/themes/catppuccin_mocha.toml
@@ -0,0 +1,16 @@
+# Colors are in RGB/RGBA hexadecimal.
+primary = "#1e1e2e"           # Background
+secondary = "#89b4fa"         # Headers / incoming connections
+buttons = "#313244"           # Buttons
+outgoing = "#f5c2e7"          # Outgoing connections
+text_headers = "#11111b"      # Text headers
+text_body = "#cdd6f4"         # Text body
+starred = "#f9e2afaa"         # Favorites
+
+# The following parameters are in the range [0.0, 1.0].
+round_borders_alpha = 0.3     # Borders opacity
+round_containers_alpha = 0.15 # Containers opacity
+chart_badge_alpha = 0.2       # Chart opacity
+
+# Set to true if the theme is dark, false if it's light.
+nightly = true
diff --git a/src/configs/types/config_advanced_settings.rs b/src/configs/types/config_advanced_settings.rs
@@ -0,0 +1,48 @@
+//! Module defining the `ConfigAdvancedSettings` struct, which allows to save and reload
+//! the application advanced settings.
+
+use crate::utils::formatted_strings::get_default_report_file_path;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, PartialEq)]
+pub struct ConfigAdvancedSettings {
+    pub scale_factor: f64,
+    pub mmdb_country: String,
+    pub mmdb_asn: String,
+    pub style_path: String,
+    pub output_path: String,
+}
+
+impl ConfigAdvancedSettings {
+    pub fn load() -> Self {
+        if let Ok(advanced_settings) =
+            confy::load::<ConfigAdvancedSettings>("sniffnet", "advanced_settings")
+        {
+            advanced_settings
+        } else {
+            confy::store(
+                "sniffnet",
+                "advanced_settings",
+                ConfigAdvancedSettings::default(),
+            )
+            .unwrap_or(());
+            ConfigAdvancedSettings::default()
+        }
+    }
+
+    pub fn store(self) {
+        confy::store("sniffnet", "advanced_settings", self).unwrap_or(());
+    }
+}
+
+impl Default for ConfigAdvancedSettings {
+    fn default() -> Self {
+        ConfigAdvancedSettings {
+            scale_factor: 1.0,
+            mmdb_country: String::new(),
+            mmdb_asn: String::new(),
+            style_path: String::new(),
+            output_path: get_default_report_file_path(),
+        }
+    }
+}
diff --git a/src/configs/types/config_device.rs b/src/configs/types/config_device.rs
@@ -22,6 +22,19 @@ impl Default for ConfigDevice {
 }
 
 impl ConfigDevice {
+    pub fn load() -> Self {
+        if let Ok(device) = confy::load::<ConfigDevice>("sniffnet", "device") {
+            device
+        } else {
+            confy::store("sniffnet", "device", ConfigDevice::default()).unwrap_or(());
+            ConfigDevice::default()
+        }
+    }
+
+    pub fn store(self) {
+        confy::store("sniffnet", "device", self).unwrap_or(());
+    }
+
     pub fn to_my_device(&self) -> MyDevice {
         for device in Device::list().unwrap() {
             if device.name.eq(&self.device_name) {

diff --git a/src/configs/types/config_settings.rs b/src/configs/types/config_settings.rs
@@ -15,3 +15,18 @@ pub struct ConfigSettings {
     // StyleType should be last in order to deserialize as a table properly
     pub style: StyleType,
 }
+
+impl ConfigSettings {
+    pub fn load() -> Self {
+        if let Ok(settings) = confy::load::<ConfigSettings>("sniffnet", "settings") {
+            settings
+        } else {
+            confy::store("sniffnet", "settings", ConfigSettings::default()).unwrap_or(());
+            ConfigSettings::default()
+        }
+    }
+
+    pub fn store(self) {
+        confy::store("sniffnet", "settings", self).unwrap_or(());
+    }
+}
diff --git a/src/configs/types/config_window.rs b/src/configs/types/config_window.rs
@@ -0,0 +1,42 @@
+use iced::window::Position;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Copy, Clone)]
+pub struct ConfigWindow {
+    pub position: (i32, i32),
+    pub size: (u32, u32),
+}
+
+impl ConfigWindow {
+    pub fn load() -> Self {
+        if let Ok(window) = confy::load::<ConfigWindow>("sniffnet", "window") {
+            window
+        } else {
+            confy::store("sniffnet", "window", ConfigWindow::default()).unwrap_or(());
+            ConfigWindow::default()
+        }
+    }
+
+    pub fn store(self) {
+        confy::store("sniffnet", "window", self).unwrap_or(());
+    }
+}
+
+impl Default for ConfigWindow {
+    fn default() -> Self {
+        Self {
+            position: (0, 0),
+            size: (1190, 670),
+        }
+    }
+}
+
+pub trait ToPosition {
+    fn to_position(self) -> Position;
+}
+
+impl ToPosition for (i32, i32) {
+    fn to_position(self) -> Position {
+        Position::Specific(self.0, self.1)
+    }
+}
diff --git a/src/configs/types/configs.rs b/src/configs/types/configs.rs
@@ -0,0 +1,27 @@
+use crate::{ConfigAdvancedSettings, ConfigDevice, ConfigSettings, ConfigWindow};
+
+#[derive(Default)]
+pub struct Configs {
+    pub settings: ConfigSettings,
+    pub device: ConfigDevice,
+    pub advanced_settings: ConfigAdvancedSettings,
+    pub window: ConfigWindow,
+}
+
+impl Configs {
+    pub fn load() -> Self {
+        Configs {
+            settings: ConfigSettings::load(),
+            device: ConfigDevice::load(),
+            advanced_settings: ConfigAdvancedSettings::load(),
+            window: ConfigWindow::load(),
+        }
+    }
+
+    pub fn store(self) {
+        self.settings.store();
+        self.device.store();
+        self.advanced_settings.store();
+        self.window.store();
+    }
+}
diff --git a/src/configs/types/mod.rs b/src/configs/types/mod.rs
@@ -1,2 +1,5 @@
+pub mod config_advanced_settings;
 pub mod config_device;
 pub mod config_settings;
+pub mod config_window;
+pub mod configs;
diff --git a/src/countries/country_utils.rs b/src/countries/country_utils.rs
@@ -3,7 +3,6 @@ use iced::widget::tooltip::Position;
 use iced::widget::Svg;
 use iced::widget::Tooltip;
 use iced::{Font, Length, Renderer};
-use maxminddb::{geoip2, MaxMindDBError, Reader};
 
 use crate::countries::flags_pictures::{
     AD, AE, AF, AG, AI, AL, AM, AO, AQ, AR, AS, AT, AU, AW, AX, AZ, BA, BB, BD, BE, BF, BG, BH, BI,
@@ -27,21 +26,6 @@ use crate::translations::translations_2::{
 };
 use crate::{Language, StyleType};
 
-pub const COUNTRY_MMDB: &[u8] = include_bytes!("../../resources/DB/GeoLite2-Country.mmdb");
-
-pub fn get_country(address_to_lookup: &str, country_db_reader: &Reader<&[u8]>) -> Country {
-    let country_result: Result<geoip2::Country, MaxMindDBError> =
-        country_db_reader.lookup(address_to_lookup.parse().unwrap());
-    if let Ok(res1) = country_result {
-        if let Some(res2) = res1.country {
-            if let Some(res3) = res2.iso_code {
-                return Country::from_str(res3);
-            }
-        }
-    }
-    Country::ZZ // unknown
-}
-
 fn get_flag_from_country(
     country: Country,
     width: f32,