improve readability

Author: extrawurst

asyncgit/src/sync/logwalker.rs

@@ -3,7 +3,7 @@ use super::CommitId;
 use crate::{error::Result, sync::commit_files::get_commit_diff};
 use bitflags::bitflags;
 use fuzzy_matcher::FuzzyMatcher;
-use git2::{Commit, Oid, Repository};
+use git2::{Commit, Diff, Oid, Repository};
 use std::{
 	cmp::Ordering,
 	collections::{BinaryHeap, HashSet},
@@ -81,6 +81,43 @@ pub struct LogFilterSearch {
 	pub options: FilterSearchOptions,
 }
 
+impl LogFilterSearch {
+	fn match_diff(&self, diff: &Diff<'_>) -> bool {
+		diff.deltas().any(|delta| {
+			if delta
+				.new_file()
+				.path()
+				.and_then(|file| file.as_os_str().to_str())
+				.map(|file| {
+					self.matcher
+						.fuzzy_match(
+							file,
+							self.search_pattern.as_str(),
+						)
+						.is_some()
+				})
+				.unwrap_or_default()
+			{
+				return true;
+			}
+
+			delta
+				.old_file()
+				.path()
+				.and_then(|file| file.as_os_str().to_str())
+				.map(|file| {
+					self.matcher
+						.fuzzy_match(
+							file,
+							self.search_pattern.as_str(),
+						)
+						.is_some()
+				})
+				.unwrap_or_default()
+		})
+	}
+}
+
 ///
 pub fn filter_commit_by_search(
 	filter: LogFilterSearch,
@@ -115,48 +152,7 @@ pub fn filter_commit_by_search(
 					.ok()
 				})
 				.flatten()
-				.map(|diff| {
-					diff.deltas().any(|delta| {
-						let new_file_match = delta
-							.new_file()
-							.path()
-							.and_then(|file| {
-								file.as_os_str().to_str()
-							})
-							.map(|file| {
-								filter
-									.matcher
-									.fuzzy_match(
-										file,
-										filter
-											.search_pattern
-											.as_str(),
-									)
-									.is_some()
-							})
-							.unwrap_or_default();
-						let old_file_match = delta
-							.old_file()
-							.path()
-							.and_then(|file| {
-								file.as_os_str().to_str()
-							})
-							.map(|file| {
-								filter
-									.matcher
-									.fuzzy_match(
-										file,
-										filter
-											.search_pattern
-											.as_str(),
-									)
-									.is_some()
-							})
-							.unwrap_or_default();
-
-						old_file_match || new_file_match
-					})
-				})
+				.map(|diff| filter.match_diff(&diff))
 				.unwrap_or_default();
 
 			Ok(msg_match || file_match)