From 9f47346e6ce7e53df23268f67d46c259733ef458 Mon Sep 17 00:00:00 2001
From: sxyazi <sxyazi@gmail.com>
Date: Fri, 27 Oct 2023 14:18:36 +0800
Subject: [PATCH] ..

---
 yazi-shared/src/fns.rs | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/yazi-shared/src/fns.rs b/yazi-shared/src/fns.rs
index a79e50d2..7e4cb931 100644
--- a/yazi-shared/src/fns.rs
+++ b/yazi-shared/src/fns.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, env, path::{Component, Path, PathBuf}};
+use std::{borrow::Cow, env, ffi::OsString, path::{Component, Path, PathBuf}};
 
 use tokio::fs;
 
@@ -44,23 +44,31 @@ pub fn expand_url(mut u: Url) -> Url {
 }
 
 pub async fn unique_path(mut p: Url) -> Url {
-	let Some(name) = p.file_stem().map(|n| n.to_owned()) else {
+	let Some(stem) = p.file_stem().map(|s| s.to_owned()) else {
 		return p;
 	};
 
+	let ext = p
+		.extension()
+		.map(|s| {
+			let mut n = OsString::with_capacity(s.len() + 1);
+			n.push(".");
+			n.push(s);
+			n
+		})
+		.unwrap_or_default();
+
 	let mut i = 0;
 	while fs::symlink_metadata(&p).await.is_ok() {
 		i += 1;
-		let mut name = name.clone();
+
+		let mut name = OsString::with_capacity(stem.len() + ext.len() + 5);
+		name.push(&stem);
 		name.push(format!("_{i}"));
-		let extension = p.extension().map(|n| n.to_owned());
-		match extension {
-			Some(extension) => {
-				name.push(format!("."));
-				name.push(extension);
-			}
-			None => {}
+		if !ext.is_empty() {
+			name.push(&ext);
 		}
+
 		p.set_file_name(name);
 	}
 	p