gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-08 10:58:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor Controller initialization to use from method instead of try_from for improved code readability and consistency

Browse Source
This commit is contained in:
Nikita Galaiko 2023-11-06 10:32:12 +01:00 committed by GitButler
parent fff966a063
commit 7dc9f45d1a
13 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/butler/src/app.rs
View File

@ -22,7 +22,7 @@ impl App {
let storage = storage::Storage::from(&local_data_dir); let storage = storage::Storage::from(&local_data_dir);
let users_storage = users::Controller::from(&storage); let users_storage = users::Controller::from(&storage);
let projects_storage = projects::Controller::try_from(&local_data_dir)?; let projects_storage = projects::Controller::from(&local_data_dir);
let projects = projects_storage.list().context("failed to list projects")?; let projects = projects_storage.list().context("failed to list projects")?;
let project = projects let project = projects

10
packages/tauri/src/app.rs
View File

@ -46,13 +46,13 @@ impl TryFrom<&AppHandle> for App {
fn try_from(value: &AppHandle) -> std::result::Result<Self, Self::Error> { fn try_from(value: &AppHandle) -> std::result::Result<Self, Self::Error> {
Ok(Self { Ok(Self {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
keys: keys::Controller::try_from(value)?, keys: keys::Controller::from(value),
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
watchers: value.state::<watcher::Watchers>().inner().clone(), watchers: value.state::<watcher::Watchers>().inner().clone(),
sessions_database: sessions::Database::try_from(value)?, sessions_database: sessions::Database::from(value),
deltas_database: deltas::Database::try_from(value)?, deltas_database: deltas::Database::from(value),
bookmarks_database: bookmarks::Database::try_from(value)?, bookmarks_database: bookmarks::Database::from(value),
}) })
} }
} }

6
packages/tauri/src/bin.rs
View File

@ -127,12 +127,10 @@ fn main() {
.expect("failed to initialize virtual branches controller"); .expect("failed to initialize virtual branches controller");
app_handle.manage(vbranch_contoller); app_handle.manage(vbranch_contoller);
let keys_controller = keys::Controller::try_from(&app_handle) let keys_controller = keys::Controller::from(&app_handle);
.expect("failed to initialize keys controller");
app_handle.manage(keys_controller); app_handle.manage(keys_controller);
let users_controller = users::Controller::try_from(&app_handle) let users_controller = users::Controller::from(&app_handle);
.expect("failed to initialize users controller");
if let Some(user) = users_controller.get_user().context("failed to get user")? { if let Some(user) = users_controller.get_user().context("failed to get user")? {
sentry::configure_scope(|scope| scope.set_user(Some(user.clone().into()))); sentry::configure_scope(|scope| scope.set_user(Some(user.clone().into())));
} }

4
packages/tauri/src/commands.rs
View File

@ -174,9 +174,7 @@ pub async fn upsert_bookmark(
})?; })?;
let bookmark = bookmarks::Bookmark { let bookmark = bookmarks::Bookmark {
project_id, project_id,
timestamp_ms: timestamp_ms timestamp_ms: timestamp_ms.into(),
.try_into()
.context("failed to convert timestamp")?,
created_timestamp_ms: now, created_timestamp_ms: now,
updated_timestamp_ms: now, updated_timestamp_ms: now,
note, note,

4
packages/tauri/src/git/index.rs
View File

@ -114,11 +114,11 @@ impl From<git2::IndexEntry> for IndexEntry {
fn from(value: git2::IndexEntry) -> Self { fn from(value: git2::IndexEntry) -> Self {
Self { Self {
ctime: FileTime::from_unix_time( ctime: FileTime::from_unix_time(
i64::try_from(value.ctime.seconds()).unwrap(), i64::from(value.ctime.seconds()),
value.ctime.nanoseconds(), value.ctime.nanoseconds(),
), ),
mtime: FileTime::from_unix_time( mtime: FileTime::from_unix_time(
i64::try_from(value.mtime.seconds()).unwrap(), i64::from(value.mtime.seconds()),
value.mtime.nanoseconds(), value.mtime.nanoseconds(),
), ),
dev: value.dev, dev: value.dev,

2
packages/tauri/src/watcher/handlers/fetch_gitbutler_data.rs
View File

@ -55,7 +55,7 @@ impl TryFrom<&AppHandle> for HandlerInner {
Ok(Self { Ok(Self {
local_data_dir, local_data_dir,
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
}) })
} }
} }

4
packages/tauri/src/watcher/handlers/fetch_project_data.rs
View File

@ -59,9 +59,9 @@ impl TryFrom<&AppHandle> for HandlerInner {
fn try_from(value: &AppHandle) -> std::result::Result<Self, Self::Error> { fn try_from(value: &AppHandle) -> std::result::Result<Self, Self::Error> {
Ok(Self { Ok(Self {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
keys: keys::Controller::try_from(value)?, keys: keys::Controller::from(value),
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
}) })
} }
} }

2
packages/tauri/src/watcher/handlers/git_file_change.rs
View File

@ -25,7 +25,7 @@ impl TryFrom<&AppHandle> for Handler {
Ok(Self { Ok(Self {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
}) })
} }
} }

