Jellyfin integration

README.md

@@ -54,9 +54,9 @@ special tool on your computer or phone that lets you keep track of all these dig
 ## 🚀 Features
 
 - ✅ [Supports](https://github.com/IgnisDa/ryot/discussions/4) tracking media
-  and fitness.
+  and fitness
 - ✅ Import data from Goodreads, MediaTracker, Trakt, Movary, StoryGraph
-- ✅ Integration with Kodi, Audiobookshelf
+- ✅ Integration with Jellyfin, Kodi, Audiobookshelf
 - ✅ Self-hosted
 - ✅ PWA enabled
 - ✅ Documented GraphQL API

apps/backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "1.13.2"
+version = "1.14.0-beta.1"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-V3"
@@ -29,14 +29,17 @@ dotenvy = "0.15.7"
 enum_meta = "0.6.0"
 futures = "0.3.28"
 graphql_client = "0.13.0"
+harsh = "0.2.2"
 http = "0.2.9"
 http-types = "2.12.0"
 isolang = { version = "2.3.0", features = ["list_languages"] }
 itertools = "0.10.5"
 markdown = "1.0.0-alpha.10"
 mime_guess = "2.0.4"
+nanoid = "0.4.0"
 quick-xml = { version = "0.28.2", features = ["serde", "serialize"] }
 regex = "1.8.1"
+retainer = "0.3.0"
 rust-embed = "6.6.1"
 rust_decimal = "1.29.1"
 rust_decimal_macros = "1.29.1"

apps/backend/src/config.rs

@@ -324,6 +324,9 @@ pub struct IntegrationConfig {
     /// every `n` hours.
     #[setting(default = 2)]
     pub pull_every: i32,
+    /// The salt used to hash user IDs.
+    #[setting(default = format!("{}", PROJECT_NAME))]
+    pub hasher_salt: String,
 }
 
 impl IsFeatureEnabled for FileStorageConfig {
@@ -386,6 +389,11 @@ pub struct ServerConfig {
     /// are running the server on `localhost`.
     /// [More information](https://github.com/IgnisDa/ryot/issues/23)
     pub insecure_cookie: bool,
+    /// The hours in which a media can be marked as seen again for a user. This
+    /// is used so that the same media can not be used marked as started when
+    /// it has been already marked as seen in the last `n` hours.
+    #[setting(default = 2)]
+    pub progress_update_threshold: u64,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Config)]
@@ -453,6 +461,7 @@ impl AppConfig {
         cl.file_storage.s3_access_key_id = gt();
         cl.file_storage.s3_secret_access_key = gt();
         cl.file_storage.s3_url = gt();
+        cl.integration.hasher_salt = gt();
         cl.movies.tmdb.access_token = gt();
         cl.podcasts.listennotes.api_token = gt();
         cl.shows.tmdb.access_token = gt();

apps/backend/src/entities/user.rs

@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     migrator::UserLot,
-    users::{UserPreferences, UserYankIntegrations},
+    users::{UserPreferences, UserSinkIntegrations, UserYankIntegrations},
 };
 
 fn get_hasher() -> Argon2<'static> {
@@ -33,6 +33,8 @@ pub struct Model {
     pub preferences: UserPreferences,
     #[graphql(skip)]
     pub yank_integrations: Option<UserYankIntegrations>,
+    #[graphql(skip)]
+    pub sink_integrations: UserSinkIntegrations,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

apps/backend/src/graphql.rs

@@ -5,7 +5,7 @@ use crate::{
     fitness::exercise::resolver::{ExerciseMutation, ExerciseQuery},
     importer::{ImporterMutation, ImporterQuery},
     miscellaneous::resolver::{MiscellaneousMutation, MiscellaneousQuery},
-    utils::{AppServices, MemoryAuthDb},
+    utils::AppServices,
 };
 
 #[derive(Debug, SimpleObject, Serialize, Deserialize)]
@@ -21,13 +21,12 @@ pub struct MutationRoot(MiscellaneousMutation, ImporterMutation, ExerciseMutatio
 
 pub type GraphqlSchema = Schema<QueryRoot, MutationRoot, EmptySubscription>;
 
-pub async fn get_schema(app_services: &AppServices, auth_db: MemoryAuthDb) -> GraphqlSchema {
+pub async fn get_schema(app_services: &AppServices) -> GraphqlSchema {
     Schema::build(
         QueryRoot::default(),
         MutationRoot::default(),
         EmptySubscription,
     )
-    .data(auth_db)
     .data(app_services.media_service.clone())
     .data(app_services.importer_service.clone())
     .data(app_services.exercise_service.clone())

apps/backend/src/importer/goodreads.rs

@@ -1,7 +1,7 @@
 use async_graphql::Result;
 use chrono::{DateTime, Utc};
 use itertools::Itertools;
-use rust_decimal::{prelude::FromPrimitive, Decimal};
+use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
 
@@ -79,8 +79,7 @@ pub async fn import(input: DeployGoodreadsImportInput) -> Result<ImportResult> {
                     let rating: Decimal = d.user_rating.parse().unwrap();
                     if rating != dec!(0) {
                         // DEV: Rates items out of 5
-                        single_review.rating =
-                            Some(rating.saturating_mul(Decimal::from_u8(20).unwrap()))
+                        single_review.rating = Some(rating.saturating_mul(dec!(20)))
                     }
                 };
                 if single_review.review.is_some() || single_review.rating.is_some() {

apps/backend/src/importer/media_tracker.rs

@@ -1,7 +1,8 @@
 // Responsible for importing from https://github.com/bonukai/MediaTracker.
 
 use async_graphql::Result;
-use rust_decimal::{prelude::FromPrimitive, Decimal};
+use rust_decimal::Decimal;
+use rust_decimal_macros::dec;
 use sea_orm::prelude::DateTimeUtc;
 use serde::{Deserialize, Serialize};
 use serde_with::{formats::Flexible, serde_as, TimestampMilliSeconds};
@@ -295,9 +296,7 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
                 ImportItemRating {
                     id: Some(r.id.to_string()),
                     review,
-                    rating: r
-                        .rating
-                        .map(|d| d.saturating_mul(Decimal::from_u8(20).unwrap())),
+                    rating: r.rating.map(|d| d.saturating_mul(dec!(20))),
                 }
             })),
             seen_history: details

apps/backend/src/importer/mod.rs

@@ -20,7 +20,8 @@ use crate::{
         AddMediaToCollection, CreateOrUpdateCollectionInput, MediaDetails, PostReviewInput,
         ProgressUpdateInput,
     },
-    utils::user_id_from_ctx,
+    traits::AuthProvider,
+    utils::MemoryDatabase,
 };
 
 mod goodreads;
@@ -170,11 +171,9 @@ impl ImporterQuery {
         &self,
         gql_ctx: &Context<'_>,
     ) -> Result<Vec<media_import_report::Model>> {
-        let user_id = user_id_from_ctx(gql_ctx).await?;
-        gql_ctx
-            .data_unchecked::<Arc<ImporterService>>()
-            .media_import_reports(user_id)
-            .await
+        let service = gql_ctx.data_unchecked::<Arc<ImporterService>>();
+        let user_id = service.user_id_from_ctx(gql_ctx).await?;
+        service.media_import_reports(user_id).await
     }
 }
 
@@ -189,11 +188,9 @@ impl ImporterMutation {
         gql_ctx: &Context<'_>,
         input: DeployImportJobInput,
     ) -> Result<String> {
-        let user_id = user_id_from_ctx(gql_ctx).await?;
-        gql_ctx
-            .data_unchecked::<Arc<ImporterService>>()
-            .deploy_import_job(user_id, input)
-            .await
+        let service = gql_ctx.data_unchecked::<Arc<ImporterService>>();
+        let user_id = service.user_id_from_ctx(gql_ctx).await?;
+        service.deploy_import_job(user_id, input).await
     }
 }
 
