diff --git a/Cargo.lock b/Cargo.lock index 066bd77..d2fd337 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -526,19 +526,6 @@ dependencies = [ "libc", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "der" version = "0.7.9" @@ -1127,7 +1114,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a030549b8dfea08d7981ad0381acb4bc0cdc7a4fd616e3b9659c31dc0a3474fd" dependencies = [ - "dashmap", "hashbrown", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 35b1293..a15457f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ getopts = "0.2.21" headers = "0.4" http = "1.1.0" id3 = "1.14.0" -lasso2 = { version = "0.8.2", features = ["multi-threaded", "serialize"] } +lasso2 = { version = "0.8.2", features = ["serialize"] } lewton = "0.10.2" log = "0.4.22" metaflac = "0.2.7" diff --git a/src/app/index.rs b/src/app/index.rs index ca66f11..b18e2e1 100644 --- a/src/app/index.rs +++ b/src/app/index.rs @@ -3,7 +3,7 @@ use std::{ sync::{Arc, RwLock}, }; -use lasso2::{RodeoReader, ThreadedRodeo}; +use lasso2::{Rodeo, RodeoReader}; use log::{error, info}; use serde::{Deserialize, Serialize}; use tokio::task::spawn_blocking; @@ -210,7 +210,7 @@ pub struct Index { impl Default for Index { fn default() -> Self { Self { - strings: ThreadedRodeo::new().into_reader(), + strings: Rodeo::new().into_reader(), browser: Default::default(), collection: Default::default(), } @@ -218,7 +218,7 @@ impl Default for Index { } pub struct Builder { - strings: ThreadedRodeo, + strings: Rodeo, browser_builder: browser::Builder, collection_builder: collection::Builder, } @@ -226,7 +226,7 @@ pub struct Builder { impl Builder { pub fn new() -> Self { Self { - strings: ThreadedRodeo::new(), + strings: Rodeo::new(), browser_builder: browser::Builder::default(), collection_builder: collection::Builder::default(), } diff --git a/src/app/index/browser.rs b/src/app/index/browser.rs index f609165..665044f 100644 --- a/src/app/index/browser.rs +++ b/src/app/index/browser.rs @@ -5,7 +5,7 @@ use std::{ path::{Path, PathBuf}, }; -use lasso2::{RodeoReader, ThreadedRodeo}; +use lasso2::{Rodeo, RodeoReader}; use serde::{Deserialize, Serialize}; use tinyvec::TinyVec; use trie_rs::{Trie, TrieBuilder}; @@ -105,7 +105,7 @@ pub struct Builder { } impl Builder { - pub fn add_directory(&mut self, strings: &mut ThreadedRodeo, directory: scanner::Directory) { + pub fn add_directory(&mut self, strings: &mut Rodeo, directory: scanner::Directory) { let Some(virtual_path) = directory.virtual_path.get_or_intern(strings) else { return; }; @@ -125,7 +125,7 @@ impl Builder { .insert(storage::File::Directory(virtual_path)); } - pub fn add_song(&mut self, strings: &mut ThreadedRodeo, song: &scanner::Song) { + pub fn add_song(&mut self, strings: &mut Rodeo, song: &scanner::Song) { let Some(virtual_path) = (&song.virtual_path).get_or_intern(strings) else { return; }; diff --git a/src/app/index/collection.rs b/src/app/index/collection.rs index 002bfbe..c60e934 100644 --- a/src/app/index/collection.rs +++ b/src/app/index/collection.rs @@ -4,7 +4,7 @@ use std::{ path::PathBuf, }; -use lasso2::{RodeoReader, ThreadedRodeo}; +use lasso2::{RodeoReader, Rodeo}; use rand::{rngs::ThreadRng, seq::IteratorRandom}; use serde::{Deserialize, Serialize}; @@ -160,7 +160,7 @@ pub struct Builder { } impl Builder { - pub fn add_song(&mut self, strings: &mut ThreadedRodeo, song: &scanner::Song) { + pub fn add_song(&mut self, strings: &mut Rodeo, song: &scanner::Song) { let Some(song) = store_song(strings, song) else { return; }; diff --git a/src/app/index/storage.rs b/src/app/index/storage.rs index b171840..6910016 100644 --- a/src/app/index/storage.rs +++ b/src/app/index/storage.rs @@ -3,7 +3,7 @@ use std::{ path::{Path, PathBuf}, }; -use lasso2::{RodeoReader, ThreadedRodeo}; +use lasso2::{RodeoReader, Rodeo}; use log::error; use serde::{Deserialize, Serialize}; use tinyvec::TinyVec; @@ -87,7 +87,7 @@ impl Song { } } -pub fn store_song(strings: &mut ThreadedRodeo, song: &scanner::Song) -> Option { +pub fn store_song(strings: &mut Rodeo, song: &scanner::Song) -> Option { let Some(path) = (&song.path).get_or_intern(strings) else { return None; }; @@ -196,12 +196,12 @@ pub fn fetch_song(strings: &RodeoReader, song: &Song) -> super::Song { } pub trait InternPath { - fn get_or_intern(self, strings: &mut ThreadedRodeo) -> Option; + fn get_or_intern(self, strings: &mut Rodeo) -> Option; fn get(self, strings: &RodeoReader) -> Option; } impl> InternPath for P { - fn get_or_intern(self, strings: &mut ThreadedRodeo) -> Option { + fn get_or_intern(self, strings: &mut Rodeo) -> Option { let id = self .as_ref() .as_os_str()