Skip to content

Fix jf show activity #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nolah2 wants to merge 2 commits into
base: unstable
Choose a base branch
from
+156 −0
Open

Fix jf show activity #512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50d436c
Fix playback reporting procedure
Nolah2 Feb 9, 2026
b5589e9
Fix for NowPlayingItemName as well
Nolah2 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions backend/migrations/100_ji_insert_playback_plugin_data_to_activity_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
exports.up = async function (knex) {
try {
// Update the procedure to use SeriesId for shows
await knex.schema.raw(`
CREATE OR REPLACE PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table(
)
LANGUAGE 'plpgsql'
AS $BODY$
BEGIN
insert into jf_playback_activity
SELECT
rowid,
false "IsPaused",
pb."UserId",
u."Name",
pb."ClientName",
pb."DeviceName",
null "DeviceId",
null "ApplicationVersion",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."SeriesId" ELSE "ItemId" END "NowPlayingItemId",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."Name" ELSE "ItemName" END "NowPlayingItemName",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."SeasonId" ELSE null END "SeasonId",
CASE WHEN i."Id"=e."SeriesId" THEN i."Name" ELSE null END "SeriesName",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."EpisodeId" ELSE null END "EpisodeId",
"PlayDuration" "PlaybackDuration",
pb."DateCreated" "ActivityDateInserted",
"PlaybackMethod" "PlayMethod",
null "MediaStreams",
null "TranscodingInfo",
null "PlayState",
null "OriginalContainer",
null "RemoteEndPoint",
null "ServerId",
true "imported"
FROM public.jf_playback_reporting_plugin_data pb
LEFT JOIN public.jf_users u
on u."Id"=pb."UserId"

LEFT JOIN public.jf_library_episodes e
on e."EpisodeId"=pb."ItemId"

LEFT JOIN public.jf_library_items i
on i."Id"=pb."ItemId"
or i."Id"=e."SeriesId"

WHERE NOT EXISTS
(
SELECT "Id" "rowid"
FROM jf_playback_activity
WHERE imported=true
)
AND
(i."Type" is not null OR (i."Type"='Series' and e."SeasonId" is not null and e."Id" is not null ));
END;


$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_ROLE}";
`);

// Update all existing playback plugin data to have the correct NowPlayingItemId=SeriesId
// and set the NowPlayingItemName to the jf_library_episode."Name"
await knex.raw(`
MERGE INTO jf_playback_activity a
USING jf_library_episodes e
ON a."NowPlayingItemId" = e."EpisodeId"
WHEN MATCHED
AND a."NowPlayingItemId" = a."EpisodeId"
AND a."imported" = true
AND position('-' in a."Id") = 0
THEN UPDATE SET "NowPlayingItemId" = e."SeriesId", "NowPlayingItemName" = e."Name";
`);
} catch (error) {
console.error(error);
}
};

exports.down = async function (knex) {
try {
// Revert the procedure to the previous state
await knex.schema.raw(`
CREATE OR REPLACE PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table(
)
LANGUAGE 'plpgsql'
AS $BODY$
BEGIN
insert into jf_playback_activity
SELECT
rowid,
false "IsPaused",
pb."UserId",
u."Name",
pb."ClientName",
pb."DeviceName",
null "DeviceId",
null "ApplicationVersion",
"ItemId" "NowPlayingItemId",
"ItemName" "NowPlayingItemName",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."SeasonId" ELSE null END "SeasonId",
CASE WHEN i."Id"=e."SeriesId" THEN i."Name" ELSE null END "SeriesName",
CASE WHEN e."EpisodeId"=pb."ItemId" THEN e."EpisodeId" ELSE null END "EpisodeId",
"PlayDuration" "PlaybackDuration",
pb."DateCreated" "ActivityDateInserted",
"PlaybackMethod" "PlayMethod",
null "MediaStreams",
null "TranscodingInfo",
null "PlayState",
null "OriginalContainer",
null "RemoteEndPoint",
null "ServerId",
true "imported"
FROM public.jf_playback_reporting_plugin_data pb
LEFT JOIN public.jf_users u
on u."Id"=pb."UserId"

LEFT JOIN public.jf_library_episodes e
on e."EpisodeId"=pb."ItemId"

LEFT JOIN public.jf_library_items i
on i."Id"=pb."ItemId"
or i."Id"=e."SeriesId"

WHERE NOT EXISTS
(
SELECT "Id" "rowid"
FROM jf_playback_activity
WHERE imported=true
)
AND
(i."Type" is not null OR (i."Type"='Series' and e."SeasonId" is not null and e."Id" is not null ));
END;


$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_ROLE}";
`);

// revert only the Playback plugin records back to the old NowPlayingId=EpisodeId
// and reset the NowPlayingItemName to the original playback reporting name
await knex.raw(`
MERGE INTO jf_playback_activity a
USING jf_playback_reporting_plugin_data p
ON a."Id"=p."rowid"::TEXT
WHEN MATCHED
AND a."EpisodeId" IS NOT NULL
AND a."NowPlayingItemId" != a."EpisodeId"
AND position('-' in a."Id") = 0
AND "imported" = true
THEN UPDATE SET "NowPlayingItemId" = a."EpisodeId", "NowPlayingItemName" = p."ItemName";
`);
} catch (error) {
console.error(error);
}
};