refactor: restructurize the codebase

Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-clap = "4.5.7"
+clap = { version = "4.5.7", features = ["derive"] }
 derive_builder = "0.20.0"
 derive_more = "0.99.18"
 fontdue = "0.9.2"

README.md

@@ -22,7 +22,7 @@ cargo install --git https://github.com/noti-rs/noti/
 After installation, you can start Noti with:
 
 ```bash
-noti
+noti run
 ```
 
 To enable Noti to start automatically with your Wayland session, add it to your session startup script.

src/core.rs → src/backend/mod.rs

@@ -2,12 +2,15 @@ use std::thread;
 
 use tokio::sync::mpsc::unbounded_channel;
 
+mod render;
+
 use crate::{
     data::{aliases::Result, dbus::Action},
     dbus::server::Server,
-    render::Renderer,
 };
 
+use render::Renderer;
+
 pub async fn run() -> Result<()> {
     let (sender, mut receiver) = unbounded_channel();
     let server = Server::init(sender).await?;

src/render/layer.rs → src/backend/render/layer.rs

@@ -1,13 +1,12 @@
 use std::{fs::File, io::Write, os::fd::AsFd, sync::Arc, time};
 
 use crate::{
-    config::{self, sorting::Sorting, CONFIG},
+    config::{self, CONFIG},
     data::{
         aliases::Result,
         internal_messages::RendererMessage,
         notification::{self, Notification},
     },
-    render::border::BorderBuilder,
 };
 use wayland_client::{
     delegate_noop,
@@ -23,7 +22,9 @@ use wayland_protocols_wlr::layer_shell::v1::client::{
     zwlr_layer_surface_v1::{self, Anchor},
 };
 
-use super::{color::Bgra, font::FontCollection, image::Image, text::TextRect};
+use super::{
+    border::BorderBuilder, color::Bgra, font::FontCollection, image::Image, text::TextRect,
+};
 
 pub(crate) struct NotificationStack {
     connection: Connection,

src/render/text.rs → src/backend/render/text.rs

@@ -5,10 +5,9 @@ use fontdue::Metrics;
 use crate::{
     config::{spacing::Spacing, TextAlignment},
     data::text::Text,
-    render::font::FontStyle,
 };
 
-use super::{color::Bgra, font::FontCollection, image::Image};
+use super::{color::Bgra, font::FontCollection, font::FontStyle, image::Image};
 
 #[derive(Default)]
 pub(crate) struct TextRect {

src/cli.rs

@@ -0,0 +1,26 @@
+use clap::Parser;
+
+use crate::{backend, config::CONFIG, data::aliases::Result};
+
+/// The notification system which derives a notification to user
+/// using wayland client.
+#[derive(Parser)]
+#[command(version, about, name = env!("CARGO_PKG_NAME"))]
+pub enum Args {
+    /// Starts the backend. Use it in systemd, openrc or any other services.
+    Run,
+}
+
+impl Args {
+    pub async fn process(&self) -> Result<()> {
+        match self {
+            Args::Run => {
+                let _ = &*CONFIG; // Initializes the configuration.
+
+                backend::run().await?;
+            }
+        }
+
+        Ok(())
+    }
+}

src/main.rs

@@ -1,16 +1,16 @@
+mod backend;
+mod cli;
 mod config;
-mod core;
 mod data;
 mod dbus;
-mod render;
 
-use config::CONFIG;
+use clap::Parser;
+
+use cli::Args;
 use data::aliases::Result;
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    dbg!(&*CONFIG); // &* used for initializing
-
-    core::run().await?;
-    Ok(())
+    let args = Args::parse();
+    args.process().await
 }