Add assets via include_bytes

Author: PerminovEugene

README.md

@@ -35,22 +35,30 @@ Before using this application, you need to install the following dependencies:
 
 4. Download latest release
 
-`curl -s https://api.github.com/repos/PerminovEugene/messy-folder-reorganizer-ai/releases/latest | \
+```sh
+curl -s https://api.github.com/repos/PerminovEugene/messy-folder-reorganizer-ai/releases/latest | \
   grep "browser_download_url.*messy-folder-reorganizer-ai-aarch64-apple-darwin.tar.gz" | \
   cut -d '"' -f 4 | \
-  xargs curl -L -o messy-folder-reorganizer-ai-macos.tar.gz`
+  xargs curl -L -o messy-folder-reorganizer-ai-macos.tar.gz
+```
 
 5. Extract the file
 
-`tar -xvzf messy-folder-reorganizer-ai-macos.tar.gz`
+```sh
+tar -xvzf messy-folder-reorganizer-ai-macos.tar.gz
+```
 
-6. Move to /usr/local/bin for system-wide use
+6. Move to `/usr/local/bin` for system-wide use
 
-`sudo mv messy-folder-reorganizer-ai /usr/local/bin/messy-folder-reorganizer-ai`
+```sh
+sudo mv messy-folder-reorganizer-ai /usr/local/bin/messy-folder-reorganizer-ai
+```
 
 7. Verify installation
 
-`messy-folder-reorganizer-ai --help`
+```sh
+messy-folder-reorganizer-ai --help
+```
 
 ## Usage
 
@@ -124,6 +132,15 @@ This will create git precommit hook, which will run linters before commit.
 Run `cargo clippy` to reveal code problems and `cargo fmt` to fix linting errors.
 If you installed some dependencies - please run `cargo +nightly udeps` to check that all of them has been used.
 
+## Uninstall & Purge
+
+To completely remove `messy-folder-reorganizer-ai` from your system:
+
+```sh
+rm -f /usr/local/bin/messy-folder-reorganizer-ai
+rm -rf ~/.messy-folder-reorganizer-ai
+```
+
 ## TODO
 
 - Release.

src/ai/ai_request.rs

@@ -63,6 +63,7 @@ pub async fn ask_ai_for_reordering_plan(
         options: &options,
     };
 
+    println!();
     println!("{}", "🤖 Model options:".green());
     println!("{}", serde_json::to_string_pretty(&options).unwrap());
 

src/configuration/embedded_assets.rs

@@ -0,0 +1,7 @@
+/// Embedded assets (compile-time constants).
+/// Adjust the relative paths so they point correctly to your files on disk.
+/// For example, if this file is at `src/configuration/mod.rs`,
+/// and your `assets` folder is at the project root, you might need `../../assets/...`.
+pub const CONFIG_FILE_BYTES: &[u8] = include_bytes!("../../assets/config.toml");
+pub const INITIAL_PROMPT_FILE_BYTES: &[u8] =
+    include_bytes!("../../assets/prompts/initial_sort_request.md");

src/configuration/init.rs

@@ -5,86 +5,54 @@ use std::path::{Path, PathBuf};
 use crate::configuration::consts::{
     CONFIGURATION_FILE, CONFIGURATION_FOLDER, INITIAL_PROMPT_FILE, PROMPTS_FOLDER,
 };
+// Make sure you can access the embedded constants (either inline or in another mod)
+use crate::configuration::embedded_assets::{CONFIG_FILE_BYTES, INITIAL_PROMPT_FILE_BYTES};
 
 pub fn init() {
-    let assets = get_runtime_assets_dir();
-    let in_project_config_path = assets.join(CONFIGURATION_FILE);
-    let in_project_initial_prompt_path = assets.join(PROMPTS_FOLDER).join(INITIAL_PROMPT_FILE);
-
     create_application_config_folder();
 
-    let config_file_path = get_config_file_path();
-    create_application_config_file(&config_file_path, in_project_config_path);
+    let config_file_path = get_config_file_path(); // e.g. ~/.messy-folder-reorganizer-ai/config.toml
+    let initial_prompt_file_path = get_initial_prompt_file_path(); // e.g. ~/.messy-folder-reorganizer-ai/prompts/initial_prompt.txt
 
-    let initial_prompt_file_path = get_initial_prompt_file_path();
-    create_application_config_file(&initial_prompt_file_path, in_project_initial_prompt_path);
+    create_application_file_if_missing(&config_file_path, CONFIG_FILE_BYTES);
+    create_application_file_if_missing(&initial_prompt_file_path, INITIAL_PROMPT_FILE_BYTES);
 }
 
