Skip to content

Commit

Permalink
Revert OpenDAL for ephemeral location (#2399)
Browse files Browse the repository at this point in the history
* Revert "OpenDAL - Ephemeral Locations (#2283)"

This reverts commit 2848782.

* Format

* Fix some diff problems
  • Loading branch information
HeavenVolkoff authored Apr 26, 2024
1 parent e76ff78 commit 9384bad
Show file tree
Hide file tree
Showing 19 changed files with 571 additions and 1,090 deletions.
399 changes: 7 additions & 392 deletions Cargo.lock

Large diffs are not rendered by default.

52 changes: 23 additions & 29 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ sd-ai = { path = "../crates/ai", optional = true }
sd-cache = { path = "../crates/cache" }
sd-cloud-api = { version = "0.1.0", path = "../crates/cloud-api" }
sd-crypto = { path = "../crates/crypto", features = [
"sys",
"tokio",
"sys",
"tokio",
], optional = true }
sd-ffmpeg = { path = "../crates/ffmpeg", optional = true }
sd-file-ext = { path = "../crates/file-ext" }
sd-images = { path = "../crates/images", features = [
"rspc",
"serde",
"specta",
"rspc",
"serde",
"specta",
] }
sd-media-metadata = { path = "../crates/media-metadata" }
sd-p2p = { path = "../crates/p2p", features = ["specta"] }
Expand All @@ -50,7 +50,6 @@ sd-p2p-tunnel = { path = "../crates/p2p-tunnel" }
sd-prisma = { path = "../crates/prisma" }
sd-sync = { path = "../crates/sync" }
sd-utils = { path = "../crates/utils" }
sd-indexer = { path = "../crates/sd-indexer" }

# Workspace dependencies
async-channel = { workspace = true }
Expand All @@ -72,12 +71,12 @@ reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
rmp-serde = { workspace = true }
rmpv = { workspace = true }
rspc = { workspace = true, features = [
"axum",
"uuid",
"chrono",
"tracing",
"alpha",
"unstable",
"axum",
"uuid",
"chrono",
"tracing",
"alpha",
"unstable",
] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand All @@ -88,12 +87,12 @@ strum_macros = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = [
"sync",
"rt-multi-thread",
"io-util",
"macros",
"time",
"process",
"sync",
"rt-multi-thread",
"io-util",
"macros",
"time",
"process",
] }
tokio-stream = { workspace = true, features = ["fs"] }
tokio-util = { workspace = true, features = ["io"] }
Expand All @@ -103,6 +102,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
uuid = { workspace = true, features = ["v4", "serde"] }
webp = { workspace = true }


# Specific Core dependencies
async-recursion = "1.0.5"
async-stream = "0.3.5"
Expand All @@ -122,7 +122,7 @@ int-enum = "0.5.0"
libc = "0.2.153"
mini-moka = "0.10.2"
notify = { git = "https://github.com/notify-rs/notify.git", rev = "c3929ed114fbb0bc7457a9a498260461596b00ca", default-features = false, features = [
"macos_fsevent",
"macos_fsevent",
] }
rmp = "0.8.12"
serde-hashkey = "0.4.5"
Expand All @@ -132,12 +132,6 @@ slotmap = "1.0.6"
sysinfo = "0.29.10"
tar = "0.4.40"
tower-service = "0.3.2"
opendal = { version = "0.45.1", features = [
"services-gdrive",
"services-s3",
"services-fs",
] }
sync_wrapper = { version = "1.0.1", features = ["futures"] }

# Override features of transitive dependencies
[dependencies.openssl]
Expand All @@ -160,10 +154,10 @@ trash = "4.1.0"

[target.'cfg(target_os = "ios")'.dependencies]
icrate = { version = "0.1.0", features = [
"Foundation",
"Foundation_NSFileManager",
"Foundation_NSString",
"Foundation_NSNumber",
"Foundation",
"Foundation_NSFileManager",
"Foundation_NSString",
"Foundation_NSNumber",
] }

[dev-dependencies]
Expand Down
5 changes: 2 additions & 3 deletions core/src/api/locations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use crate::{
invalidate_query,
location::{
delete_location, find_location, indexer::OldIndexerJobInit, light_scan_location,
relink_location, scan_location, scan_location_sub_path, LocationCreateArgs, LocationError,
LocationUpdateArgs, ScanState,
non_indexed::NonIndexedPathItem, relink_location, scan_location, scan_location_sub_path,
LocationCreateArgs, LocationError, LocationUpdateArgs, ScanState,
},
object::old_file_identifier::old_file_identifier_job::OldFileIdentifierJobInit,
old_job::StatefulJob,
Expand All @@ -17,7 +17,6 @@ use sd_core_prisma_helpers::{
};

use sd_cache::{CacheNode, Model, Normalise, NormalisedResult, NormalisedResults, Reference};
use sd_indexer::NonIndexedPathItem;
use sd_prisma::prisma::{file_path, indexer_rule, indexer_rules_in_location, location, SortOrder};

use std::path::{Path, PathBuf};
Expand Down
Loading

0 comments on commit 9384bad

Please sign in to comment.