Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5d4800ef1 | ||
|
|
b910e92364 | ||
|
|
82283b1faf | ||
|
|
1588b1a6b2 | ||
|
|
de19466341 | ||
|
|
15054e314c | ||
|
|
3877f96b09 | ||
|
|
abca7cb3b6 | ||
|
|
998a0cfc68 |
@@ -21,6 +21,7 @@ namespace Jellyfin.Plugin.MediaBarEnhanced.Configuration
|
|||||||
public bool SlideAnimationEnabled { get; set; } = true;
|
public bool SlideAnimationEnabled { get; set; } = true;
|
||||||
public bool EnableVideoBackdrop { get; set; } = true;
|
public bool EnableVideoBackdrop { get; set; } = true;
|
||||||
public bool UseSponsorBlock { get; set; } = true;
|
public bool UseSponsorBlock { get; set; } = true;
|
||||||
|
public bool PreferLocalTrailers { get; set; } = false;
|
||||||
public bool WaitForTrailerToEnd { get; set; } = true;
|
public bool WaitForTrailerToEnd { get; set; } = true;
|
||||||
public bool StartMuted { get; set; } = true;
|
public bool StartMuted { get; set; } = true;
|
||||||
public bool FullWidthVideo { get; set; } = true;
|
public bool FullWidthVideo { get; set; } = true;
|
||||||
|
|||||||
@@ -57,6 +57,14 @@
|
|||||||
<div class="fieldDescription">Show trailers as background if available.<br>Adds a
|
<div class="fieldDescription">Show trailers as background if available.<br>Adds a
|
||||||
mute/unmute and pause/play button to control the video in the right top corner.</div>
|
mute/unmute and pause/play button to control the video in the right top corner.</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="checkboxContainer checkboxContainer-withDescription" id="PreferLocalTrailersContainer">
|
||||||
|
<label>
|
||||||
|
<input is="emby-checkbox" type="checkbox" id="PreferLocalTrailers"
|
||||||
|
name="PreferLocalTrailers" />
|
||||||
|
<span>Prefer Local Trailers</span>
|
||||||
|
</label>
|
||||||
|
<div class="fieldDescription">If enabled, local trailers will be preferred over remote (YouTube) trailers.</div>
|
||||||
|
</div>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
<input is="emby-checkbox" type="checkbox" id="WaitForTrailerToEnd"
|
<input is="emby-checkbox" type="checkbox" id="WaitForTrailerToEnd"
|
||||||
@@ -281,7 +289,8 @@
|
|||||||
<option value="Random">Random</option>
|
<option value="Random">Random</option>
|
||||||
<option value="Original">Original (Custom List Order)</option>
|
<option value="Original">Original (Custom List Order)</option>
|
||||||
<option value="PremiereDate">Premiere Date</option>
|
<option value="PremiereDate">Premiere Date</option>
|
||||||
<option value="DateCreated">Date Created</option>
|
<option value="ProductionYear">Production Year</option>
|
||||||
|
<option value="CriticRating">Critic Rating</option>
|
||||||
<option value="CommunityRating">Community Rating</option>
|
<option value="CommunityRating">Community Rating</option>
|
||||||
<option value="Name">Name</option>
|
<option value="Name">Name</option>
|
||||||
<option value="Runtime">Runtime</option>
|
<option value="Runtime">Runtime</option>
|
||||||
@@ -396,7 +405,8 @@
|
|||||||
'WaitForTrailerToEnd', 'StartMuted', 'FullWidthVideo', 'EnableMobileVideo',
|
'WaitForTrailerToEnd', 'StartMuted', 'FullWidthVideo', 'EnableMobileVideo',
|
||||||
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
|
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
|
||||||
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
||||||
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder'
|
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
||||||
|
'PreferLocalTrailers'
|
||||||
];
|
];
|
||||||
|
|
||||||
keys.forEach(function (key) {
|
keys.forEach(function (key) {
|
||||||
@@ -430,6 +440,23 @@
|
|||||||
updateDesc();
|
updateDesc();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle Prefer Local Trailers visibility
|
||||||
|
var enableVideoBackdropCheckbox = page.querySelector('#EnableVideoBackdrop');
|
||||||
|
var preferLocalContainer = page.querySelector('#PreferLocalTrailersContainer');
|
||||||
|
|
||||||
|
function updatePreferLocalVisibility() {
|
||||||
|
if (enableVideoBackdropCheckbox && enableVideoBackdropCheckbox.checked) {
|
||||||
|
if (preferLocalContainer) preferLocalContainer.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
if (preferLocalContainer) preferLocalContainer.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enableVideoBackdropCheckbox) {
|
||||||
|
enableVideoBackdropCheckbox.addEventListener('change', updatePreferLocalVisibility);
|
||||||
|
updatePreferLocalVisibility();
|
||||||
|
}
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -445,7 +472,8 @@
|
|||||||
'WaitForTrailerToEnd', 'StartMuted', 'FullWidthVideo', 'EnableMobileVideo',
|
'WaitForTrailerToEnd', 'StartMuted', 'FullWidthVideo', 'EnableMobileVideo',
|
||||||
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
|
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
|
||||||
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
||||||
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder'
|
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
||||||
|
'PreferLocalTrailers'
|
||||||
];
|
];
|
||||||
|
|
||||||
keys.forEach(function (key) {
|
keys.forEach(function (key) {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
||||||
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
||||||
<Authors>CodeDevMLH</Authors>
|
<Authors>CodeDevMLH</Authors>
|
||||||
<Version>1.5.0.6</Version>
|
<Version>1.5.0.7</Version>
|
||||||
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ const CONFIG = {
|
|||||||
slideAnimationEnabled: true,
|
slideAnimationEnabled: true,
|
||||||
enableVideoBackdrop: true,
|
enableVideoBackdrop: true,
|
||||||
useSponsorBlock: true,
|
useSponsorBlock: true,
|
||||||
|
preferLocalTrailers: false,
|
||||||
waitForTrailerToEnd: true,
|
waitForTrailerToEnd: true,
|
||||||
startMuted: true,
|
startMuted: true,
|
||||||
fullWidthVideo: true,
|
fullWidthVideo: true,
|
||||||
@@ -484,14 +485,18 @@ const SlideUtils = {
|
|||||||
let valA, valB;
|
let valA, valB;
|
||||||
|
|
||||||
switch (sortBy) {
|
switch (sortBy) {
|
||||||
case 'DateCreated':
|
|
||||||
valA = new Date(a.DateCreated).getTime();
|
|
||||||
valB = new Date(b.DateCreated).getTime();
|
|
||||||
break;
|
|
||||||
case 'PremiereDate':
|
case 'PremiereDate':
|
||||||
valA = new Date(a.PremiereDate).getTime();
|
valA = new Date(a.PremiereDate).getTime();
|
||||||
valB = new Date(b.PremiereDate).getTime();
|
valB = new Date(b.PremiereDate).getTime();
|
||||||
break;
|
break;
|
||||||
|
case 'ProductionYear':
|
||||||
|
valA = a.ProductionYear || 0;
|
||||||
|
valB = b.ProductionYear || 0;
|
||||||
|
break;
|
||||||
|
case 'CriticRating':
|
||||||
|
valA = a.CriticRating || 0;
|
||||||
|
valB = b.CriticRating || 0;
|
||||||
|
break;
|
||||||
case 'CommunityRating':
|
case 'CommunityRating':
|
||||||
valA = a.CommunityRating || 0;
|
valA = a.CommunityRating || 0;
|
||||||
valB = b.CommunityRating || 0;
|
valB = b.CommunityRating || 0;
|
||||||
@@ -1019,7 +1024,7 @@ const ApiUtils = {
|
|||||||
|
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
// `${STATE.jellyfinData.serverAddress}/Items/${itemId}`,
|
// `${STATE.jellyfinData.serverAddress}/Items/${itemId}`,
|
||||||
`${STATE.jellyfinData.serverAddress}/Items/${itemId}?Fields=Overview,RemoteTrailers,Genres,CommunityRating,CriticRating,OfficialRating,PremiereDate,ProductionYear,MediaSources,RunTimeTicks`,
|
`${STATE.jellyfinData.serverAddress}/Items/${itemId}?Fields=Overview,RemoteTrailers,Genres,CommunityRating,CriticRating,OfficialRating,PremiereDate,ProductionYear,MediaSources,RunTimeTicks,LocalTrailerCount`,
|
||||||
{
|
{
|
||||||
headers: this.getAuthHeaders(),
|
headers: this.getAuthHeaders(),
|
||||||
}
|
}
|
||||||
@@ -1319,6 +1324,39 @@ const ApiUtils = {
|
|||||||
console.error(`Error fetching collection items for ${collectionId}:`, error);
|
console.error(`Error fetching collection items for ${collectionId}:`, error);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetches the first local trailer for an item
|
||||||
|
* @param {string} itemId - Item ID
|
||||||
|
* @returns {Promise<string|null>} Stream URL or null
|
||||||
|
*/
|
||||||
|
async fetchLocalTrailer(itemId) {
|
||||||
|
try {
|
||||||
|
const response = await fetch(
|
||||||
|
`${STATE.jellyfinData.serverAddress}/Users/${STATE.jellyfinData.userId}/Items/${itemId}/LocalTrailers`,
|
||||||
|
{
|
||||||
|
headers: this.getAuthHeaders(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const trailers = await response.json();
|
||||||
|
if (trailers && trailers.length > 0) {
|
||||||
|
const trailer = trailers[0];
|
||||||
|
const mediaSourceId = trailer.MediaSources && trailer.MediaSources[0] ? trailer.MediaSources[0].Id : trailer.Id;
|
||||||
|
|
||||||
|
// Construct stream URL
|
||||||
|
return `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?Static=true&mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Error fetching local trailer for ${itemId}:`, error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1501,12 +1539,21 @@ const SlideCreator = {
|
|||||||
let isVideo = false;
|
let isVideo = false;
|
||||||
let trailerUrl = null;
|
let trailerUrl = null;
|
||||||
|
|
||||||
// 1. Check for Remote Trailers (YouTube)
|
// 1. Check for Remote/Local Trailers
|
||||||
// Priority: Custom Config URL > Metadata RemoteTrailer
|
// Priority: Custom Config URL > (PreferLocal -> Local) > Metadata RemoteTrailer
|
||||||
|
|
||||||
|
// 1a. Custom URL override
|
||||||
if (STATE.slideshow.customTrailerUrls && STATE.slideshow.customTrailerUrls[itemId]) {
|
if (STATE.slideshow.customTrailerUrls && STATE.slideshow.customTrailerUrls[itemId]) {
|
||||||
trailerUrl = STATE.slideshow.customTrailerUrls[itemId];
|
trailerUrl = STATE.slideshow.customTrailerUrls[itemId];
|
||||||
console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
|
console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
|
||||||
} else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
}
|
||||||
|
// 1b. Check Local Trailer if preferred
|
||||||
|
else if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0 && item.localTrailerUrl) {
|
||||||
|
trailerUrl = item.localTrailerUrl;
|
||||||
|
console.log(`Using local trailer for ${itemId}: ${trailerUrl}`);
|
||||||
|
}
|
||||||
|
// 1c. Fallback to Remote Trailer
|
||||||
|
else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
||||||
trailerUrl = item.RemoteTrailers[0].Url;
|
trailerUrl = item.RemoteTrailers[0].Url;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2000,6 +2047,11 @@ const SlideCreator = {
|
|||||||
|
|
||||||
const item = await ApiUtils.fetchItemDetails(itemId);
|
const item = await ApiUtils.fetchItemDetails(itemId);
|
||||||
|
|
||||||
|
// Pre-fetch local trailer URL if needed
|
||||||
|
if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0) {
|
||||||
|
item.localTrailerUrl = await ApiUtils.fetchLocalTrailer(itemId);
|
||||||
|
}
|
||||||
|
|
||||||
const slideElement = this.createSlideElement(
|
const slideElement = this.createSlideElement(
|
||||||
item,
|
item,
|
||||||
item.Type === "Movie" ? "Movie" : "TV Show"
|
item.Type === "Movie" ? "Movie" : "TV Show"
|
||||||
|
|||||||
@@ -9,12 +9,12 @@
|
|||||||
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
"version": "1.5.0.6",
|
"version": "1.5.0.7",
|
||||||
"changelog": "- fix: keyboard controls in TV mode\n- Add sorting options for content in configuration\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
|
"changelog": "- fix: keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
|
||||||
"targetAbi": "10.11.0.0",
|
"targetAbi": "10.11.0.0",
|
||||||
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.6/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.7/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
"checksum": "c1c0736b06b3855523fe2eac25e6b34b",
|
"checksum": "1b89e0253e62306cf01e80c97bf94ea2",
|
||||||
"timestamp": "2026-02-09T00:31:34Z"
|
"timestamp": "2026-02-09T12:28:44Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.3.0.3",
|
"version": "1.3.0.3",
|
||||||
|
|||||||
32
test_scripts/fetch_random_item_browser_console.js
Normal file
32
test_scripts/fetch_random_item_browser_console.js
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
(async () => {
|
||||||
|
const apiClient = window.ApiClient;
|
||||||
|
if (!apiClient) { console.error("Logged in?"); return; }
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Fetch 1 random item ID
|
||||||
|
const rnd = await apiClient.getItems(apiClient.getCurrentUserId(), { SortBy: "Random", Limit: 1, Recursive: true, IncludeItemTypes: "Movie,Series" });
|
||||||
|
if (rnd.Items.length > 0) {
|
||||||
|
const id = rnd.Items[0].Id;
|
||||||
|
console.log("Random Item ID:", id);
|
||||||
|
|
||||||
|
// Fetch Default Details
|
||||||
|
const defd = await apiClient.getItem(apiClient.getCurrentUserId(), id);
|
||||||
|
console.log("Default Fields:", defd);
|
||||||
|
|
||||||
|
// Fetch ALL Known Fields manually
|
||||||
|
const allFields = "Chapters,People,MediaStreams,UserData,RecursiveItemCount,DateCreated,MediaSources,ProductionYear,Studios,Genres,Tags,RemoteTrailers,ProviderIds,Overview,CommunityRating,CriticRating,OfficialRating,PremiereDate,RunTimeTicks";
|
||||||
|
const full = await res.json();
|
||||||
|
console.log("Full Details:", full);
|
||||||
|
|
||||||
|
// Helper to download JSON
|
||||||
|
const blob = new Blob([JSON.stringify(full, null, 2)], { type: "application/json" });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const a = document.createElement("a");
|
||||||
|
a.href = url;
|
||||||
|
a.download = `jellyfin-item-${id}.json`;
|
||||||
|
a.click();
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
console.log("Downloaded JSON file.");
|
||||||
|
} else { console.warn("No items."); }
|
||||||
|
} catch (e) { console.error(e); }
|
||||||
|
})();
|
||||||
32
test_scripts/fetch_random_item_browser_console_2.js
Normal file
32
test_scripts/fetch_random_item_browser_console_2.js
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
(async () => {
|
||||||
|
// 1. Get Auth Data from the active client
|
||||||
|
const apiClient = window.ApiClient;
|
||||||
|
if (!apiClient) {
|
||||||
|
console.error("ApiClient not found. Are you logged in?");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
console.log("Fetching random item...");
|
||||||
|
|
||||||
|
// 2. Fetch 1 random item
|
||||||
|
// const result = await apiClient.getItems(apiClient.getCurrentUserId(), { SortBy: "Random", Limit: 1, Recursive: true, IncludeItemTypes: "Movie,Series" });
|
||||||
|
const result = await apiClient.getItems(apiClient.getCurrentUserId(), {
|
||||||
|
SortBy: "Random",
|
||||||
|
Limit: 1,
|
||||||
|
Recursive: true,
|
||||||
|
IncludeItemTypes: "Movie,Series", // Optional: filter types
|
||||||
|
Fields: "Overview,RemoteTrailers,Genres,CommunityRating,CriticRating,OfficialRating,PremiereDate,RunTimeTicks,ProductionYear,MediaSources" // Request ALL fields
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result.Items.length > 0) {
|
||||||
|
const item = result.Items[0];
|
||||||
|
console.log("Random Item Found:", item.Name);
|
||||||
|
console.dir(item); // Prints the full interactive object
|
||||||
|
} else {
|
||||||
|
console.warn("No items found.");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching item:", error);
|
||||||
|
}
|
||||||
|
})();
|
||||||
28
test_scripts/fetch_specific_items.js
Normal file
28
test_scripts/fetch_specific_items.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
(async () => {
|
||||||
|
const apiClient = window.ApiClient;
|
||||||
|
if (!apiClient) {
|
||||||
|
console.error("ApiClient nicht gefunden.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Die ID des Items, das du abrufen möchtest
|
||||||
|
const itemId = "DEINE_ITEM_ID_HIER";
|
||||||
|
const userId = apiClient.getCurrentUserId();
|
||||||
|
|
||||||
|
try {
|
||||||
|
console.log(`Rufe Details für Item ${itemId} ab...`);
|
||||||
|
|
||||||
|
// Nutze getItem() statt getItems()
|
||||||
|
// Parameter: userId, itemId
|
||||||
|
const item = await apiClient.getItem(userId, itemId);
|
||||||
|
|
||||||
|
if (item) {
|
||||||
|
console.log("Item Details gefunden:", item.Name);
|
||||||
|
console.dir(item); // Zeigt alle Metadaten (Genres, Pfade, ProviderIds, etc.)
|
||||||
|
} else {
|
||||||
|
console.warn("Item konnte nicht gefunden werden.");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Fehler beim Abrufen des Items:", error);
|
||||||
|
}
|
||||||
|
})();
|
||||||
Reference in New Issue
Block a user