Merge pull request #51 from Araxeus/fix-windows-pc-link

Cargo.toml

@@ -20,6 +20,7 @@ fuzzy-matcher = "0.3.7"
 crossterm = "0.26.1"
 unicode-segmentation = "1.10.1"
 tiny_update_notifier = "2.2.0"
+cached = "0.42.0"
 
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.47.0", features = ["Win32_Storage_FileSystem"] }

src/main.rs

@@ -6,9 +6,6 @@ use std::{fs, path::Path};
 use structs::{Entry, Filetype, Icons};
 use utils::{display_choices, err, get_first_arg, pretty_path, resolve_lnk, KeyModifiers};
 
-#[cfg(windows)]
-use utils::get_logical_drives;
-
 use tiny_update_notifier::check_github;
 
 fn main() {
@@ -79,7 +76,7 @@ fn get_choices(entry: &Entry) -> Vec<Entry> {
     #[cfg(windows)]
     // Open Drives View on Windows
     if entry.filetype == Filetype::DriveView {
-        match get_logical_drives() {
+        match utils::get_logical_drives() {
             Ok(drives) => {
                 for drive in drives {
                     result_vector.push(Entry {
@@ -110,7 +107,7 @@ fn get_choices(entry: &Entry) -> Vec<Entry> {
         // .. Open Drives View on Windows
         result_vector.push(Entry {
             name: String::from(".."),
-            path: env!("COMPUTERNAME").to_string(),
+            path: utils::get_computer_name(),
             icon: &Icons::PC,
             filetype: Filetype::DriveView,
         });

src/structs/prompt_renderer.rs

@@ -4,7 +4,7 @@ use std::{fmt, io};
 use console::{style, Style, StyledObject, Term};
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 
-use crate::utils::{link, link_with_label, pretty_path};
+use crate::utils::{get_computer_name, link, link_with_label, pretty_path};
 
 use super::Entry;
 
@@ -183,11 +183,16 @@ impl Theme {
         cursor_pos: usize,
     ) -> fmt::Result {
         if !prompt.is_empty() {
+            let link_text = if cfg!(windows) && prompt == get_computer_name() {
+                link_with_label("shell:MyComputerFolder", prompt)
+            } else {
+                link(prompt)
+            };
             write!(
                 f,
                 "{} {} ",
                 &self.prompt_prefix,
-                self.prompt_style.apply_to(link(prompt))
+                self.prompt_style.apply_to(link_text)
             )?;
         }
 

src/utils.rs

@@ -100,3 +100,8 @@ fn bitmask_to_vec(bitmask: u32) -> Vec<char> {
     }
     vec
 }
+
+#[cached::proc_macro::once]
+pub fn get_computer_name() -> String {
+    env::var("COMPUTERNAME").unwrap_or_else(|_| String::from("My Computer"))
+}