From 58ecbd6a757e5c1d589f0652b68973bb62362f64 Mon Sep 17 00:00:00 2001
From: candifloss <candifloss@candifloss.cc>
Date: Sun, 19 Jan 2025 15:57:08 +0530
Subject: [PATCH] Seperated prompt and prompt-pwd into 2 binaries

---
 Cargo.lock                       |  2 +-
 Cargo.toml                       | 10 +++++++++-
 README.md                        |  2 +-
 src/indicators/git.rs            |  6 +++---
 src/{main.rs => prettyprompt.rs} | 18 ++----------------
 src/prettyprompt_pwd.rs          | 26 ++++++++++++++++++++++++++
 6 files changed, 42 insertions(+), 22 deletions(-)
 rename src/{main.rs => prettyprompt.rs} (81%)
 create mode 100644 src/prettyprompt_pwd.rs

diff --git a/Cargo.lock b/Cargo.lock
index 39cac17..91515a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,7 +13,7 @@ dependencies = [
 
 [[package]]
 name = "prettyprompt"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "ansi_term",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 56acdc0..44ecc12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,15 @@
 [package]
 name = "prettyprompt"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 [dependencies]
 ansi_term = "0.12"
+
+[[bin]]
+name = "prettyprompt"
+path = "src/prettyprompt.rs"
+
+[[bin]]
+name = "prettyprompt-pwd"
+path = "src/prettyprompt_pwd.rs"
\ No newline at end of file
diff --git a/README.md b/README.md
index 4f5c7d0..affe043 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ cargo build --release
 **Step 2. Add to `$PATH`**  
   - Option 1. Move the binary to a directory in your `$PATH`. Eg:
 ```bash  
-sudo mv target/release/prettyprompt /usr/bin/
+sudo mv target/release/prettyprompt target/release/prettyprompt-pwd /usr/bin/ 
 ```  
   - Option 2. Add the directory containing the binary to `$PATH`  
    System-wide: `/etc/profile`  
diff --git a/src/indicators/git.rs b/src/indicators/git.rs
index e459fe9..9a60a42 100644
--- a/src/indicators/git.rs
+++ b/src/indicators/git.rs
@@ -7,7 +7,7 @@ pub const GIT_SYMBOL: &str = "\u{276F}"; // Git indicator symbol: "❯"
 pub const MAIN_COL: ansi_term::Colour = RGB(178, 98, 44);
 pub const DEV_COL: ansi_term::Colour = RGB(54, 159, 150);
 pub const DEFAULT_BRANCH_COL: ansi_term::Colour = RGB(255, 255, 255);
-pub const NORMIE_COL: ansi_term::Colour = RGB(82, 82, 82); 
+pub const NORMIE_COL: ansi_term::Colour = RGB(82, 82, 82);
 
 /// Returns the repo's root and branch, if present
 pub fn info() -> Option<(String, String)> {
@@ -20,10 +20,10 @@ pub fn info() -> Option<(String, String)> {
         let output_str = String::from_utf8_lossy(&output.stdout).trim().to_string();
         let parts: Vec<&str> = output_str.split('\n').collect();
         if parts.len() == 2 {
-            return Some((parts[0].to_string(), parts[1].to_string()));	// If the `git`` command returns a repo and branch
+            return Some((parts[0].to_string(), parts[1].to_string())); // If the `git`` command returns a repo and branch
         }
     }
-    None	// If the current directory is not in a git repo
+    None // If the current directory is not in a git repo
 }
 
 /// The name of the repo
diff --git a/src/main.rs b/src/prettyprompt.rs
similarity index 81%
rename from src/main.rs
rename to src/prettyprompt.rs
index 3d6ed5c..ebe7e86 100644
--- a/src/main.rs
+++ b/src/prettyprompt.rs
@@ -1,12 +1,11 @@
 mod indicators {
     pub mod error;
     pub mod git;
-    pub mod pwd;
     pub mod ssh;
     pub mod user;
 }
 
-use crate::indicators::{error, git, pwd, ssh, user};
+use crate::indicators::{error, git, ssh, user};
 use ansi_term::{ANSIGenericString, ANSIGenericStrings};
 
 // Add a component to the prompt if the condition is true.
@@ -31,13 +30,9 @@ fn main() {
     let indicate_ssh: bool = true;
     let indicate_err: bool = true;
     let indicate_git_branch: bool = true;
-    let show_pwd: bool = true;
-    let abbrev_home: bool = true;
-    let shorten_path: bool = true;
-    let replace_repo: bool = true;
 
     // Conditionally fetch Git-related info if required, or set to None
-    let git_info: Option<(String, String)> = if indicate_git_branch || replace_repo {
+    let git_info: Option<(String, String)> = if indicate_git_branch {
         git::info()
     } else {
         None
@@ -53,15 +48,6 @@ fn main() {
         error::indicator(&cmd_args)
     });
 
-    // Insert `pwd` at the beginning of the prompt
-    if show_pwd {
-        let repo_path = git_info.map(|info| info.0);
-        components.insert(
-            0,
-            pwd::pwd(abbrev_home, shorten_path, replace_repo, repo_path),
-        );
-    }
-
     // Finally, combine the parts into a single prompts string
     let prompt: ANSIGenericStrings<'_, str> = ANSIGenericStrings(&components[..]);
     // `print!()` prevents an extra newline, unlike `println!()`
diff --git a/src/prettyprompt_pwd.rs b/src/prettyprompt_pwd.rs
new file mode 100644
index 0000000..2459a61
--- /dev/null
+++ b/src/prettyprompt_pwd.rs
@@ -0,0 +1,26 @@
+mod indicators {
+    pub mod git;
+    pub mod pwd;
+}
+
+use crate::indicators::{git, pwd};
+
+fn main() {
+    // Hard-coded configuration. This will be replaced by a configuration file in a future version
+    let indicate_git_branch: bool = true;
+    let abbrev_home: bool = true;
+    let shorten_path: bool = true;
+    let replace_repo: bool = true;
+
+    // Conditionally fetch Git-related info if required, or set to None
+    let git_info: Option<(String, String)> = if indicate_git_branch || replace_repo {
+        git::info()
+    } else {
+        None
+    };
+
+    let repo_path = git_info.map(|info| info.0);
+    let promt_pwd = pwd::pwd(abbrev_home, shorten_path, replace_repo, repo_path);
+
+    print!("{promt_pwd}"); // A trailing space for aesthetic formatting.
+}