Merge pull request #72 from Stremio/feat/ctx-search-history

Serialize search history in ctx

src/model/model.rs

@@ -23,7 +23,7 @@ use stremio_core::{
     types::{
         addon::DescriptorPreview, api::LinkAuthKey, library::LibraryBucket,
         notifications::NotificationsBucket, profile::Profile, resource::MetaItemPreview,
-        streams::StreamsBucket,
+        search_history::SearchHistoryBucket, streams::StreamsBucket,
     },
     Model,
 };
@@ -67,6 +67,7 @@ impl WebModel {
         library: LibraryBucket,
         streams: StreamsBucket,
         notifications: NotificationsBucket,
+        search_history: SearchHistoryBucket,
     ) -> (WebModel, Effects) {
         let (continue_watching_preview, continue_watching_preview_effects) =
             ContinueWatchingPreview::new(&library, &notifications);
@@ -82,7 +83,7 @@ impl WebModel {
         let (streaming_server, streaming_server_effects) = StreamingServer::new::<WebEnv>(&profile);
         let (local_search, local_search_effects) = LocalSearch::new::<WebEnv>();
         let model = WebModel {
-            ctx: Ctx::new(profile, library, streams, notifications),
+            ctx: Ctx::new(profile, library, streams, notifications, search_history),
             auth_link: Default::default(),
             data_export: Default::default(),
             local_search,

src/model/serialize_ctx.rs

@@ -9,6 +9,7 @@ pub fn serialize_ctx(ctx: &Ctx) -> JsValue {
 mod model {
     use std::collections::HashMap;
 
+    use itertools::Itertools;
     use serde::Serialize;
 
     use chrono::{DateTime, Utc};
@@ -23,6 +24,7 @@ mod model {
         /// keep the original Profile model inside.
         pub profile: &'a Profile,
         pub notifications: Notifications<'a>,
+        pub search_history: Vec<&'a str>,
     }
 
     #[derive(Serialize)]
@@ -50,6 +52,13 @@ mod model {
                     last_updated: ctx.notifications.last_updated,
                     created: ctx.notifications.created,
                 },
+                search_history: ctx
+                    .search_history
+                    .items
+                    .iter()
+                    .sorted_by(|(_, a_date), (_, b_date)| Ord::cmp(b_date, a_date))
+                    .map(|(query, ..)| query.as_str())
+                    .collect_vec(),
             }
         }
     }

src/stremio_core_web.rs

@@ -1,7 +1,7 @@
 use std::sync::RwLock;
 
 use enclose::enclose;
-use futures::{future, FutureExt, StreamExt};
+use futures::{future, try_join, FutureExt, StreamExt};
 use lazy_static::lazy_static;
 use tracing::{info, Level};
 use tracing_wasm::WASMLayerConfigBuilder;
@@ -11,13 +11,13 @@ use wasm_bindgen::JsValue;
 use stremio_core::{
     constants::{
         LIBRARY_RECENT_STORAGE_KEY, LIBRARY_STORAGE_KEY, NOTIFICATIONS_STORAGE_KEY,
-        PROFILE_STORAGE_KEY, STREAMS_STORAGE_KEY,
+        PROFILE_STORAGE_KEY, SEARCH_HISTORY_STORAGE_KEY, STREAMS_STORAGE_KEY,
     },
     models::common::Loadable,
     runtime::{msg::Action, Env, EnvError, Runtime, RuntimeAction, RuntimeEvent},
     types::{
         library::LibraryBucket, notifications::NotificationsBucket, profile::Profile,
-        resource::Stream, streams::StreamsBucket,
+        resource::Stream, search_history::SearchHistoryBucket, streams::StreamsBucket,
     },
 };
 
@@ -58,21 +58,22 @@ pub async fn initialize_runtime(emit_to_ui: js_sys::Function) -> Result<(), JsVa
     let env_init_result = WebEnv::init().await;
     match env_init_result {
         Ok(_) => {
-            let storage_result = future::try_join5(
+            let storage_result = try_join!(
                 WebEnv::get_storage::<Profile>(PROFILE_STORAGE_KEY),
                 WebEnv::get_storage::<LibraryBucket>(LIBRARY_RECENT_STORAGE_KEY),
                 WebEnv::get_storage::<LibraryBucket>(LIBRARY_STORAGE_KEY),
                 WebEnv::get_storage::<StreamsBucket>(STREAMS_STORAGE_KEY),
                 WebEnv::get_storage::<NotificationsBucket>(NOTIFICATIONS_STORAGE_KEY),
-            )
-            .await;
+                WebEnv::get_storage::<SearchHistoryBucket>(SEARCH_HISTORY_STORAGE_KEY),
+            );
             match storage_result {
                 Ok((
                     profile,
                     recent_bucket,
                     other_bucket,
                     streams_bucket,
                     notifications_bucket,
+                    search_history_bucket,
                 )) => {
                     let profile = profile.unwrap_or_default();
                     let mut library = LibraryBucket::new(profile.uid(), vec![]);
@@ -86,8 +87,15 @@ pub async fn initialize_runtime(emit_to_ui: js_sys::Function) -> Result<(), JsVa
                         streams_bucket.unwrap_or_else(|| StreamsBucket::new(profile.uid()));
                     let notifications_bucket = notifications_bucket
                         .unwrap_or(NotificationsBucket::new::<WebEnv>(profile.uid(), vec![]));
-                    let (model, effects) =
-                        WebModel::new(profile, library, streams_bucket, notifications_bucket);
+                    let search_history_bucket =
+                        search_history_bucket.unwrap_or(SearchHistoryBucket::new(profile.uid()));
+                    let (model, effects) = WebModel::new(
+                        profile,
+                        library,
+                        streams_bucket,
+                        notifications_bucket,
+                        search_history_bucket,
+                    );
                     let (runtime, rx) = Runtime::<WebEnv, _>::new(
                         model,
                         effects.into_iter().collect::<Vec<_>>(),