siddheshmhatre/noentropy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: eliminate unnecessary clones and improve API ergonomics

Browse Source 
- PromptBuilder::new now takes &[String] instead of Vec<String>
- GeminiClient::new now takes &str, &[String] instead of owned values
- FileBatch::from_path now takes &Path instead of PathBuf
- categorize_files_offline now takes Vec<String> (ownership) instead of &[String]
- handle_offline_organization now takes FileBatch by value

These changes eliminate ~5-50 KB of unnecessary allocations for typical
file counts, reduce allocator pressure, and improve API clarity by properly
expressing ownership semantics.

No functional changes - all tests pass.
This commit is contained in:
glitchySid
2026-01-08 23:42:10 +05:30
parent eeb07983cb
commit ba0ea3f221
8 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/handlers/offline.rs
View File

@@ -6,14 +6,14 @@ use std::collections::HashMap;
use std::path::Path;
pub fn handle_offline_organization(
batch: &FileBatch,
batch: FileBatch,
target_path: &Path,
dry_run: bool,
undo_log: &mut UndoLog,
) -> Result<Option<OrganizationPlan>, Box<dyn std::error::Error>> {
println!("{}", "Categorizing files by extension...".cyan());
let result = categorize_files_offline(&batch.filenames);
let result = categorize_files_offline(batch.filenames);
if result.plan.files.is_empty() {
println!("{}", "No files could be categorized offline.".yellow());

2
src/cli/handlers/online.rs
View File

@@ -18,7 +18,7 @@ pub async fn handle_online_organization(
cache: &mut Cache,
undo_log: &mut UndoLog,
) -> Result<Option<OrganizationPlan>, Box<dyn std::error::Error>> {
let client = GeminiClient::new(config.api_key.clone(), config.categories.clone());
let client = GeminiClient::new(&config.api_key, &config.categories);
println!("Asking Gemini to organize...");

6
src/cli/orchestrator.rs
View File

@@ -42,7 +42,7 @@ pub async fn handle_organization(
}
};
let batch = FileBatch::from_path(target_path.clone(), args.recursive);
let batch = FileBatch::from_path(&target_path, args.recursive);
if batch.filenames.is_empty() {
println!("{}", "No files found to organize!".yellow());
@@ -56,7 +56,7 @@ pub async fn handle_organization(
println!("{}", "Using offline mode (--offline flag).".cyan());
true
} else {
let client = GeminiClient::new(config.api_key.clone(), config.categories.clone());
let client = GeminiClient::new(&config.api_key, &config.categories);
match client.check_connectivity().await {
Ok(()) => false,
Err(e) => {
@@ -71,7 +71,7 @@ pub async fn handle_organization(
};
let plan = if use_offline {
handle_offline_organization(&batch, &target_path, args.dry_run, &mut undo_log)?
handle_offline_organization(batch, &target_path, args.dry_run, &mut undo_log)?
} else {
handle_online_organization(
&args,

13
src/files/batch.rs
View File

@@ -1,4 +1,4 @@
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use walkdir::WalkDir;
#[derive(Debug)]
@@ -8,7 +8,7 @@ pub struct FileBatch {
}
impl FileBatch {
pub fn from_path(root_path: PathBuf, recursive: bool) -> Self {
pub fn from_path(root_path: &Path, recursive: bool) -> Self {
let mut filenames = Vec::new();
let mut paths = Vec::new();
let walker = if recursive {
@@ -45,6 +45,7 @@ impl FileBatch {
mod tests {
use super::*;
use std::fs::{self, File};
use std::path::Path;
#[test]
fn test_file_batch_from_path() {
@@ -55,7 +56,7 @@ mod tests {
File::create(dir_path.join("file2.rs")).unwrap();
fs::create_dir(dir_path.join("subdir")).unwrap();
let batch = FileBatch::from_path(dir_path.to_path_buf(), false);
let batch = FileBatch::from_path(dir_path, false);
assert_eq!(batch.count(), 2);
assert!(batch.filenames.contains(&"file1.txt".to_string()));
assert!(batch.filenames.contains(&"file2.rs".to_string()));
@@ -63,7 +64,7 @@ mod tests {
#[test]
fn test_file_batch_from_path_nonexistent() {
let batch = FileBatch::from_path(PathBuf::from("/nonexistent/path"), false);
let batch = FileBatch::from_path(Path::new("/nonexistent/path"), false);
assert_eq!(batch.count(), 0);
}
@@ -75,7 +76,7 @@ mod tests {
File::create(dir_path.join("file2.rs")).unwrap();
fs::create_dir(dir_path.join("subdir")).unwrap();
File::create(dir_path.join("subdir").join("file3.txt")).unwrap();
let batch = FileBatch::from_path(dir_path.to_path_buf(), false);
let batch = FileBatch::from_path(dir_path, false);
assert_eq!(batch.count(), 2);
assert!(batch.filenames.contains(&"file1.txt".to_string()));
assert!(batch.filenames.contains(&"file2.rs".to_string()));
@@ -93,7 +94,7 @@ mod tests {
File::create(dir_path.join("subdir1").join("nested").join("file3.md")).unwrap();
fs::create_dir(dir_path.join("subdir2")).unwrap();
File::create(dir_path.join("subdir2").join("file4.py")).unwrap();
let batch = FileBatch::from_path(dir_path.to_path_buf(), true);
let batch = FileBatch::from_path(dir_path, true);
assert_eq!(batch.count(), 4);
assert!(batch.filenames.contains(&"file1.txt".to_string()));
assert!(batch.filenames.contains(&"subdir1/file2.rs".to_string()));

10
src/files/categorizer.rs
View File

@@ -120,21 +120,21 @@ pub struct OfflineCategorizationResult {
/// Categorizes a list of filenames using extension-based rules.
/// Returns categorized files and a list of skipped filenames.
pub fn categorize_files_offline(filenames: &[String]) -> OfflineCategorizationResult {
pub fn categorize_files_offline(filenames: Vec<String>) -> OfflineCategorizationResult {
let mut files = Vec::with_capacity(filenames.len());
let mut skipped = Vec::new();
for filename in filenames {
match categorize_by_extension(filename) {
match categorize_by_extension(&filename) {
Some(category) => {
files.push(FileCategory {
filename: filename.clone(),
filename,
category: category.to_string(),
sub_category: String::new(),
});
}
None => {
skipped.push(filename.clone());
skipped.push(filename);
}
}
}
@@ -187,7 +187,7 @@ mod tests {
"file.xyz".to_string(),
];
let result = categorize_files_offline(&filenames);
let result = categorize_files_offline(filenames);
assert_eq!(result.plan.files.len(), 2);
assert_eq!(result.skipped.len(), 2);

11
src/gemini/client.rs
View File

@@ -41,8 +41,12 @@ impl GeminiClient {
}
}
pub fn new(api_key: String, categories: Vec<String>) -> Self {
Self::with_model(api_key, DEFAULT_MODEL.to_string(), categories)
pub fn new(api_key: &str, categories: &[String]) -> Self {
Self::with_model(
api_key.to_string(),
DEFAULT_MODEL.to_string(),
categories.to_vec(),
)
}
pub fn with_model(api_key: String, model: String, categories: Vec<String>) -> Self {
@@ -102,8 +106,7 @@ impl GeminiClient {
return Ok(cached_response.clone());
}
let prompt =
PromptBuilder::new(filenames.clone()).build_categorization_prompt(&self.categories);
let prompt = PromptBuilder::new(&filenames).build_categorization_prompt(&self.categories);
let request_body = self.build_categorization_request(&prompt);
let res = self.send_request_with_retry(&url, &request_body).await?;

2
src/gemini/prompt.rs
View File

@@ -23,7 +23,7 @@ pub struct PromptBuilder {
}
impl PromptBuilder {
pub fn new(file_list: Vec<String>) -> Self {
pub fn new(file_list: &[String]) -> Self {
Self {
file_list: file_list.join(", "),
}

9
src/settings/prompt.rs
View File

@@ -70,14 +70,17 @@ impl Prompter {
pub fn prompt_download_folder() -> Result<PathBuf, Box<dyn std::error::Error>> {
let default_path = Self::get_default_downloads_folder();
let default_display = default_path.to_string_lossy();
let default_display = &default_path.to_string_lossy();
println!();
println!(
"Enter path to folder to organize (e.g., {}):",
default_display.yellow()
&default_display.yellow()
);
println!(
"Or press Enter to use default: {}",
&default_display.green()
);
println!("Or press Enter to use default: {}", default_display.green());
println!("Folder path: ");
let mut attempts = 0;