Add AsyncFileLogJob

Author: cruessler

asyncgit/src/file_log.rs

@@ -0,0 +1,77 @@
+//!
+
+use crate::asyncjob::{AsyncJob, RunParams};
+use crate::error::Result;
+use crate::sync::CommitId;
+use crate::AsyncGitNotification;
+use crate::StatusItemType;
+use std::sync::Arc;
+use std::sync::Mutex;
+
+enum JobState {
+	Request(String),
+	Response(Result<Vec<(CommitId, StatusItemType)>>),
+}
+
+///
+#[derive(Clone, Default)]
+pub struct AsyncFileLogJob {
+	state: Arc<Mutex<Option<JobState>>>,
+}
+
+impl AsyncFileLogJob {
+	///
+	pub fn new(file_path: &str) -> Self {
+		Self {
+			state: Arc::new(Mutex::new(Some(JobState::Request(
+				file_path.into(),
+			)))),
+		}
+	}
+}
+
+impl AsyncJob for AsyncFileLogJob {
+	type Notification = AsyncGitNotification;
+	type Progress = ();
+
+	fn run(
+		&mut self,
+		_params: RunParams<Self::Notification, Self::Progress>,
+	) -> Result<Self::Notification> {
+		if let Ok(mut state) = self.state.lock() {
+			*state = Some(JobState::Response(Ok(vec![])));
+		}
+
+		Ok(AsyncGitNotification::FileLog)
+	}
+}
+
+// fn get_file_status(&self, commit_id: CommitId) -> char {
+// 	self.file_path
+// 		.as_ref()
+// 		.and_then(|file_path| {
+// 			let repo = repo(CWD);
+
+// 			repo.ok().and_then(|repo| {
+// 				let diff = get_commit_diff(
+// 					&repo,
+// 					commit_id,
+// 					Some(file_path.clone()),
+// 				);
+
+// 				diff.ok().and_then(|diff| {
+// 					diff.deltas().next().map(|delta| {
+// 						let status: StatusItemType =
+// 							delta.status().into();
+
+// 						match status {
+// 							StatusItemType::New => 'A',
+// 							StatusItemType::Deleted => 'D',
+// 							_ => 'M',
+// 						}
+// 					})
+// 				})
+// 			})
+// 		})
+// 		.unwrap_or(' ')
+// }

asyncgit/src/lib.rs

@@ -29,6 +29,7 @@ mod commit_files;
 mod diff;
 mod error;
 mod fetch;
+pub mod file_log;
 mod progress;
 mod push;
 mod push_tags;
@@ -75,6 +76,8 @@ pub enum AsyncGitNotification {
 	///
 	Log,
 	///
+	FileLog,
+	///
 	CommitFiles,
 	///
 	Tags,

asyncgit/src/sync/utils.rs

@@ -44,7 +44,7 @@ pub fn is_bare_repo(repo_path: &str) -> Result<bool> {
 }
 
 ///
-pub(crate) fn repo(repo_path: &str) -> Result<Repository> {
+pub fn repo(repo_path: &str) -> Result<Repository> {
 	let repo = Repository::open_ext(
 		repo_path,
 		RepositoryOpenFlags::empty(),

src/components/file_revlog.rs

@@ -12,6 +12,8 @@ use crate::{
 };
 use anyhow::Result;
 use asyncgit::{
+	asyncjob::AsyncSingleJob,
+	file_log::AsyncFileLogJob,
 	sync::{diff_contains_file, get_commits_info, CommitId},
 	AsyncGitNotification, AsyncLog, FetchStatus, CWD,
 };
@@ -37,6 +39,7 @@ static DETAILS_WIDTH: u16 =
 ///
 pub struct FileRevlogComponent {
 	git_log: Option<AsyncLog>,
+	async_file_log: AsyncSingleJob<AsyncFileLogJob>,
 	theme: SharedTheme,
 	queue: Queue,
 	sender: Sender<AsyncGitNotification>,
@@ -61,6 +64,7 @@ impl FileRevlogComponent {
 			queue: queue.clone(),
 			sender: sender.clone(),
 			git_log: None,
+			async_file_log: AsyncSingleJob::new(sender.clone()),
 			visible: false,
 			file_path: None,
 			table_state: std::cell::Cell::new(TableState::default()),
@@ -87,7 +91,7 @@ impl FileRevlogComponent {
 
 	///
 	pub fn any_work_pending(&self) -> bool {
-		self.git_log.as_ref().map_or(false, AsyncLog::is_pending)
+		self.async_file_log.is_pending()
 	}
 
 	///
@@ -177,6 +181,8 @@ impl FileRevlogComponent {
 		self.items
 			.iter()
 			.map(|entry| {
+				// let status = self.get_file_status(entry.id);
+
 				let spans = Spans::from(vec![
 					Span::styled(
 						entry.hash_short.to_string(),
@@ -199,6 +205,11 @@ impl FileRevlogComponent {
 
 				let cells = vec![Cell::from(""), Cell::from(text)];
 
+				// let cells = vec![
+				// 	Cell::from(status.to_string()),
+				// 	Cell::from(text),
+				// ];
+
 				Row::new(cells).height(2)
 			})
 			.collect()