gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2082 from gitbutlerapp/fix-session-exists-check

Browse Source 
Fix session exists check
This commit is contained in:
Nikita Galaiko 2023-12-18 13:45:03 +01:00 committed by GitHub
commit 6bb4842cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tauri/src/gb_repository/repository.rs
View File

@ -481,7 +481,7 @@ impl Repository {
match sessions::Session::try_from(reader) { match sessions::Session::try_from(reader) {
Ok(session) => Ok(Some(session)), Ok(session) => Ok(Some(session)),
Err(sessions::SessionError::NoSession) => Ok(None), Err(sessions::SessionError::NoSession) => Ok(None),
Err(sessions::SessionError::Err(err)) => Err(err), Err(sessions::SessionError::Other(err)) => Err(err),
} }
} }

58
packages/tauri/src/sessions/session.rs
View File

@ -35,50 +35,66 @@ pub enum SessionError {
#[error("session does not exist")] #[error("session does not exist")]
NoSession, NoSession,
#[error("{0}")] #[error("{0}")]
Err(anyhow::Error), Other(anyhow::Error),
} }
impl TryFrom<&dyn reader::Reader> for Session { impl TryFrom<&dyn reader::Reader> for Session {
type Error = SessionError; type Error = SessionError;
fn try_from(reader: &dyn reader::Reader) -> Result<Self, Self::Error> { fn try_from(reader: &dyn reader::Reader) -> Result<Self, Self::Error> {
if !reader.exists(path::Path::new("session/meta")) {
return Err(SessionError::NoSession);
}
let id: String = reader let id: String = reader
.read(path::Path::new("session/meta/id")) .read(path::Path::new("session/meta/id"))
.context("failed to read session id") .map_err(|error| match error {
.map_err(SessionError::Err)? reader::Error::NotFound => SessionError::NoSession,
_ => SessionError::Other(error.into()),
})?
.try_into() .try_into()
.context("failed to parse session id") .context("failed to parse session id as string")
.map_err(SessionError::Err)?; .map_err(SessionError::Other)?;
let id: SessionId = id let id: SessionId = id
.parse() .parse()
.context("failed to parse session id") .context("failed to parse session id as id")
.map_err(SessionError::Err)?; .map_err(SessionError::Other)?;
let start_timestamp_ms = reader let start_timestamp_ms = reader
.read(path::Path::new("session/meta/start")) .read(path::Path::new("session/meta/start"))
.context("failed to read session start timestamp") .map_err(|error| match error {
.map_err(SessionError::Err)? reader::Error::NotFound => SessionError::NoSession,
_ => SessionError::Other(error.into()),
})?
.try_into() .try_into()
.context("failed to parse session start timestamp") .context("failed to parse session start timestamp as number")
.map_err(SessionError::Err)?; .map_err(SessionError::Other)?;
let last_timestamp_ms = reader let last_timestamp_ms = reader
.read(path::Path::new("session/meta/last")) .read(path::Path::new("session/meta/last"))
.context("failed to read session last timestamp") .map_err(|error| match error {
.map_err(SessionError::Err)? reader::Error::NotFound => SessionError::NoSession,
_ => SessionError::Other(error.into()),
})?
.try_into() .try_into()
.context("failed to parse session last timestamp") .context("failed to parse session last timestamp as number")
.map_err(SessionError::Err)?; .map_err(SessionError::Other)?;
let branch = match reader.read(path::Path::new("session/meta/branch")) { let branch = match reader.read(path::Path::new("session/meta/branch")) {
Ok(reader::Content::UTF8(branch)) => Some(branch.clone()), Ok(reader::Content::UTF8(branch)) => Some(branch.clone()),
_ => None, Err(reader::Error::NotFound) => None,
_ => {
return Err(SessionError::Other(anyhow::anyhow!(
"failed to read branch"
)))
}
}; };
let commit = match reader.read(path::Path::new("session/meta/commit")) { let commit = match reader.read(path::Path::new("session/meta/commit")) {
Ok(reader::Content::UTF8(commit)) => Some(commit.clone()), Ok(reader::Content::UTF8(commit)) => Some(commit.clone()),
_ => None, Err(reader::Error::NotFound) => None,
_ => {
return Err(SessionError::Other(anyhow::anyhow!(
"failed to read commit"
)))
}
}; };
Ok(Self { Ok(Self {