fixup! Merge pull request #5569 from matrix-org/dragonfly1033/split_media_db_2

Author: Shrey Patel

crates/matrix-sdk-base/src/media/store/memory_store.rs

@@ -16,14 +16,16 @@ use std::{
     collections::HashMap,
     num::NonZeroUsize,
     sync::{Arc, RwLock as StdRwLock},
-    time::SystemTime,
 };
 
 use async_trait::async_trait;
 use matrix_sdk_common::{
     ring_buffer::RingBuffer, store_locks::memory_store_helper::try_take_leased_lock,
 };
-use ruma::{MxcUri, OwnedMxcUri, time::Instant};
+use ruma::{
+    MxcUri, OwnedMxcUri,
+    time::{Instant, SystemTime},
+};
 
 use super::Result;
 use crate::media::{

crates/matrix-sdk-indexeddb/src/media_store/builder.rs

@@ -16,7 +16,6 @@ use std::{rc::Rc, sync::Arc};
 
 use matrix_sdk_base::media::store::{MediaService, MemoryMediaStore};
 use matrix_sdk_store_encryption::StoreCipher;
-use web_sys::DomException;
 
 use crate::{
     media_store::{

crates/matrix-sdk-indexeddb/src/media_store/error.rs

@@ -42,7 +42,13 @@ pub enum IndexeddbMediaStoreError {
 
 impl From<IndexeddbMediaStoreError> for MediaStoreError {
     fn from(value: IndexeddbMediaStoreError) -> Self {
-        Self::Backend(Box::new(value))
+        use IndexeddbMediaStoreError::*;
+
+        match value {
+            DomException { .. } => Self::InvalidData { details: value.to_string() },
+            Transaction(inner) => inner.into(),
+            MemoryStore(error) => error,
+        }
     }
 }
 

crates/matrix-sdk-indexeddb/src/media_store/migrations.rs

@@ -18,7 +18,7 @@ use indexed_db_futures::{
 };
 use thiserror::Error;
 use wasm_bindgen::JsValue;
-use web_sys::{DomException, IdbIndexParameters};
+use web_sys::DomException;
 
 /// The current version and keys used in the database.
 pub mod current {

crates/matrix-sdk-indexeddb/src/media_store/mod.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
+#![allow(unused)]
+
 mod builder;
 mod error;
 mod migrations;
@@ -20,6 +22,8 @@ mod transaction;
 mod types;
 use std::{rc::Rc, time::Duration};
 
+pub use builder::IndexeddbMediaStoreBuilder;
+pub use error::IndexeddbMediaStoreError;
 use indexed_db_futures::IdbDatabase;
 use matrix_sdk_base::{
     media::{
@@ -37,7 +41,6 @@ use tracing::instrument;
 use web_sys::IdbTransactionMode;
 
 use crate::media_store::{
-    builder::IndexeddbMediaStoreBuilder, error::IndexeddbMediaStoreError,
     serializer::traits::Indexed, transaction::IndexeddbMediaStoreTransaction, types::Lease,
 };
 
@@ -327,7 +330,7 @@ impl MediaStoreInner for IndexeddbMediaStore {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, target_family = "wasm"))]
 mod tests {
     use matrix_sdk_base::{
         media::store::{MediaStore, MediaStoreError},
@@ -345,7 +348,7 @@ mod tests {
 
         async fn get_media_store() -> Result<IndexeddbMediaStore, MediaStoreError> {
             let name = format!("test-media-store-{}", Uuid::new_v4().as_hyphenated());
-            Ok(IndexeddbMediaStore::builder().build().await?)
+            Ok(IndexeddbMediaStore::builder().database_name(name).build().await?)
         }
 
         #[cfg(target_family = "wasm")]
@@ -362,7 +365,7 @@ mod tests {
 
         async fn get_media_store() -> Result<IndexeddbMediaStore, MediaStoreError> {
             let name = format!("test-media-store-{}", Uuid::new_v4().as_hyphenated());
-            Ok(IndexeddbMediaStore::builder().build().await?)
+            Ok(IndexeddbMediaStore::builder().database_name(name).build().await?)
         }
 
         #[cfg(target_family = "wasm")]

crates/matrix-sdk-indexeddb/src/media_store/serializer/mod.rs

@@ -13,16 +13,14 @@
 // limitations under the License
 
 use gloo_utils::format::JsValueSerdeExt;
-use matrix_sdk_crypto::CryptoStoreError;
-use ruma::RoomId;
 use serde::{de::DeserializeOwned, Serialize};
 use thiserror::Error;
 use wasm_bindgen::JsValue;
 use web_sys::IdbKeyRange;
 
 use crate::{
     media_store::serializer::{
-        traits::{Indexed, IndexedKey, IndexedKeyBounds, IndexedKeyComponentBounds},
+        traits::{Indexed, IndexedKey},
         types::IndexedKeyRange,
     },
     serializer::IndexeddbSerializer,

crates/matrix-sdk-indexeddb/src/media_store/serializer/traits.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use ruma::RoomId;
-
 use crate::serializer::IndexeddbSerializer;
 
 /// A conversion trait for preparing high-level types into indexed types

crates/matrix-sdk-indexeddb/src/media_store/serializer/types.rs

@@ -329,7 +329,7 @@ impl Indexed for MediaRetentionPolicy {
 impl IndexedKey<MediaRetentionPolicy> for IndexedCoreIdKey {
     type KeyComponents<'a> = ();
 
-    fn encode(components: Self::KeyComponents<'_>, serializer: &IndexeddbSerializer) -> Self {
+    fn encode(_components: Self::KeyComponents<'_>, serializer: &IndexeddbSerializer) -> Self {
         serializer.encode_key_as_string(keys::CORE, keys::MEDIA_RETENTION_POLICY_KEY)
     }
 }

crates/matrix-sdk-indexeddb/src/media_store/transaction.rs

@@ -13,10 +13,7 @@
 // limitations under the License
 
 use indexed_db_futures::{prelude::IdbTransaction, IdbQuerySource};
-use matrix_sdk_base::{
-    linked_chunk::{ChunkContent, ChunkIdentifier, LinkedChunkId, RawChunk},
-    media::store::{MediaRetentionPolicy, MediaStoreError},
-};
+use matrix_sdk_base::media::store::{MediaRetentionPolicy, MediaStoreError};
 use serde::{
     de::{DeserializeOwned, Error},
     Serialize,
@@ -25,13 +22,9 @@ use thiserror::Error;
 use web_sys::IdbCursorDirection;
 
 use crate::media_store::{
-    error::{AsyncErrorDeps, IndexeddbMediaStoreError},
-    migrations::v1::keys,
+    error::AsyncErrorDeps,
     serializer::{
-        traits::{
-            Indexed, IndexedKey, IndexedKeyBounds, IndexedKeyComponentBounds,
-            IndexedPrefixKeyBounds, IndexedPrefixKeyComponentBounds,
-        },
+        traits::{Indexed, IndexedKey},
         types::{IndexedCoreIdKey, IndexedKeyRange, IndexedLeaseIdKey},
         IndexeddbMediaStoreSerializer,
     },

crates/matrix-sdk-indexeddb/src/media_store/types.rs

@@ -14,12 +14,7 @@
 
 use std::time::Duration;
 
-use matrix_sdk_base::{
-    deserialized_responses::TimelineEvent,
-    linked_chunk::{ChunkIdentifier, LinkedChunkId, OwnedLinkedChunkId},
-    media::{store::IgnoreMediaRetentionPolicy, MediaRequestParameters},
-};
-use ruma::{OwnedEventId, OwnedRoomId, RoomId};
+use matrix_sdk_base::media::{store::IgnoreMediaRetentionPolicy, MediaRequestParameters};
 use serde::{Deserialize, Serialize};
 
 /// Representation of a time-based lock on the entire