This is an automated email from the ASF dual-hosted git repository.
koushiro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opendal.git
The following commit(s) were added to refs/heads/main by this push:
new 3298c5b3d refactor: Split seafile service into a separate crate (#7029)
3298c5b3d is described below
commit 3298c5b3d39d5ff730524336f7084c7ca78b0726
Author: Sahil Shadwal <[email protected]>
AuthorDate: Thu Dec 18 09:35:58 2025 +0530
refactor: Split seafile service into a separate crate (#7029)
* core splitted seafile
* made modules private
* Update core/core/Cargo.toml
Co-authored-by: Qinxuan Chen <[email protected]>
---------
Co-authored-by: Qinxuan Chen <[email protected]>
---
core/Cargo.lock | 15 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ---
core/services/seafile/Cargo.toml | 42 ++++++++++++++++++++++
.../seafile => services/seafile/src}/backend.rs | 4 +--
.../seafile => services/seafile/src}/config.rs | 12 +++----
.../seafile => services/seafile/src}/core.rs | 4 +--
.../seafile => services/seafile/src}/deleter.rs | 4 +--
.../seafile => services/seafile/src}/docs.md | 0
.../seafile => services/seafile/src}/error.rs | 4 +--
.../seafile/mod.rs => services/seafile/src/lib.rs} | 2 +-
.../seafile => services/seafile/src}/lister.rs | 6 ++--
.../seafile => services/seafile/src}/writer.rs | 4 +--
core/src/lib.rs | 2 ++
15 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 1a3749aee..abfca2fa6 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5588,6 +5588,7 @@ dependencies = [
"opendal-service-postgresql",
"opendal-service-redb",
"opendal-service-s3",
+ "opendal-service-seafile",
"opendal-service-sled",
"opendal-service-sqlite",
"opendal-service-surrealdb",
@@ -6418,6 +6419,20 @@ dependencies = [
"tracing-subscriber",
]
+[[package]]
+name = "opendal-service-seafile"
+version = "0.55.0"
+dependencies = [
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "mea",
+ "opendal-core",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "opendal-service-sled"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index b5c63c0fb..9b38beeb2 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -151,7 +151,7 @@ services-redis = ["opendal-core/services-redis"]
services-redis-native-tls = ["opendal-core/services-redis-native-tls"]
services-rocksdb = ["opendal-core/services-rocksdb"]
services-s3 = ["dep:opendal-service-s3"]
-services-seafile = ["opendal-core/services-seafile"]
+services-seafile = ["dep:opendal-service-seafile"]
services-sftp = ["opendal-core/services-sftp"]
services-sled = ["dep:opendal-service-sled"]
services-sqlite = ["dep:opendal-service-sqlite"]
@@ -239,6 +239,7 @@ opendal-service-persy = { path = "services/persy", version
= "0.55.0", optional
opendal-service-postgresql = { path = "services/postgresql", version =
"0.55.0", optional = true, default-features = false }
opendal-service-redb = { path = "services/redb", version = "0.55.0", optional
= true, default-features = false }
opendal-service-s3 = { path = "services/s3", version = "0.55.0", optional =
true, default-features = false }
+opendal-service-seafile = { path = "services/seafile", version = "0.55.0",
optional = true, default-features = false }
opendal-service-sled = { path = "services/sled", version = "0.55.0", optional
= true, default-features = false }
opendal-service-sqlite = { path = "services/sqlite", version = "0.55.0",
optional = true, default-features = false }
opendal-service-surrealdb = { path = "services/surrealdb", version = "0.55.0",
optional = true, default-features = false }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 6bcc144db..baa713915 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -70,7 +70,6 @@ services-onedrive = []
services-redis = ["dep:redis", "dep:fastpool", "redis?/tokio-rustls-comp"]
services-redis-native-tls = ["services-redis", "redis?/tokio-native-tls-comp"]
services-rocksdb = ["dep:rocksdb", "internal-tokio-rt"]
-services-seafile = []
services-sftp = ["dep:openssh", "dep:openssh-sftp-client", "dep:fastpool"]
services-vercel-artifacts = []
services-webdav = []
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index 0db8b6f17..67b839774 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -79,11 +79,6 @@ mod rocksdb;
#[cfg(feature = "services-rocksdb")]
pub use self::rocksdb::*;
-#[cfg(feature = "services-seafile")]
-mod seafile;
-#[cfg(feature = "services-seafile")]
-pub use seafile::*;
-
#[cfg(feature = "services-sftp")]
mod sftp;
#[cfg(feature = "services-sftp")]
diff --git a/core/services/seafile/Cargo.toml b/core/services/seafile/Cargo.toml
new file mode 100644
index 000000000..caa941ee5
--- /dev/null
+++ b/core/services/seafile/Cargo.toml
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[package]
+description = "Apache OpenDAL seafile service implementation"
+name = "opendal-service-seafile"
+
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+version = { workspace = true }
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+opendal-core = { path = "../../core", version = "0.55.0", default-features =
false }
+
+bytes = { workspace = true }
+ctor = { workspace = true }
+http = { workspace = true }
+log = { workspace = true }
+mea = "0.5.1"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
diff --git a/core/core/src/services/seafile/backend.rs
b/core/services/seafile/src/backend.rs
similarity index 99%
rename from core/core/src/services/seafile/backend.rs
rename to core/services/seafile/src/backend.rs
index 4e965fc9f..844b68d27 100644
--- a/core/core/src/services/seafile/backend.rs
+++ b/core/services/seafile/src/backend.rs
@@ -34,8 +34,8 @@ use super::error::parse_error;
use super::lister::SeafileLister;
use super::writer::SeafileWriter;
use super::writer::SeafileWriters;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// [seafile](https://www.seafile.com) services support.
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/seafile/config.rs
b/core/services/seafile/src/config.rs
similarity index 91%
rename from core/core/src/services/seafile/config.rs
rename to core/services/seafile/src/config.rs
index eaafcb37c..837ffa7ed 100644
--- a/core/core/src/services/seafile/config.rs
+++ b/core/services/seafile/src/config.rs
@@ -55,10 +55,10 @@ impl Debug for SeafileConfig {
}
}
-impl crate::Configurator for SeafileConfig {
+impl opendal_core::Configurator for SeafileConfig {
type Builder = SeafileBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let mut map = uri.options().clone();
if let Some(authority) = uri.authority() {
map.insert("endpoint".to_string(), format!("https://{authority}";));
@@ -77,8 +77,8 @@ impl crate::Configurator for SeafileConfig {
}
if !map.contains_key("repo_name") {
- return Err(crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ return Err(opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"repo_name is required via uri path or option",
)
.with_context("service", SEAFILE_SCHEME));
@@ -95,8 +95,8 @@ impl crate::Configurator for SeafileConfig {
#[cfg(test)]
mod tests {
use super::*;
- use crate::Configurator;
- use crate::types::OperatorUri;
+ use opendal_core::Configurator;
+ use opendal_core::OperatorUri;
#[test]
fn from_uri_sets_endpoint_repo_and_root() {
diff --git a/core/core/src/services/seafile/core.rs
b/core/services/seafile/src/core.rs
similarity index 99%
rename from core/core/src/services/seafile/core.rs
rename to core/services/seafile/src/core.rs
index e26a1cf70..fef38e637 100644
--- a/core/core/src/services/seafile/core.rs
+++ b/core/services/seafile/src/core.rs
@@ -28,8 +28,8 @@ use mea::rwlock::RwLock;
use serde::Deserialize;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// Core of [seafile](https://www.seafile.com) services support.
#[derive(Clone)]
diff --git a/core/core/src/services/seafile/deleter.rs
b/core/services/seafile/src/deleter.rs
similarity index 96%
rename from core/core/src/services/seafile/deleter.rs
rename to core/services/seafile/src/deleter.rs
index bf5712a7e..37df83e6b 100644
--- a/core/core/src/services/seafile/deleter.rs
+++ b/core/services/seafile/src/deleter.rs
@@ -18,8 +18,8 @@
use std::sync::Arc;
use super::core::*;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct SeafileDeleter {
core: Arc<SeafileCore>,
diff --git a/core/core/src/services/seafile/docs.md
b/core/services/seafile/src/docs.md
similarity index 100%
rename from core/core/src/services/seafile/docs.md
rename to core/services/seafile/src/docs.md
diff --git a/core/core/src/services/seafile/error.rs
b/core/services/seafile/src/error.rs
similarity index 98%
rename from core/core/src/services/seafile/error.rs
rename to core/services/seafile/src/error.rs
index 47a7bde53..0079270fb 100644
--- a/core/core/src/services/seafile/error.rs
+++ b/core/services/seafile/src/error.rs
@@ -19,8 +19,8 @@ use bytes::Buf;
use http::Response;
use serde::Deserialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// the error response of seafile
#[derive(Default, Debug, Deserialize)]
diff --git a/core/core/src/services/seafile/mod.rs
b/core/services/seafile/src/lib.rs
similarity index 96%
rename from core/core/src/services/seafile/mod.rs
rename to core/services/seafile/src/lib.rs
index 94abafc0b..2efc50089 100644
--- a/core/core/src/services/seafile/mod.rs
+++ b/core/services/seafile/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for seafile service.
pub const SEAFILE_SCHEME: &str = "seafile";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/seafile/lister.rs
b/core/services/seafile/src/lister.rs
similarity index 97%
rename from core/core/src/services/seafile/lister.rs
rename to core/services/seafile/src/lister.rs
index 6f24f3389..6f97ce176 100644
--- a/core/core/src/services/seafile/lister.rs
+++ b/core/services/seafile/src/lister.rs
@@ -18,9 +18,9 @@
use std::sync::Arc;
use super::core::SeafileCore;
-use crate::raw::oio::Entry;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio::Entry;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct SeafileLister {
core: Arc<SeafileCore>,
diff --git a/core/core/src/services/seafile/writer.rs
b/core/services/seafile/src/writer.rs
similarity index 97%
rename from core/core/src/services/seafile/writer.rs
rename to core/services/seafile/src/writer.rs
index 817661e37..18afeb9e2 100644
--- a/core/core/src/services/seafile/writer.rs
+++ b/core/services/seafile/src/writer.rs
@@ -21,8 +21,8 @@ use http::StatusCode;
use super::core::SeafileCore;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub type SeafileWriters = oio::OneShotWriter<SeafileWriter>;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d09ae794c..bafdec79e 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -104,6 +104,8 @@ pub mod services {
pub use opendal_service_redb::*;
#[cfg(feature = "services-s3")]
pub use opendal_service_s3::*;
+ #[cfg(feature = "services-seafile")]
+ pub use opendal_service_seafile::*;
#[cfg(feature = "services-sled")]
pub use opendal_service_sled::*;
#[cfg(feature = "services-sqlite")]