@@ -203,6 +200,12 @@ pub struct ImporterService {
     import_media: SqliteStorage<ImportMedia>,
 }
 
+impl AuthProvider for ImporterService {
+    fn get_auth_db(&self) -> &MemoryDatabase {
+        self.media_service.get_auth_db()
+    }
+}
+
 impl ImporterService {
     #[allow(clippy::too_many_arguments)]
     pub fn new(

apps/backend/src/importer/movary.rs

@@ -1,7 +1,8 @@
 use async_graphql::Result;
 use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use csv::Reader;
-use rust_decimal::{prelude::FromPrimitive, Decimal};
+use rust_decimal::Decimal;
+use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -64,11 +65,7 @@ pub async fn import(input: DeployMovaryImportInput) -> Result<ImportResult> {
             reviews: vec![ImportItemRating {
                 id: None,
                 // DEV: Rates items out of 10
-                rating: Some(
-                    record
-                        .user_rating
-                        .saturating_mul(Decimal::from_u16(10).unwrap()),
-                ),
+                rating: Some(record.user_rating.saturating_mul(dec!(10))),
                 review: None,
             }],
             collections: vec![],

apps/backend/src/importer/story_graph.rs

@@ -3,7 +3,8 @@ use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use convert_case::{Case, Casing};
 use csv::Reader;
 use itertools::Itertools;
-use rust_decimal::{prelude::FromPrimitive, Decimal};
+use rust_decimal::Decimal;
+use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -110,7 +111,7 @@ pub async fn import(
                         rating: record
                             .rating
                             // DEV: Rates items out of 10
-                            .map(|d| d.saturating_mul(Decimal::from_u8(10).unwrap())),
+                            .map(|d| d.saturating_mul(dec!(10))),
                         review: record.review.map(|r| ImportItemReview {
                             date: None,
                             spoiler: false,