Skip to content
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

feat: support STRM files in library as available content #1004

Closed
wants to merge 9 commits into from
Closed

feat: support STRM files in library as available content #1004

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32e50e9
Support strm files, which won't have mediastream data until played, s…
Sep 21, 2024
e01ed7e
Merge pull request #1 from markjbear/fix/support-strm-movies
alanmilinovic Oct 12, 2024
6538c09
Update server/lib/scanners/jellyfin/index.ts
alanmilinovic Oct 28, 2024
a7f7869
Merge branch 'Fallenbagel:develop' into develop
alanmilinovic Oct 28, 2024
9cc8368
Create format.yml
alanmilinovic Oct 28, 2024
c493ddd
Update format.yml
alanmilinovic Oct 28, 2024
5e2e011
Update index.ts
alanmilinovic Oct 28, 2024
a2c70c1
Delete .github/workflows/format.yml
alanmilinovic Oct 28, 2024
6fdf5e2
Update index.ts
alanmilinovic Oct 28, 2024
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
1 change: 1 addition & 0 deletions server/api/jellyfin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export interface JellyfinMediaSource {
Path: string;
Type: string;
VideoType: string;
Container?: string;
MediaStreams: JellyfinMediaStream[];
}

Expand Down
67 changes: 32 additions & 35 deletions server/lib/scanners/jellyfin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class JellyfinScanner {
(MediaStream) => MediaStream.Type === 'Video'
).some((MediaStream) => {
return (MediaStream.Width ?? 0) <= 2000;
});
}) || (MediaSource.Container && MediaSource.Container === "strm");
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
});

await this.asyncLock.dispatch(newMedia.tmdbId, async () => {
Expand Down Expand Up @@ -325,18 +325,18 @@ class JellyfinScanner {
// and then not modifying the status if there are 0 items
existingSeason.status =
totalStandard >= season.episode_count ||
existingSeason.status === MediaStatus.AVAILABLE
existingSeason.status === MediaStatus.AVAILABLE
? MediaStatus.AVAILABLE
: totalStandard > 0
? MediaStatus.PARTIALLY_AVAILABLE
: existingSeason.status;
? MediaStatus.PARTIALLY_AVAILABLE
: existingSeason.status;
existingSeason.status4k =
(this.enable4kShow && total4k >= season.episode_count) ||
existingSeason.status4k === MediaStatus.AVAILABLE
existingSeason.status4k === MediaStatus.AVAILABLE
? MediaStatus.AVAILABLE
: this.enable4kShow && total4k > 0
? MediaStatus.PARTIALLY_AVAILABLE
: existingSeason.status4k;
? MediaStatus.PARTIALLY_AVAILABLE
: existingSeason.status4k;
} else {
newSeasons.push(
new Season({
Expand All @@ -347,14 +347,14 @@ class JellyfinScanner {
totalStandard >= season.episode_count
? MediaStatus.AVAILABLE
: totalStandard > 0
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
status4k:
this.enable4kShow && total4k >= season.episode_count
? MediaStatus.AVAILABLE
: this.enable4kShow && total4k > 0
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
})
);
}
Expand All @@ -370,18 +370,18 @@ class JellyfinScanner {
newSeasons.filter(
(season) => season.status === MediaStatus.AVAILABLE
).length +
(media?.seasons.filter(
(season) => season.status === MediaStatus.AVAILABLE
).length ?? 0) >=
(media?.seasons.filter(
(season) => season.status === MediaStatus.AVAILABLE
).length ?? 0) >=
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
filteredSeasons.length;

const isAll4kSeasons =
newSeasons.filter(
(season) => season.status4k === MediaStatus.AVAILABLE
).length +
(media?.seasons.filter(
(season) => season.status4k === MediaStatus.AVAILABLE
).length ?? 0) >=
(media?.seasons.filter(
(season) => season.status4k === MediaStatus.AVAILABLE
).length ?? 0) >=
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
filteredSeasons.length;

if (media) {
Expand All @@ -404,8 +404,7 @@ class JellyfinScanner {
// the lastSeasonChange field so we can trigger notifications
if (newStandardSeasonAvailable > currentStandardSeasonAvailable) {
this.log(
`Detected ${
newStandardSeasonAvailable - currentStandardSeasonAvailable
`Detected ${newStandardSeasonAvailable - currentStandardSeasonAvailable
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
} new standard season(s) for ${tvShow.name}`,
'debug'
);
Expand All @@ -415,8 +414,7 @@ class JellyfinScanner {

if (new4kSeasonAvailable > current4kSeasonAvailable) {
this.log(
`Detected ${
new4kSeasonAvailable - current4kSeasonAvailable
`Detected ${new4kSeasonAvailable - current4kSeasonAvailable
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
} new 4K season(s) for ${tvShow.name}`,
'debug'
);
Expand Down Expand Up @@ -444,19 +442,19 @@ class JellyfinScanner {
isAllStandardSeasons || shouldStayAvailable
? MediaStatus.AVAILABLE
: media.seasons.some(
(season) => season.status !== MediaStatus.UNKNOWN
)
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN;
(season) => season.status !== MediaStatus.UNKNOWN
)
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN;
media.status4k =
(isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
? MediaStatus.AVAILABLE
: this.enable4kShow &&
media.seasons.some(
(season) => season.status4k !== MediaStatus.UNKNOWN
)
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN;
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN;
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
await mediaRepository.save(media);
this.log(`Updating existing title: ${tvShow.name}`);
} else {
Expand All @@ -472,19 +470,19 @@ class JellyfinScanner {
status: isAllStandardSeasons
? MediaStatus.AVAILABLE
: newSeasons.some(
(season) => season.status !== MediaStatus.UNKNOWN
)
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
(season) => season.status !== MediaStatus.UNKNOWN
)
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
status4k:
isAll4kSeasons && this.enable4kShow
? MediaStatus.AVAILABLE
: this.enable4kShow &&
newSeasons.some(
(season) => season.status4k !== MediaStatus.UNKNOWN
)
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
? MediaStatus.PARTIALLY_AVAILABLE
: MediaStatus.UNKNOWN,
});
await mediaRepository.save(newMedia);
this.log(`Saved ${tvShow.name}`);
Expand All @@ -495,8 +493,7 @@ class JellyfinScanner {
}
} catch (e) {
this.log(
`Failed to process Jellyfin item. Id: ${
jellyfinitem.SeriesId ?? jellyfinitem.SeasonId ?? jellyfinitem.Id
`Failed to process Jellyfin item. Id: ${jellyfinitem.SeriesId ?? jellyfinitem.SeasonId ?? jellyfinitem.Id
alanmilinovic marked this conversation as resolved.
Show resolved Hide resolved
}`,
'error',
{
Expand Down
Loading