@@ -1668,7 +1861,7 @@
${DISCOVERY_SECTION_DEFINITIONS.map(section => {
const sectionConfig = normalizedDiscoverySections[section.key];
const prefix = `homeScreen_discovery_sectionTypes_${section.key}`;
- const configHtml = createSectionConfiguration(prefix, sectionConfig, { includeName: true, includeOrder: true, includeSortOrder: false, defaultName: section.defaultName });
+ const configHtml = createSectionConfiguration(prefix, sectionConfig, { includeName: true, includeOrder: true, includeSortOrder: false, defaultName: section.defaultName, includeIsPlayed: true });
const extraFields = section.extras?.minimumItems !== undefined
? `
@@ -1965,6 +2158,17 @@
setupToggleVisibility('#homeScreen_watchAgain_enabled', '#homeScreen_watchAgain_container');
setupToggleVisibility('#homeScreen_discovery_enabled', '#homeScreen_discovery_container');
+ // Discovery Sections IsPlayed Toggles
+ ['recentlyReleased_movies', 'recentlyReleased_episodes', 'trending', 'popularTVNetworks', 'upcoming', 'imdbTop250'].forEach(key => {
+ setupToggleVisibility(`#homeScreen_${key}_isPlayed_enabled`, `#homeScreen_${key}_isPlayed_options`);
+ });
+
+ // Dynamic Discovery Sections IsPlayed Toggles
+ DISCOVERY_SECTION_DEFINITIONS.forEach(section => {
+ const prefix = `homeScreen_discovery_sectionTypes_${section.key}`;
+ setupToggleVisibility(`#${prefix}_isPlayed_enabled`, `#${prefix}_isPlayed_options`);
+ });
+
// Setup event listeners for section management
// Add section to seasonal season
modalInstance.dialogContent.addEventListener('click', (e) => {
@@ -2356,6 +2560,76 @@
enabledSpan.textContent = enabledCheckbox.checked ? 'Enabled' : 'Disabled';
});
}
+
+ // Setup additional options listeners
+ const additionalOptionsControls = sectionItem.querySelector(`.${prefix}_section_additionalOptions_controls[data-section-index="${sectionIndex}"]`);
+ const additionalOptionsListContainer = sectionItem.querySelector(`.${prefix}_section_additionalOptions_list_container[data-section-index="${sectionIndex}"]`);
+
+ if (additionalOptionsControls) {
+ const addBtn = additionalOptionsControls.querySelector('.add-additional-option');
+ const select = additionalOptionsControls.querySelector('.additional-option-select');
+ const list = additionalOptionsListContainer ? additionalOptionsListContainer.querySelector('.additional-options-list') : null;
+
+ if (addBtn && select && list) {
+ addBtn.addEventListener('click', () => {
+ const key = select.value;
+ if (!key) return;
+
+ const meta = SUPPORTED_CUSTOM_SECTION_PARAMS[key];
+ if (!meta) return;
+
+ const index = list.children.length;
+ const sanitizedPrefix = `${prefix}_section_${sanitizedIndex}`;
+ const inputId = `${sanitizedPrefix}_additionalOption_${Date.now()}_${index}`;
+
+ let inputField = '';
+ if (meta.type === 'boolean') {
+ inputField = buildJellyfinCheckbox(inputId, meta.default === true, meta.label, {
+ 'data-key': key,
+ 'class': 'additional-option-value',
+ 'data-type': 'boolean'
+ });
+ } else {
+ inputField = `
+
+ `;
+ }
+
+ const row = document.createElement('div');
+ row.className = 'additional-option-row';
+ row.style.cssText = 'display: flex; align-items: flex-end; gap: 0.5em; margin-top: 0.5em; padding: 0.5em; background: rgba(255,255,255,0.05); border-radius: 4px;';
+ row.innerHTML = `
+ ${inputField}
+
+ `;
+
+ // Add delete listener for new row
+ row.querySelector('.remove-additional-option').addEventListener('click', () => {
+ row.remove();
+ });
+
+ list.appendChild(row);
+
+ // Reset select
+ select.value = '';
+ });
+ }
+ }
+
+ // Add listeners for existing delete buttons
+ if (additionalOptionsListContainer) {
+ additionalOptionsListContainer.querySelectorAll('.remove-additional-option').forEach(btn => {
+ btn.addEventListener('click', (e) => {
+ const row = e.target.closest('.additional-option-row');
+ if (row) row.remove();
+ });
+ });
+ }
}
function deleteSection(prefix, sectionIndex, isSeasonalNested) {
@@ -4351,6 +4625,28 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
if (includeItemTypes.length === 0 && type !== 'Parent') {
includeItemTypes = ['Movie'];
}
+
+ const additionalQueryOptions = [];
+ const additionalOptionsContainer = sectionItem.querySelector(`.${prefix}_section_additionalOptions_list_container[data-section-index="${sectionIndex}"]`);
+ if (additionalOptionsContainer) {
+ const optionRows = additionalOptionsContainer.querySelectorAll('.additional-options-list .additional-option-row');
+ optionRows.forEach(row => {
+ const input = row.querySelector('.additional-option-value');
+ if (input) {
+ const key = input.getAttribute('data-key');
+ const type = input.getAttribute('data-type');
+ let value;
+ if (type === 'boolean') {
+ value = input.checked;
+ } else {
+ value = input.value;
+ }
+ if (key) {
+ additionalQueryOptions.push({ key, value });
+ }
+ }
+ });
+ }
return {
id: sectionIdAttr,
@@ -4366,7 +4662,8 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
spotlight: spotlight,
discoveryEnabled: discoveryEnabled,
searchTerm: searchTerm,
- includeItemTypes: includeItemTypes
+ includeItemTypes: includeItemTypes,
+ additionalQueryOptions: additionalQueryOptions
};
}
@@ -4377,8 +4674,6 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
}
const userId = apiClient.getCurrentUserId();
- const serverAddress = apiClient.serverAddress();
- const token = apiClient.accessToken();
const type = sectionConfig.type || 'Genre';
const searchTerm = sectionConfig.searchTerm?.trim() || '';
const includeItemTypes = Array.isArray(sectionConfig.includeItemTypes) && sectionConfig.includeItemTypes.length > 0
@@ -4389,8 +4684,20 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
const itemLimit = parseInt(sectionConfig.itemLimit, 10) || 16;
const sources = (sectionConfig.source || '').split(',').map(s => s.trim()).filter(Boolean);
const fields = 'PrimaryImageAspectRatio,DateCreated,Overview,ProductionYear,ImageTags,BackdropImageTags,ParentBackdropImageTags,ParentThumbImageTag,SeriesPrimaryImageTag';
- const headers = { 'Authorization': `MediaBrowser Token="${token}"` };
+ // Parse additional query options
+ const additionalOptions = {};
+ if (Array.isArray(sectionConfig.additionalQueryOptions)) {
+ sectionConfig.additionalQueryOptions.forEach(option => {
+ if (option && option.key) {
+ let value = option.value;
+ if (value === 'true' || value === true) value = true;
+ else if (value === 'false' || value === false) value = false;
+ additionalOptions[option.key] = value;
+ }
+ });
+ }
+
const dedupeAndLimit = (items = []) => {
let working = Array.isArray(items) ? [...items] : [];
if (sortOrder === 'Random') {
@@ -4409,42 +4716,42 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
return limited;
};
- const fetchJson = async (url) => {
- const response = await fetch(url, { headers });
- if (!response.ok) {
- throw new Error(`HTTP ${response.status}`);
- }
- return response.json();
- };
-
try {
+ const queryBase = {
+ IncludeItemTypes: includeItemTypes,
+ Recursive: true,
+ Fields: fields,
+ SortBy: sortOrder,
+ SortOrder: sortOrderDirection,
+ ...additionalOptions
+ };
+
if (type === 'Genre' || type === 'Tag') {
if (sources.length === 0) {
return [];
}
const paramName = type === 'Genre' ? 'Genres' : 'Tags';
- const valueParam = sources.map(s => encodeURIComponent(s)).join('|');
- const url = `${serverAddress}/Items?userId=${userId}&${paramName}=${valueParam}` +
- `&IncludeItemTypes=${encodeURIComponent(includeItemTypes)}` +
- `&Recursive=true&Fields=${encodeURIComponent(fields)}` +
- `&Limit=${itemLimit}&SortBy=${encodeURIComponent(sortOrder)}&SortOrder=${encodeURIComponent(sortOrderDirection)}` +
- (searchTerm ? `&SearchTerm=${encodeURIComponent(searchTerm)}` : '');
- const data = await fetchJson(url);
- return dedupeAndLimit(data.Items || []);
+ // Genres use pipe delimiter usually, tags comma?
+ // homeScreen.js uses pipe for Genres, comma for Tags.
+ // apiClient handles array/string? usually string.
+ const delimiter = type === 'Genre' ? '|' : ',';
+ const valueParam = sources.join(delimiter);
+
+ const params = {
+ ...queryBase,
+ [paramName]: valueParam,
+ Limit: itemLimit
+ };
+ if (searchTerm) params.SearchTerm = searchTerm;
+
+ const response = await apiClient.getItems(userId, params);
+ return dedupeAndLimit(response.Items || []);
}
if (type === 'Collection' || type === 'Playlist' || type === 'Parent') {
const existingIds = new Set();
let collected = [];
- const queryBase = {
- IncludeItemTypes: includeItemTypes,
- Recursive: true,
- Fields: fields,
- SortBy: sortOrder,
- SortOrder: sortOrderDirection
- };
-
const runQuery = async (params) => {
const response = await apiClient.getItems(userId, params);
if (response?.Items?.length) {
@@ -4562,6 +4869,17 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
config.order = parseInt(document.getElementById(`${prefix}_order`)?.value || '100', 10);
}
+ // Check for IsPlayed configuration
+ const isPlayedEnabledCheckbox = document.getElementById(`${prefix}_isPlayed_enabled`);
+ if (isPlayedEnabledCheckbox) {
+ if (isPlayedEnabledCheckbox.checked) {
+ const isPlayedValueSelect = document.getElementById(`${prefix}_isPlayed_value`);
+ config.isPlayed = isPlayedValueSelect?.value === 'true';
+ } else {
+ config.isPlayed = null;
+ }
+ }
+
return config;
}
@@ -4683,6 +5001,7 @@ window.KefinTweaksConfig = ${JSON.stringify(config, null, 2)};`;
minPeopleAppearances: parseInt(document.getElementById('homeScreen_discovery_minPeopleAppearances')?.value || '10'),
minGenreMovieCount: parseInt(document.getElementById('homeScreen_discovery_minGenreMovieCount')?.value || '50'),
spotlightDiscoveryChance: parseFloat(document.getElementById('homeScreen_discovery_spotlightDiscoveryChance')?.value || '0.5'),
+ renderSpotlightAboveMatching: document.getElementById('homeScreen_discovery_renderSpotlightAboveMatching')?.checked === true,
defaultItemLimit: parseInt(document.getElementById('homeScreen_discovery_itemLimit')?.value || '16'),
defaultSortOrder: document.getElementById('homeScreen_discovery_sortOrder')?.value || 'Random',
defaultCardFormat: document.getElementById('homeScreen_discovery_cardFormat')?.value || 'Poster',
diff --git a/scripts/homeScreen.js b/scripts/homeScreen.js
index 4f284e2..0142c79 100644
--- a/scripts/homeScreen.js
+++ b/scripts/homeScreen.js
@@ -695,6 +695,17 @@
const discoverySectionSettingsCache = {};
+ /**
+ * Helper to get IsPlayed filter string from config
+ * @param {Object} config - Section configuration object
+ * @returns {string|null} - 'IsPlayed', 'IsUnplayed', or null
+ */
+ function getIsPlayedFilter(config) {
+ if (config && config.isPlayed === true) return 'IsPlayed';
+ if (config && config.isPlayed === false) return 'IsUnplayed';
+ return null;
+ }
+
let collectionsData = null;
async function getCollectionsData() {
if (collectionsData !== null) {
@@ -795,14 +806,25 @@
function applyDiscoverySectionOrdering(items, sectionConfig) {
if (!Array.isArray(items)) return [];
+
+ // Filter by IsPlayed if configured
+ let filteredItems = items;
+ const isPlayedFilter = sectionConfig?.isPlayed;
+
+ if (isPlayedFilter === true) {
+ filteredItems = items.filter(item => item.UserData && item.UserData.Played);
+ } else if (isPlayedFilter === false) {
+ filteredItems = items.filter(item => !item.UserData || !item.UserData.Played);
+ }
+
const sortOrder = sectionConfig?.sortOrder || discoveryConfig.defaultSortOrder || defaultSortOrder;
const sortDirection = sectionConfig?.sortOrderDirection || 'Ascending';
- let sortedItems = items;
+ let sortedItems = filteredItems;
if (sortOrder === 'Random') {
- sortedItems = [...items].sort(() => Math.random() - 0.5);
+ sortedItems = [...filteredItems].sort(() => Math.random() - 0.5);
} else if (window.cardBuilder && typeof window.cardBuilder.sortItems === 'function') {
- sortedItems = window.cardBuilder.sortItems(items, sortOrder, sortDirection);
+ sortedItems = window.cardBuilder.sortItems(filteredItems, sortOrder, sortDirection);
}
const limit = parseDiscoveryNumber(
@@ -867,74 +889,6 @@
/************ Helpers ************/
- /**
- * Fetches item data from Jellyfin API to determine type
- * @param {string} itemId - The item ID to fetch
- * @returns {Promise