fix memory leak + library status

Author: neckaros

src/domain/library.rs

@@ -1,15 +1,17 @@
-use rusqlite::{types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef}, ToSql};
+use rusqlite::{
+    types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef},
+    ToSql,
+};
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 
 use super::ElementAction;
 
-
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct ServerLibrary {
     pub id: String,
-	pub name: String,
-	pub source: String,
+    pub name: String,
+    pub source: String,
     pub root: Option<String>,
     #[serde(rename = "type")]
     pub kind: LibraryType,
@@ -22,19 +24,17 @@ pub struct ServerLibrary {
     pub hidden: bool,
 }
 
-
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, EnumString, Default)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 #[strum(serialize_all = "camelCase")]
 pub enum LibraryRole {
-	Admin,
-	Read,
-	Write,
+    Admin,
+    Read,
+    Write,
     #[default]
-	None,
+    None,
 }
 
-
 #[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
 pub struct LibraryLimits {
     #[serde(default)]
@@ -47,7 +47,6 @@ pub struct LibraryLimits {
     pub delay: Option<i64>,
     #[serde(default)]
     pub user_id: Option<String>,
-
 }
 
 impl LibraryLimits {
@@ -74,32 +73,27 @@ impl ToSql for LibraryLimits {
     }
 }
 
-
-
-
-
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default, EnumString, Display)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 #[strum(serialize_all = "camelCase")]
 pub enum LibraryType {
-	Photos,
-	Shows,
-	Movies,
-	Iptv,
+    Photos,
+    Shows,
+    Movies,
+    Iptv,
     #[default]
     Other,
 }
 
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 pub struct UserMapping {
     pub from: String,
-    pub to: String
+    pub to: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 pub struct ServerLibrarySettings {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub face_threshold: Option<f32>,
@@ -111,21 +105,16 @@ pub struct ServerLibrarySettings {
     pub map_progress: Option<Vec<UserMapping>>,
 }
 
-
-
-
-
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 pub struct LibraryMessage {
     pub action: ElementAction,
-    pub library: ServerLibrary
+    pub library: ServerLibrary,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")] 
+#[serde(rename_all = "camelCase")]
 pub struct LibraryStatusMessage {
     pub message: String,
-    pub library: String
-}
+    pub library: String,
+}

src/model/mod.rs

@@ -58,7 +58,7 @@ use std::{
     io::Read,
     path::PathBuf,
     pin::Pin,
-    sync::Arc,
+    sync::{Arc, RwLock as StdRwLock},
     thread::JoinHandle,
 };
 use strum::IntoEnumIterator;
@@ -120,7 +120,7 @@ impl VideoConvertQueueElement {
 #[derive(Clone)]
 pub struct ModelController {
     store: Arc<SqliteStore>,
-    pub io: Arc<Option<SocketIo>>,
+    pub io: Arc<StdRwLock<Option<SocketIo>>>,
     pub plugin_manager: Arc<PluginManager>,
     pub trakt: Arc<TraktContext>,
     pub tmdb: Arc<TmdbContext>,
@@ -148,7 +148,7 @@ impl ModelController {
 
         let mc = Self {
             store: Arc::new(store),
-            io: Arc::new(None),
+            io: Arc::new(StdRwLock::new(None)),
             plugin_manager: Arc::new(plugin_manager),
             trakt: Arc::new(TraktContext::new(
                 "455f81b3409a8dd140a941e9250ff22b2ed92d68003491c3976363fe752a9024".to_string(),
@@ -526,16 +526,20 @@ impl ModelController {
 
 impl ModelController {
     pub fn set_socket(&mut self, io: SocketIo) {
-        self.io = Arc::new(Some(io));
+        let mut w = self.io.write().unwrap();
+        *w = Some(io);
     }
 
     fn for_connected_users<T: Clone>(
         &self,
         message: &T,
         action: fn(user: &ConnectedUser, socket: &SocketRef, message: T) -> (),
     ) {
-        let io = self.io.clone();
-        if let Some(ref io) = *io {
+        let io = {
+            let guard = self.io.read().unwrap();
+            guard.clone()
+        };
+        if let Some(ref io) = io {
             if let Ok(sockets) = io.sockets() {
                 for socket in sockets {
                     if let Some(user) = socket.extensions.get::<ConnectedUser>() {
@@ -556,18 +560,10 @@ impl ModelController {
 
     pub fn send_library_status(&self, message: LibraryStatusMessage) {
         self.for_connected_users(&message, |user, socket, message| {
-            // Check if user has Read access to the library
-
-            println!(
-                "send_library_status,	 user: {:?}, message: {:?}",
-                user.user_id(),
-                message
-            );
             if user
                 .check_library_role(&message.library, LibraryRole::Admin)
                 .is_ok()
             {
-                println!("Sent status");
                 let _ = socket.emit("library-status", message);
             }
         });

src/model/people.rs

@@ -770,28 +770,27 @@ impl ModelController {
                 let duration = media.duration.unwrap_or(0);
 
                 // Determine percentages to scan
-                let percents = if duration < 1000 * 60 * 2 {
+                let percents = if duration < 1000 * 60 {
+                    // < 1 min
+                    vec![20, 50, 80]
+                } else if duration < 1000 * 60 * 2 {
                     // < 2 min
-                    vec![10, 20, 30, 40, 50, 60, 70, 80, 90]
+                    vec![10, 30, 50, 66, 85]
                 } else if duration < 1000 * 60 * 10 {
                     // < 10 min
-                    vec![
-                        5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95,
-                    ]
+                    vec![5, 12, 19, 26, 33, 40, 54, 68, 75, 89, 96]
                 } else {
-                    vec![
-                        2, 5, 7, 10, 12, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80,
-                        85, 90, 92, 95, 97,
-                    ]
+                    vec![2, 8, 20, 26, 38, 44, 50, 56, 68, 74, 86, 92, 98]
                 };
 
                 for percent in percents {
                     // Get thumb as byte buffer
+                    let seconds = (duration as f64 / 1000.0) * (percent as f64 / 100.0);
                     let thumb = self
                         .get_video_thumb(
                             library_id,
                             media_id,
-                            VideoTime::Percent(percent as u32),
+                            VideoTime::Seconds(seconds),
                             image::ImageFormat::Png,
                             Some(70),
                             requesting_user,