Skip to content

refactor(oay): import dav-server-opendalfs #3285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xuanwo merged 1 commit into from
Oct 15, 2023
Merged

refactor(oay): import dav-server-opendalfs #3285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bin/oay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ version.workspace = true
default = ["frontends-webdav", "frontends-s3"]

frontends-s3 = []
frontends-webdav = ["dep:dav-server", "dep:bytes", "dep:futures-util"]
frontends-webdav = ["dep:dav-server", "dep:dav-server-opendalfs", "dep:bytes", "dep:futures-util"]

[dependencies]
anyhow = "1"
Expand All @@ -42,6 +42,7 @@ bytes = { version = "1.4.0", optional = true }
chrono = "0.4.28"
clap = { version = "4", features = ["cargo", "string"] }
dav-server = { version = "0.5.5", optional = true }
dav-server-opendalfs = { path = "../../integrations/dav-server", optional = true }
dirs = "5.0.0"
futures = "0.3"
futures-util = { version = "0.3.16", optional = true }
Expand Down
6 changes: 1 addition & 5 deletions bin/oay/src/services/webdav/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@
// under the License.

mod service;
mod webdav_dir_entry;
mod webdav_file;
mod webdav_metadata;
pub mod webdavfs;
pub use service::*;
pub use service::WebdavService;
8 changes: 4 additions & 4 deletions bin/oay/src/services/webdav/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@ use axum::Router;
use dav_server::DavHandler;
use opendal::Operator;

use super::webdavfs::WebdavFs;
use crate::Config;
use dav_server_opendalfs::OpendalFs;

pub struct WebdavService {
cfg: Arc<Config>,
webdavfs: Box<WebdavFs>,
opendalfs: Box<OpendalFs>,
}

impl WebdavService {
pub fn new(cfg: Arc<Config>, op: Operator) -> Self {
Self {
cfg,
webdavfs: WebdavFs::new(op),
opendalfs: OpendalFs::new(op),
}
}

pub async fn serve(&self) -> anyhow::Result<()> {
let webdav_cfg = &self.cfg.frontends.webdav;

let webdav_handler = DavHandler::builder()
.filesystem(self.webdavfs.clone())
.filesystem(self.opendalfs.clone())
.build_handler();

let webdav_service = tower::service_fn(move |req: Request<Body>| {
Expand Down
54 changes: 0 additions & 54 deletions bin/oay/src/services/webdav/webdav_dir_entry.rs
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions bin/oay/src/services/webdav/webdav_file.rs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions bin/oay/src/services/webdav/webdav_metadata.rs
View file
Open in desktop

This file was deleted.

Loading