gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-08-16 15:50:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

move cloud sync functionality to its own crate

Browse Source
This commit is contained in:
Kiril Videlov 2024-07-07 19:22:41 +02:00
parent 832ef485c4
commit d456ba5e77
No known key found for this signature in database
GPG Key ID: A4C733025427C471
8 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -2226,6 +2226,17 @@ dependencies = [
"walkdir",
]
[[package]]
name = "gitbutler-sync"
version = "0.0.0"
dependencies = [
"anyhow",
"git2",
"gitbutler-core",
"itertools 0.13.0",
"tracing",
]
[[package]]
name = "gitbutler-tauri"
version = "0.0.0"
@ -2289,6 +2300,7 @@ dependencies = [
"gitbutler-branch",
"gitbutler-core",
"gitbutler-notify-debouncer",
"gitbutler-sync",
"gix",
"notify",
"thiserror",

4
Cargo.toml
View File

@ -7,7 +7,8 @@ members = [
"crates/gitbutler-watcher/vendor/debouncer",
"crates/gitbutler-testsupport",
"crates/gitbutler-cli",
"crates/gitbutler-branch",
"crates/gitbutler-branch",
"crates/gitbutler-sync",
]
resolver = "2"
@ -27,6 +28,7 @@ gitbutler-watcher = { path = "crates/gitbutler-watcher" }
gitbutler-testsupport = { path = "crates/gitbutler-testsupport" }
gitbutler-cli ={ path = "crates/gitbutler-cli" }
gitbutler-branch = { path = "crates/gitbutler-branch" }
gitbutler-sync = { path = "crates/gitbutler-sync" }
[profile.release]
codegen-units = 1 # Compile crates one after another so the compiler can optimize better

1
crates/gitbutler-core/src/lib.rs
View File

@ -33,7 +33,6 @@ pub mod secret;
pub mod serde;
pub mod ssh;
pub mod storage;
pub mod synchronize;
pub mod time;
pub mod types;
pub mod users;

13
crates/gitbutler-sync/Cargo.toml Normal file
View File

@ -0,0 +1,13 @@
[package]
name = "gitbutler-sync"
version = "0.0.0"
edition = "2021"
authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false
[dependencies]
anyhow = "1.0.86"
tracing = "0.1.40"
itertools = "0.13"
git2.workspace = true
gitbutler-core.workspace = true

8
crates/gitbutler-core/src/synchronize/mod.rs → crates/gitbutler-sync/src/cloud.rs
View File

@ -1,13 +1,13 @@
use std::time;
use crate::id::Id;
use crate::{
use anyhow::{Context, Result};
use gitbutler_core::id::Id;
use gitbutler_core::{
git::{self},
project_repository,
projects::{self, CodePushState},
users,
};
use anyhow::{Context, Result};
use itertools::Itertools;
pub async fn sync_with_gitbutler(
@ -56,7 +56,7 @@ pub async fn sync_with_gitbutler(
async fn push_target(
projects: &projects::Controller,
project_repository: &project_repository::Repository,
default_target: &crate::virtual_branches::target::Target,
default_target: &gitbutler_core::virtual_branches::target::Target,
gb_code_last_commit: Option<git2::Oid>,
project_id: Id<projects::Project>,
user: &users::User,

1
crates/gitbutler-sync/src/lib.rs Normal file
View File

@ -0,0 +1 @@
pub mod cloud;

1
crates/gitbutler-watcher/Cargo.toml
View File

@ -11,6 +11,7 @@ doctest = false
[dependencies]
gitbutler-core.workspace = true
gitbutler-branch.workspace = true
gitbutler-sync.workspace = true
thiserror.workspace = true
anyhow = "1.0.86"
futures = "0.3.30"

2
crates/gitbutler-watcher/src/handler.rs
View File

@ -6,8 +6,8 @@ use gitbutler_branch::VirtualBranches;
use gitbutler_core::error::Marker;
use gitbutler_core::ops::entry::{OperationKind, SnapshotDetails};
use gitbutler_core::projects::ProjectId;
use gitbutler_core::synchronize::sync_with_gitbutler;
use gitbutler_core::{assets, git, project_repository, projects, users};
use gitbutler_sync::cloud::sync_with_gitbutler;
use tracing::instrument;
use super::{events, Change};