Skip to content
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

Jump to bottom

[ENG-1398] Make thumbnailer parallelism configurable #1780

Merged
merged 15 commits into from
Nov 23, 2023
Merged

[ENG-1398] Make thumbnailer parallelism configurable #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9ff9fe5
Removing migrator
fogodev Nov 15, 2023
62e7335
Adding serde_repr dep
fogodev Nov 15, 2023
625d421
Generalizing version manager
fogodev Nov 15, 2023
04d5a11
Updating library config to use version manager
fogodev Nov 15, 2023
c28ab97
Updating node config to use version manager
fogodev Nov 15, 2023
4d8efeb
Updating stuff to use new configs
fogodev Nov 15, 2023
31cde79
More async
fogodev Nov 15, 2023
ec2dfa2
Library manager errors
fogodev Nov 15, 2023
8a2bfe0
Node and thumbnailer preferences
fogodev Nov 15, 2023
10f6273
Small warning on prep
fogodev Nov 15, 2023
97af2f9
Upgrading batch construction for thumbnailer
fogodev Nov 15, 2023
5e97f26
Updating thumb version file to new version manager
fogodev Nov 15, 2023
96e9ed4
Configurable parallelism for thumbnailer
fogodev Nov 15, 2023
f06e590
Integration with frontend and refresh batch
fogodev Nov 21, 2023
f490d85
Merge branch 'main' of github.com:spacedriveapp/spacedrive into eng-1…
fogodev Nov 21, 2023
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.

2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ pub async fn reveal_items(
.location()
.find_many(vec![
// TODO(N): This will fall apart with removable media and is making an invalid assumption that the `Node` is fixed for an `Instance`.
location::instance_id::equals(Some(library.config().instance_id)),
location::instance_id::equals(Some(library.config().await.instance_id)),
location::id::in_vec(locations),
])
.select(location::select!({ path }))
Expand Down
1 change: 1 addition & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ tokio = { workspace = true, features = [
serde = { version = "1.0", features = ["derive"] }
chrono = { version = "0.4.31", features = ["serde"] }
serde_json = { workspace = true }
serde_repr = "0.1"
futures = "0.3"
rmp-serde = "^1.1.2"
rmpv = "^1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions core/src/api/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub(crate) fn mount() -> AlphaRouter<Ctx> {
};

if node.config
.write(|mut c| c.auth_token = Some(token))
.write(|c| c.auth_token = Some(token))
.await.is_err() {
break Response::Error;
};
Expand Down Expand Up @@ -120,7 +120,7 @@ pub(crate) fn mount() -> AlphaRouter<Ctx> {
"logout",
R.mutation(|node, _: ()| async move {
node.config
.write(|mut c| c.auth_token = None)
.write(|c| c.auth_token = None)
.await
.map(|_| ())
.map_err(|_| {
Expand Down
Loading
Loading