Komga implementation

apps/backend/src/background.rs

@@ -46,8 +46,6 @@ pub async fn sync_integrations_data(
     _information: ScheduledJob,
     misc_service: Data<Arc<MiscellaneousService>>,
 ) -> Result<(), Error> {
-    tracing::trace!("Getting data from sse integrations for all users");
-    misc_service.sse_integrations_data().await.unwrap();
     tracing::trace!("Getting data from yanked integrations for all users");
     misc_service.yank_integrations_data().await.unwrap();
     tracing::trace!("Sending data for push integrations for all users");
@@ -87,10 +85,6 @@ pub async fn perform_core_application_job(
             misc_service
                 .yank_integrations_data_for_user(&user_id)
                 .await
-                .ok();
-            misc_service
-                .sse_integrations_data_for_user(&user_id)
-                .await
                 .is_ok()
         }
         CoreApplicationJob::BulkProgressUpdate(user_id, input) => misc_service

apps/backend/src/entities/integration.rs

@@ -27,6 +27,7 @@ pub struct Model {
     #[graphql(skip_input)]
     pub last_triggered_on: Option<DateTimeUtc>,
     #[sea_orm(column_type = "Json")]
+    #[graphql(skip)]
     pub provider_specifics: Option<IntegrationProviderSpecifics>,
 }
 

apps/backend/src/miscellaneous.rs

@@ -5499,7 +5499,7 @@ impl MiscellaneousService {
         }
         let lot = match input.provider {
             IntegrationProvider::Audiobookshelf => IntegrationLot::Yank,
-            IntegrationProvider::Komga => IntegrationLot::SSE,
+            IntegrationProvider::Komga => IntegrationLot::Yank,
             IntegrationProvider::Radarr | IntegrationProvider::Sonarr => IntegrationLot::Push,
             _ => IntegrationLot::Sink,
         };
@@ -5543,13 +5543,6 @@ impl MiscellaneousService {
         if let Some(d) = input.is_disabled {
             db_integration.is_disabled = ActiveValue::Set(Some(d));
         }
-        if let Some(d) = input.provider_specifics {
-            let mut existing_specifics =
-                db_integration.provider_specifics.clone().unwrap().clone().unwrap().clone();
-
-            existing_specifics.komga_provider = d.komga_provider;
-            db_integration.provider_specifics = ActiveValue::Set(Some(existing_specifics));
-        }
         db_integration.update(&self.db).await?;
         Ok(true)
     }
@@ -5754,83 +5747,6 @@ impl MiscellaneousService {
             .collect()
     }
 
-    pub async fn sse_integrations_data_for_user(&self, user_id: &String) -> Result<bool> {
-        let preferences = self.user_preferences(user_id).await?;
-        if preferences.general.disable_integrations {
-            return Ok(false);
-        }
-        let integrations = Integration::find()
-            .filter(integration::Column::UserId.eq(user_id))
-            .all(&self.db)
-            .await?;
-        let mut progress_updates = vec![];
-        let mut collection_updates = vec![];
-        let mut to_update_integrations = vec![];
-        let integration_service = self.get_integration_service();
-        for integration in integrations.into_iter() {
-            if integration.is_disabled.unwrap_or_default() {
-                tracing::debug!("Integration {} is disabled", integration.id);
-                continue;
-            }
-            let response = match integration.provider {
-                IntegrationProvider::Komga => {
-                    let specifics = integration.clone().provider_specifics.unwrap();
-
-                    integration_service
-                        .komga_progress(
-                            &specifics.komga_base_url.unwrap(),
-                            &specifics.komga_cookie.unwrap(),
-                            specifics.komga_provider.unwrap(),
-                        )
-                        .await
-                },
-                _ => continue,
-            };
-            if let Ok((seen_progress, collection_progress)) = response {
-                collection_updates.extend(collection_progress);
-                to_update_integrations.push(integration.id.clone());
-                progress_updates.push((integration, seen_progress));
-            }
-        }
-        for (integration, progress_updates) in progress_updates.into_iter() {
-            for pu in progress_updates.into_iter() {
-                self.integration_progress_update(&integration, pu, user_id)
-                    .await
-                    .trace_ok();
-            }
-        }
-        for col_update in collection_updates.into_iter() {
-            let metadata::Model { id, .. } = self
-                .commit_metadata(CommitMediaInput {
-                    lot: col_update.lot,
-                    source: col_update.source,
-                    identifier: col_update.identifier.clone(),
-                    force_update: None,
-                })
-                .await?;
-            self.add_entity_to_collection(
-                user_id,
-                ChangeCollectionToEntityInput {
-                    creator_user_id: user_id.to_owned(),
-                    collection_name: col_update.collection,
-                    metadata_id: Some(id.clone()),
-                    ..Default::default()
-                },
-            )
-                .await
-                .trace_ok();
-        }
-        Integration::update_many()
-            .filter(integration::Column::Id.is_in(to_update_integrations))
-            .col_expr(
-                integration::Column::LastTriggeredOn,
-                Expr::value(Utc::now()),
-            )
-            .exec(&self.db)
-            .await?;
-        Ok(true)
-    }
-
     pub async fn yank_integrations_data_for_user(&self, user_id: &String) -> Result<bool> {
         let preferences = self.user_preferences(user_id).await?;
         if preferences.general.disable_integrations {
@@ -5861,6 +5777,17 @@ impl MiscellaneousService {
                         )
                         .await
                 },
+                IntegrationProvider::Komga => {
+                    let specifics = integration.clone().provider_specifics.unwrap();
+
+                    integration_service
+                        .komga_progress(
+                            &specifics.komga_base_url.unwrap(),
+                            &specifics.komga_cookie.unwrap(),
+                            specifics.komga_provider.unwrap(),
+                        )
+                        .await
+                },
                 _ => continue,
             };
             if let Ok((seen_progress, collection_progress)) = response {
@@ -5923,21 +5850,6 @@ impl MiscellaneousService {
         Ok(())
     }
 
-    pub async fn sse_integrations_data(&self) -> Result<()> {
-        let users_with_integrations = Integration::find()
-            .filter(integration::Column::Lot.eq(IntegrationLot::SSE))
-            .select_only()
-            .column(integration::Column::UserId)
-            .into_tuple::<String>()
-            .all(&self.db)
-            .await?;
-        for user_id in users_with_integrations {
-            tracing::debug!("sse integrations data for user {}", user_id);
-            self.sse_integrations_data_for_user(&user_id).await?;
-        }
-        Ok(())
-    }
-
     pub async fn send_data_for_push_integrations(&self) -> Result<()> {
         let users_with_integrations = Integration::find()
             .filter(integration::Column::Lot.eq(IntegrationLot::Push))

apps/frontend/app/routes/_dashboard.settings.integrations.tsx

@@ -54,17 +54,15 @@ import { dayjsLib } from "~/lib/generals";
 import { useConfirmSubmit, useUserCollections } from "~/lib/hooks";
 import { createToastHeaders, serverGqlService } from "~/lib/utilities.server";
 
-const SSE_INTEGRATION = [
-	IntegrationProvider.Komga,
-]
 const YANK_INTEGRATIONS = [
 	IntegrationProvider.Audiobookshelf,
+	IntegrationProvider.Komga,
 ];
 const PUSH_INTEGRATIONS = [
 	IntegrationProvider.Radarr,
 	IntegrationProvider.Sonarr,
 ];
-const NO_SHOW_URL = [...SSE_INTEGRATION, ...YANK_INTEGRATIONS, ...PUSH_INTEGRATIONS];
+const NO_SHOW_URL = [...YANK_INTEGRATIONS, ...PUSH_INTEGRATIONS];
 
 export const loader = unstable_defineLoader(async ({ request }) => {
 	const [{ userIntegrations }] = await Promise.all([
@@ -191,11 +189,6 @@ const updateSchema = z.object({
 	minimumProgress: z.string().optional(),
 	maximumProgress: z.string().optional(),
 	isDisabled: zx.CheckboxAsString.optional(),
-	providerSpecifics: z
-		.object({
-			komgaProvider: z.nativeEnum(MediaSource),
-		})
-		.optional(),
 });
 
 export default function Page() {
@@ -473,7 +466,7 @@ const CreateIntegrationModal = (props: {
 									label="Select a provider"
 									name="providerSpecifics.komgaProvider"
 									required
-									data={[MediaSource.Anilist,MediaSource.Mal].map((is) => ({
+									data={[MediaSource.Anilist, MediaSource.Mal].map((is) => ({
 										label: changeCase(is),
 										value: is,
 									}))}
@@ -587,24 +580,6 @@ const UpdateIntegrationModal = (props: {
 								/>
 							</Group>
 						) : null}
-						{match(props.updateIntegrationData.provider)
-							.with(IntegrationProvider.Komga, () => (
-								<>
-									<Select
-										label="Select a provider"
-										name="providerSpecifics.komgaProvider"
-										required
-										defaultValue = {
-											props.updateIntegrationData?.providerSpecifics?.komgaProvider || undefined
-										}
-										data={[MediaSource.Anilist,MediaSource.Mal].map((is) => ({
-											label: changeCase(is),
-											value: is,
-										}))}
-									/>
-								</>
-							))
-							.otherwise(() => undefined)}
 						<Checkbox
 							name="isDisabled"
 							label="Pause integration"

docs/content/integrations.md

@@ -7,7 +7,6 @@ services about changes. They can be of following types:
   interval.
 - _Push_: Ryot sends data to an external service at a periodic interval.
 - _Sink_: An external client publishes progress updates to the Ryot server.
-- _SSE_: A server publishes event data for clients to use. Ryot subscribes to the event stream to capture updates.
 
 ## Yank integrations
 
@@ -33,6 +32,53 @@ have a valid provider ID (Audible, ITunes or ISBN).
 2. Go to your Ryot user settings and add the correct details as described in the
    [yank](#yank-integrations) section.
 
+### Komga
+
+!!! warning
+
+      This will only import media that are in progress. An import process will be added in
+      the future
+
+The [Komga](https://komga.org/) integration can sync all media if they
+have a valid metadata provider.
+
+#### Komga side steps
+If you use [Komf](https://github.com/Snd-R/komf) or some similar metadata provider these urls will be
+populated automatically. If you don't use komf youll either need to manually add the manga to your collection
+or you can perform the following steps.
+1. Navigate to the manga
+2. Open the edit tab
+3. Navigate to the Links tab
+4. Create a link named `AniList` or `MyAnimeList` providing the respective url (not case-sensitive)
+
+To retrieve your Cookie youll need to perform the following steps:
+1. Log out of Komga
+2. Log back in while selecting `Remember me`
+3. Press F12
+4. Navigate to the Network tab
+5. Refresh the page
+6. Select any of the urls and look for the `Cookie` Header
+7. Copy the entire cookie it should look something like this `remember-me=REDACTED; SESSION=REDACTED`
+
+If you are using NGINX as your reverse proxy youll probably need to add the following to your configuration
+to allow the SSE stream to work correctly.
+
+```nginx
+# Needs to be added to the location / section of the file
+# If you dont the transfers will be chunked so youll get updates every 1000-2000 events
+proxy_set_header Connection '';
+proxy_http_version 1.1;
+chunked_transfer_encoding off;
+proxy_buffering off;
+proxy_cache off;
+```
+#### Ryot side steps
+1. Obtain your cookie as described above
+2. Create the integration and select Komga as the source
+3. Provide your BaseURL. Should look something like this `http://komga.acme.com` or `http://127.0.0.1:25600`
+4. Provide your Cookie.
+5. Provide your prefered metadata provider it will attempt the others if the first doesn't work and will fallback to title search otherwise
+
 ## Push integrations
 
 Follow the same instructions as the [yank](#yank-integrations) integrations to add one.
@@ -138,59 +184,3 @@ TMDb ID attached to their metadata.
    the zipped addon to your Kodi instance. Once installed, it will be visible under
    the "Services" sub category named "Ryot".
 4. Click on "Configure" to fill in the correct details.
-
-
-## SSE integrations
-For each integration you want to enable, credentials for the external server must be saved
-to your profile. To do so, go to the "Settings" tab and add a new integration under the
-"Integrations" tab.
-
-You can configure the interval at which the data is handled from the sse listener using the
-`integration.sync_every_minutes` configuration key. Defaults to `5` (minutes).
-
-### Komga
-
-!!! warning
-
-      This will only import media that are in progress. An import process will be added in
-      the future
-
-The [Komga](https://komga.org/) integration can sync all media if they
-have a valid metadata provider.
-
-#### Komga side steps
-If you use [Komf](https://github.com/Snd-R/komf) or some similar metadata provider these urls will be 
-populated automatically. If you don't use komf youll either need to manually add the manga to your collection
-or you can perform the following steps.
-1. Navigate to the manga
-2. Open the edit tab
-3. Navigate to the Links tab
-4. Create a link named `AniList` or `MyAnimeList` providing the respective url (not case-sensitive)
-
-To retrieve your Cookie youll need to perform the following steps:
-1. Log out of Komga
-2. Log back in while selecting `Remember me`
-3. Press F12
-4. Navigate to the Network tab
-5. Refresh the page
-6. Select any of the urls and look for the `Cookie` Header
-7. Copy the entire cookie it should look something like this `remember-me=REDACTED; SESSION=REDACTED`
-
-If you are using NGINX as your reverse proxy youll probably need to add the following to your configuration
-to allow the SSE stream to work correctly. 
-
-```nginx
-# Needs to be added to the location / section of the file
-# If you dont the transfers will be chunked so youll get updates every 1000-2000 events
-proxy_set_header Connection '';
-proxy_http_version 1.1;
-chunked_transfer_encoding off;
-proxy_buffering off;
-proxy_cache off;
-```
-#### Ryot side steps
-1. Obtain your cookie as described above
-2. Create the integration and select Komga as the source
-3. Provide your BaseURL. Should look something like this `komga.acme.com` or `127.0.0.1:25600`
-4. Provide your Cookie.
-5. Provide your prefered metadata provider it will attempt the others if the first doesn't work and will fallback to title search otherwise

libs/database/src/definitions.rs

@@ -424,7 +424,6 @@ pub enum IntegrationLot {
     Yank,
     Sink,
     Push,
-    SSE
 }
 
 #[derive(