-/// Returns the correct path to the `assets/` directory for both `cargo run` and installed versions.
-fn get_runtime_assets_dir() -> PathBuf {
-    let exe_path = env::current_exe().unwrap_or_else(|_| PathBuf::from("."));
-
-    // If running from Cargo (`target/debug/` or `target/release/`), go up twice to find `src/`
-    if exe_path.to_string_lossy().contains("target/") {
-        let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); // Root of the project
-        return manifest_dir.join("assets");
+fn create_application_config_folder() {
+    let home_dir = env::var("HOME").unwrap_or_else(|_| ".".to_string());
+    let config_dir = format!("{}/.messy-folder-reorganizer-ai", home_dir);
+    if !Path::new(&config_dir).exists() {
+        fs::create_dir_all(&config_dir).expect("Failed to create config directory");
     }
 
-    // Otherwise, assume assets are in the same folder as the installed binary
-    exe_path
-        .parent()
-        .map(|dir| dir.join("assets"))
-        .unwrap_or_else(|| PathBuf::from("assets"))
+    let prompts_dir = format!("{}/.messy-folder-reorganizer-ai/prompts", home_dir);
+    if !Path::new(&prompts_dir).exists() {
+        fs::create_dir_all(&prompts_dir).expect("Failed to create prompts directory");
+    }
 }
 
 pub fn get_config_file_path() -> PathBuf {
-    let home_dir: String = env::var("HOME").unwrap_or_else(|_| ".".to_string());
+    let home_dir = env::var("HOME").unwrap_or_else(|_| ".".to_string());
     Path::new(&home_dir)
         .join(CONFIGURATION_FOLDER)
         .join(CONFIGURATION_FILE)
 }
 
 pub fn get_initial_prompt_file_path() -> PathBuf {
-    let home_dir: String = env::var("HOME").unwrap_or_else(|_| ".".to_string());
+    let home_dir = env::var("HOME").unwrap_or_else(|_| ".".to_string());
     Path::new(&home_dir)
         .join(CONFIGURATION_FOLDER)
         .join(PROMPTS_FOLDER)
         .join(INITIAL_PROMPT_FILE)
 }
 
-fn create_application_config_folder() {
-    let home_dir = env::var("HOME").unwrap_or_else(|_| ".".to_string());
-    let config_dir = format!("{}/.messy-folder-reorganizer-ai", home_dir);
-    if !Path::new(&config_dir).exists() {
-        fs::create_dir_all(&config_dir).expect("Failed to create config directory");
-    }
-
-    let prompts_dir = format!("{}/.messy-folder-reorganizer-ai/prompts", home_dir);
-    if !Path::new(&prompts_dir).exists() {
-        fs::create_dir_all(&prompts_dir).expect("Failed to create prompts directory");
-    }
-}
-
-fn create_application_config_file(config_file_path: &Path, source: PathBuf) {
+fn create_application_file_if_missing(config_file_path: &Path, embedded_content: &[u8]) {
     if !config_file_path.exists() {
-        // Ensure parent directory exists
         if let Some(parent) = config_file_path.parent() {
             fs::create_dir_all(parent).expect("Failed to create parent directories");
         }
 
-        // Copy the file
-        println!("Copying from source: {:?}", source);
-        println!("Copying to: {:?}", config_file_path);
-
-        match fs::read(&source) {
-            Ok(content) => {
-                fs::write(config_file_path, content).expect("Failed to copy config file");
-                println!("Initialized {:?} file.", config_file_path);
-            }
-            Err(e) => {
-                println!("Warning: Could not read source file {:?} ({})", source, e);
-                panic!("File one not found");
-            }
-        }
+        fs::write(config_file_path, embedded_content).expect("Failed to write embedded content");
+        println!("Initialized file: {:?}", config_file_path);
     }
 }

src/configuration/mod.rs

@@ -1,5 +1,6 @@
 pub mod args;
 pub mod config;
 pub mod consts;
+pub mod embedded_assets;
 pub mod init;
 pub mod read_config;