homelab/Watcharr
1
0
Fork 0
mirror of https://github.com/sbondCo/Watcharr.git synced 2026-08-07 07:14:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Jellyfin Sync: Don't add imported date activity if movie already on list

Browse Source
This commit is contained in:
IRHM
2024-03-05 00:00:08 +00:00
parent 5498236b48
commit 458c91d505
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/jellyfin_sync.go
+8 -8
View File
@@ -101,14 +101,14 @@ func startJellyfinSync(
slog.Error("jellyfinSyncWatched: Movie failed to import.", "movie_name", v.Name, "movie_ids", v.ProviderIds, "user_id", userId)
addJobError(jobId, userId, "movie could not be imported (failed when adding to watched list): "+v.Name)
}
}
// 3. Add IMPORTED_ADDED_WATCHED activity
if !v.UserData.LastPlayedDate.IsZero() {
_, err := addActivity(db, userId, ActivityAddRequest{WatchedID: w.ID, Type: IMPORTED_ADDED_WATCHED, CustomDate: &v.UserData.LastPlayedDate})
if err != nil {
slog.Error("jellyfinSyncWatched: Failed to add dateswatched activity.", "movie_name", v.Name,
"movie_ids", v.ProviderIds, "user_id", userId, "date", v.UserData.LastPlayedDate, "error", err)
} else {
// 3. Add IMPORTED_ADDED_WATCHED activity
if !v.UserData.LastPlayedDate.IsZero() {
_, err := addActivity(db, userId, ActivityAddRequest{WatchedID: w.ID, Type: IMPORTED_ADDED_WATCHED, CustomDate: &v.UserData.LastPlayedDate})
if err != nil {
slog.Error("jellyfinSyncWatched: Failed to add dateswatched activity.", "movie_name", v.Name,
"movie_ids", v.ProviderIds, "user_id", userId, "date", v.UserData.LastPlayedDate, "error", err)
}
}
}
}
src/routes/(app)/profile/modals/JellyfinSyncModal.svelte
+13 -6
View File
@@ -5,7 +5,7 @@
import { notify } from "@/lib/util/notify";
import { JobStatus, type GetJobResponse, type JellyfinSyncResponse } from "@/types";
import axios from "axios";
import { onMount } from "svelte";
import { onDestroy, onMount } from "svelte";
import { watchedList } from "@/store";
export let onClose: () => void;
@@ -13,7 +13,7 @@
let step: "starting" | "errored" | "job-running" | "done" | "modal-closing" = "starting";
let jobId: string | undefined;
let currentTask: string | undefined;
let latestJobStatus: GetJobResponse;
let latestJobStatus: GetJobResponse | undefined;
async function startJellyfinSync() {
try {
@@ -100,6 +100,13 @@
onMount(() => {
startJellyfinSync();
});
onDestroy(() => {
step = "starting";
jobId = undefined;
currentTask = undefined;
latestJobStatus = undefined;
});
</script>
<Modal title="Jellyfin Sync" maxWidth="700px" onClose={modalClose}>
@@ -121,19 +128,19 @@
<span>{currentTask}</span>
{/if}
{:else if step === "done"}
{#if !latestJobStatus.errors || latestJobStatus.errors?.length <= 0}
{#if !latestJobStatus?.errors || latestJobStatus?.errors?.length <= 0}
<h4 class="norm">Finished</h4>
<span>We have finished syncing. Looks like there were no errors!</span>
{:else}
<h4 class="norm">
Finished With {latestJobStatus.errors?.length} Error{latestJobStatus.errors?.length ===
1
Finished With {latestJobStatus?.errors?.length} Error{latestJobStatus?.errors
?.length === 1
? ""
: "s"}
</h4>
<span>Syncing has finished, but with errors:</span>
<ul>
{#each latestJobStatus.errors as e}
{#each latestJobStatus?.errors as e}
<li>{e}</li>
{/each}
</ul>