6
packages/tauri/src/watcher/handlers/index_handler.rs
View File

@ -32,9 +32,9 @@ impl TryFrom<&AppHandle> for Handler {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::from(value), users: users::Controller::from(value),
sessions_database: sessions::Database::try_from(value)?, sessions_database: sessions::Database::from(value),
deltas_database: deltas::Database::try_from(value)?, deltas_database: deltas::Database::from(value),
bookmarks_database: bookmarks::Database::try_from(value)?, bookmarks_database: bookmarks::Database::from(value),
}) })
} }
} }

2
packages/tauri/src/watcher/handlers/mod.rs
View File

@ -47,7 +47,7 @@ impl TryFrom<&AppHandle> for Handler {
push_gitbutler_handler: push_gitbutler_data::Handler::try_from(value)?, push_gitbutler_handler: push_gitbutler_data::Handler::try_from(value)?,
fetch_project_handler: fetch_project_data::Handler::try_from(value)?, fetch_project_handler: fetch_project_data::Handler::try_from(value)?,
fetch_gitbutler_handler: fetch_gitbutler_data::Handler::try_from(value)?, fetch_gitbutler_handler: fetch_gitbutler_data::Handler::try_from(value)?,
analytics_handler: analytics_handler::Handler::try_from(value)?, analytics_handler: analytics_handler::Handler::from(value),
push_project_to_gitbutler: push_project_to_gitbutler::Handler::try_from(value)?, push_project_to_gitbutler: push_project_to_gitbutler::Handler::try_from(value)?,
}) })
} }

2
packages/tauri/src/watcher/handlers/project_file_change.rs
View File

@ -38,7 +38,7 @@ impl TryFrom<&AppHandle> for Handler {
Ok(Self { Ok(Self {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
}) })
} }
} }

2
packages/tauri/src/watcher/handlers/push_gitbutler_data.rs
View File

@ -47,7 +47,7 @@ impl TryFrom<&AppHandle> for HandlerInner {
Ok(Self::new( Ok(Self::new(
DataDir::try_from(value)?, DataDir::try_from(value)?,
projects::Controller::try_from(value)?, projects::Controller::try_from(value)?,
users::Controller::try_from(value)?, users::Controller::from(value),
)) ))
} }
} }

2
packages/tauri/src/watcher/handlers/tick_handler.rs
View File

@ -27,7 +27,7 @@ impl TryFrom<&AppHandle> for Handler {
Ok(Self { Ok(Self {
local_data_dir: DataDir::try_from(value)?, local_data_dir: DataDir::try_from(value)?,
projects: projects::Controller::try_from(value)?, projects: projects::Controller::try_from(value)?,
users: users::Controller::try_from(value)?, users: users::Controller::from(value),
}) })
} }
} }