gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 10:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix sessions storage filtering

Browse Source
This commit is contained in:
Nikita Galaiko 2023-03-22 11:26:02 +01:00
parent a5c8f02350
commit 69df2d0408
No known key found for this signature in database
GPG Key ID: EBAB54E845BA519D
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src-tauri/src/sessions/storage/mod.rs
View File

@ -1,12 +1,11 @@
use crate::{projects, sessions, users};
use anyhow::{Context, Result};
use std::{
collections::HashMap,
sync::{Arc, Mutex},
time,
};
use crate::{projects, sessions, users};
use anyhow::Result;
mod current;
mod persistent;
@ -71,8 +70,15 @@ impl Store {
// returns list of sessions in reverse chronological order
pub fn list(&self, earliest_timestamp_ms: Option<u128>) -> Result<Vec<sessions::Session>> {
let mut sessions = self.persistent.list(earliest_timestamp_ms)?;
if let Some(session) = self.current.get()? {
let mut sessions = self
.persistent
.list(earliest_timestamp_ms)
.with_context(|| "failed to list sessions for project {}")?;
if let Some(session) = self
.current
.get()
.with_context(|| "failed to get current session")?
{
sessions.insert(0, session);
}
Ok(sessions)

34
src-tauri/src/sessions/storage/persistent.rs
View File

@ -158,19 +158,27 @@ impl Store {
// see crate::repositories::inib
pub fn list(&self, earliest_timestamp_ms: Option<u128>) -> Result<Vec<sessions::Session>> {
let mut cached_sessions = self.sessions_cache.lock().unwrap();
if let Some(sessions) = cached_sessions.as_ref() {
Ok(sessions.clone().to_vec())
let sessions = if let Some(sessions) = cached_sessions.as_ref() {
sessions.clone().to_vec()
} else {
let sessions = self.list_from_disk(earliest_timestamp_ms)?;
let sessions = self.list_from_disk()?;
cached_sessions.replace(sessions.clone());
Ok(sessions)
}
sessions
};
let filtered_sessions = if let Some(earliest_timestamp_ms) = earliest_timestamp_ms {
sessions
.into_iter()
.filter(|session| session.meta.start_timestamp_ms >= earliest_timestamp_ms)
.collect()
} else {
sessions
};
Ok(filtered_sessions)
}
fn list_from_disk(
&self,
earliest_timestamp_ms: Option<u128>,
) -> Result<Vec<sessions::Session>> {
fn list_from_disk(&self) -> Result<Vec<sessions::Session>> {
let git_repository = self.git_repository.lock().unwrap();
let reference = git_repository.find_reference(&self.project.refname())?;
let head = git_repository.find_commit(reference.target().unwrap())?;
@ -191,14 +199,6 @@ impl Store {
)
})?;
let session = sessions::Session::from_commit(&git_repository, &commit)?;
match earliest_timestamp_ms {
Some(earliest_timestamp_ms) => {
if session.meta.start_timestamp_ms <= earliest_timestamp_ms {
break;
}
}
None => {}
}
sessions.push(session);
}