Feat/appflowy tauri 3 (#1914)

This commit is contained in:
Nathan.fooo
2023-03-03 20:38:31 +08:00
committed by GitHub
parent 59a1910b3c
commit 0f3c6d6a04
100 changed files with 2578 additions and 1134 deletions

View File

@ -23,20 +23,20 @@ flowy-revision = { path = "../flowy-revision" }
flowy-revision-persistence = { path = "../flowy-revision-persistence" }
parking_lot = "0.12.1"
protobuf = {version = "2.18.0"}
log = "0.4.14"
protobuf = {version = "2.28.0"}
log = "0.4.17"
diesel = {version = "1.4.8", features = ["sqlite"]}
diesel_derives = {version = "1.4.1", features = ["sqlite"]}
futures = "0.3.15"
futures = "0.3.26"
pin-project = "1.0"
strum = "0.21"
strum_macros = "0.21"
tokio = { version = "1", features = ["rt"] }
tokio = { version = "1.26", features = ["rt"] }
lazy_static = "1.4.0"
serde = { version = "1.0", features = ["derive"] }
tracing = { version = "0.1", features = ["log"] }
bytes = { version = "1.0" }
unicode-segmentation = "1.8"
bytes = { version = "1.4" }
unicode-segmentation = "1.10"
serde_json = "1.0"
[dev-dependencies]

View File

@ -106,7 +106,8 @@ impl FolderRevisionSql {
.into_iter()
.map(|record| {
tracing::trace!(
"[TextRevisionSql] create revision: {}:{:?}",
"[{}] create revision: {}:{:?}",
std::any::type_name::<Self>(),
record.revision.object_id,
record.revision.rev_id
);
@ -135,7 +136,8 @@ impl FolderRevisionSql {
.filter(dsl::doc_id.eq(changeset.object_id));
let _ = update(filter).set(dsl::state.eq(state)).execute(conn)?;
tracing::debug!(
"[TextRevisionSql] update revision:{} state:to {:?}",
"[{}] update revision:{} state:to {:?}",
std::any::type_name::<Self>(),
changeset.rev_id,
changeset.state
);
@ -193,7 +195,8 @@ impl FolderRevisionSql {
if let Some(rev_ids) = rev_ids {
tracing::trace!(
"[TextRevisionSql] Delete revision: {}:{:?}",
"[{}] Delete revision: {}:{:?}",
std::any::type_name::<Self>(),
object_id,
rev_ids
);
@ -201,7 +204,11 @@ impl FolderRevisionSql {
}
let affected_row = sql.execute(conn)?;
tracing::trace!("[TextRevisionSql] Delete {} rows", affected_row);
tracing::trace!(
"[{}] Delete {} rows",
std::any::type_name::<Self>(),
affected_row
);
Ok(())
}
}

View File

@ -179,7 +179,6 @@ impl WorkspaceController {
}
impl WorkspaceController {
#[tracing::instrument(level = "trace", skip(self), err)]
async fn create_workspace_on_server(
&self,
params: CreateWorkspaceParams,
@ -188,7 +187,6 @@ impl WorkspaceController {
self.cloud_service.create_workspace(&token, params).await
}
#[tracing::instrument(level = "trace", skip(self), err)]
fn update_workspace_on_server(&self, params: UpdateWorkspaceParams) -> Result<(), FlowyError> {
let (token, server) = (self.user.token()?, self.cloud_service.clone());
tokio::spawn(async move {
@ -203,7 +201,6 @@ impl WorkspaceController {
Ok(())
}
#[tracing::instrument(level = "trace", skip(self), err)]
fn delete_workspace_on_server(&self, workspace_id: &str) -> Result<(), FlowyError> {
let params = WorkspaceIdPB {
value: Some(workspace_id.to_string()),