gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3748 from gitbutlerapp/remove-users-controller-implementation

Browse Source 
remove gb_reference from projects
This commit is contained in:
Kiril Videlov 2024-05-12 03:22:00 +02:00 committed by GitHub
commit 451cf3e8fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/gitbutler-core/src/projects/controller.rs
View File

@ -7,7 +7,7 @@ use anyhow::{Context, Result};
use async_trait::async_trait;
use super::{storage, storage::UpdateRequest, Project, ProjectId};
use crate::{error, gb_repository, project_repository, users};
use crate::{error, project_repository};
use crate::{
error::{AnyhowContextExt, Code, Error, ErrorWithContext},
projects::AuthKey,
@ -25,7 +25,6 @@ pub trait Watchers {
pub struct Controller {
local_data_dir: PathBuf,
projects_storage: storage::Storage,
users: users::Controller,
watchers: Option<Arc<dyn Watchers + Send + Sync>>,
}
@ -33,13 +32,11 @@ impl Controller {
pub fn new(
local_data_dir: PathBuf,
projects_storage: storage::Storage,
users: users::Controller,
watchers: Option<impl Watchers + Send + Sync + 'static>,
) -> Self {
Self {
local_data_dir,
projects_storage,
users,
watchers: watchers.map(|w| Arc::new(w) as Arc<_>),
}
}
@ -48,7 +45,6 @@ impl Controller {
let path = path.into();
Self {
projects_storage: storage::Storage::from_path(&path),
users: users::Controller::from_path(&path),
local_data_dir: path,
watchers: None,
}
@ -103,12 +99,6 @@ impl Controller {
..Default::default()
};
// create all required directories to avoid racing later
let user = self.users.get_user()?;
let project_repository = project_repository::Repository::open(&project)?;
gb_repository::Repository::open(&self.local_data_dir, &project_repository, user.as_ref())
.context("failed to open repository")?;
self.projects_storage
.add(&project)
.context("failed to add project to storage")?;

1
crates/gitbutler-tauri/src/main.rs
View File

@ -106,7 +106,6 @@ fn main() {
let projects_controller = gitbutler_core::projects::Controller::new(
app_data_dir.clone(),
projects_storage_controller.clone(),
users_controller.clone(),
Some(watcher_controller.clone())
);
app_handle.manage(projects_controller.clone());