Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1872a744a7 | ||
|
|
83441a3c4f | ||
|
|
49ad41c3f6 | ||
|
|
984a41b180 | ||
|
|
c8421d12b0 | ||
|
|
b5d38629d2 | ||
|
|
8f4adece49 | ||
|
|
cfebccc289 | ||
|
|
2613fd7acf | ||
|
|
bb10b9c15e | ||
|
|
a9ad8d65e4 | ||
|
|
e7232da38b | ||
|
|
53bd1d23c7 | ||
|
|
5643ebfd28 | ||
|
|
bed2fbaa76 | ||
|
|
05f64bc3d7 | ||
|
|
277433581c | ||
|
|
44f0b1cb38 | ||
|
|
d31dcbabdc | ||
|
|
4ed6509505 | ||
|
|
6427b8422a | ||
|
|
ebfbe1d563 | ||
|
|
67e5d8e4d2 |
40
.github/workflows/release_automation.yml
vendored
40
.github/workflows/release_automation.yml
vendored
@@ -24,6 +24,8 @@ jobs:
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
fetch-depth: 0
|
||||
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v5
|
||||
@@ -94,6 +96,40 @@ jobs:
|
||||
commit_message: "Update manifest.json for release v${{ env.VERSION }} [skip ci]"
|
||||
file_pattern: manifest.json
|
||||
|
||||
- name: Generate Commit Log
|
||||
if: success()
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Generating commit log since last tag..."
|
||||
|
||||
# Get the previous tag
|
||||
PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
|
||||
|
||||
if [ -z "$PREV_TAG" ]; then
|
||||
echo "No previous tag found. Getting all commits."
|
||||
start_range=""
|
||||
else
|
||||
echo "Previous tag: $PREV_TAG"
|
||||
start_range="$PREV_TAG.."
|
||||
fi
|
||||
|
||||
echo "### What's Changed" > commit_log.md
|
||||
echo "" >> commit_log.md
|
||||
git log --pretty=format:"- %s (%h) by @%an" $start_range >> commit_log.md
|
||||
|
||||
# Combine Changelog from manifest (if exists) and commit log
|
||||
if [ -n "${{ env.CHANGELOG }}" ]; then
|
||||
echo "${{ env.CHANGELOG }}" > release_body.txt
|
||||
echo "" >> release_body.txt
|
||||
echo "" >> release_body.txt
|
||||
cat commit_log.md >> release_body.txt
|
||||
else
|
||||
cat commit_log.md > release_body.txt
|
||||
fi
|
||||
|
||||
# Debug output
|
||||
cat release_body.txt
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
@@ -103,7 +139,9 @@ jobs:
|
||||
files: ${{ env.ZIP_PATH }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
generate_release_notes: true
|
||||
generate_release_notes: false
|
||||
body_path: release_body.txt
|
||||
|
||||
|
||||
# Update Message in Remote Repository
|
||||
- name: Checkout Central Manifest Repo
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<a is="emby-linkbutton" class="raised raised-mini emby-button" style="margin-left: 2em;"
|
||||
target="_blank" href="https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced">
|
||||
<i class="md-icon button-icon button-icon-left secondaryText"></i>
|
||||
<span>Help</span>
|
||||
<span>${Help}</span>
|
||||
</a>
|
||||
</div>
|
||||
<hr style="max-width: 800px; margin: 1em 0;">
|
||||
@@ -109,20 +109,25 @@
|
||||
<div class="inputContainer">
|
||||
<label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Media/Collection/Playlist
|
||||
IDs
|
||||
(Comma or Newline separated)</label>
|
||||
(Newline or Comma separated)</label>
|
||||
<textarea is="emby-textarea" id="CustomMediaIds" name="CustomMediaIds"
|
||||
style="width: 100%; height: 150px; font-family: monospace;"></textarea>
|
||||
<div class="fieldDescription" id="customMediaIdsDesc">Enter the IDs of the items you want to
|
||||
show in the slideshow.
|
||||
You can separate them by comma or new line.
|
||||
<div class="fieldDescription" id="customMediaIdsDesc">Enter the IDs of the items you want to show in the slideshow.
|
||||
You can separate them by new line or comma.
|
||||
<br>
|
||||
<b>Manual Trailer Override:</b> You can specify a YouTube URL for an item by adding it in
|
||||
brackets: <code>ID [https://youtu.be/...]</code>
|
||||
<br>
|
||||
You can also add a description after the ID using any separator like space, pipe
|
||||
(|) or dash (-) (e.g. <code>ID | Description</code>).
|
||||
Note: The separator MUST NOT be a hex character (0-9, a-f).</div>
|
||||
<b>Note:</b> If using a <b>Collection Name</b> (instead of an ID) combined with a description, you <b>MUST</b> use
|
||||
the pipe (|) separator.</div>
|
||||
<b>Note:</b> The separator MUST NOT be a hex character (0-9, a-f).</div>
|
||||
<div class="fieldDescription" id="seasonalMediaIdsDesc" style="display: none;">
|
||||
<b>Seasonal Mode Enabled:</b> Define lines with date ranges (Format: DD.MM-DD.MM |
|
||||
<i>name</i> | <i>IDs</i>).<br>
|
||||
Example:<br>
|
||||
<code>20.10-31.10 | Halloween | ID1, ID2</code><br>
|
||||
<code>20.10-31.10 | Halloween | ID1, ID2 [https://youtu.be/...]</code><br>
|
||||
<code>01.12-26.12 | Christmas | ID3, ID4</code><br>
|
||||
<i>Only lines matching the current date will be used. If no line matches, it will try to
|
||||
fetch the list.txt or use random items.</i>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
||||
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
||||
<Authors>CodeDevMLH</Authors>
|
||||
<Version>1.2.2.0</Version>
|
||||
<Version>1.3.0.0</Version>
|
||||
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Jellyfin Slideshow by M0RPH3US v3.0.8
|
||||
* Jellyfin Slideshow by M0RPH3US v3.0.9
|
||||
* Modified by CodeDevMLH v1.1.0.0
|
||||
*
|
||||
* New features:
|
||||
@@ -790,6 +790,41 @@
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
|
||||
@media (max-width: 400px) {
|
||||
.button-container {
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.play-button,
|
||||
.trailer-button {
|
||||
padding: 8px 14px;
|
||||
}
|
||||
|
||||
.misc-info {
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 0px 10px;
|
||||
}
|
||||
|
||||
.runTime {
|
||||
width: 100%;
|
||||
justify-content: center;
|
||||
margin-top: 0.5vh;
|
||||
}
|
||||
|
||||
.misc-info .separator-icon:last-of-type {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.genre {
|
||||
top: calc(50% + 16vh);
|
||||
}
|
||||
|
||||
.button-container {
|
||||
top: calc(50% + 27vh);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*Landscape Mode Phones*/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Jellyfin Slideshow by M0RPH3US v3.0.8
|
||||
* Jellyfin Slideshow by M0RPH3US v3.0.9
|
||||
* Modified by CodeDevMLH v1.1.0.0
|
||||
*
|
||||
* New features:
|
||||
@@ -78,6 +78,7 @@ const STATE = {
|
||||
videoPlayers: {},
|
||||
sponsorBlockInterval: null,
|
||||
isMuted: CONFIG.startMuted,
|
||||
customTrailerUrls: {},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -344,6 +345,7 @@ const resetSlideshowState = () => {
|
||||
STATE.slideshow.itemIds = [];
|
||||
STATE.slideshow.loadedItems = {};
|
||||
STATE.slideshow.createdSlides = {};
|
||||
STATE.slideshow.customTrailerUrls = {};
|
||||
STATE.slideshow.totalItems = 0;
|
||||
STATE.slideshow.isLoading = false;
|
||||
};
|
||||
@@ -843,29 +845,64 @@ const LocalizationUtils = {
|
||||
throw new Error(`Failed to fetch translations: ${response.statusText}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* @example
|
||||
* Standard version
|
||||
* ```js
|
||||
* "use strict";
|
||||
* (self.webpackChunk = self.webpackChunk || []).push([[62634], {
|
||||
* 30985: function(e) {
|
||||
* e.exports = JSON.parse('{"Absolute":"..."}')
|
||||
* }
|
||||
* }]);
|
||||
* ```
|
||||
*
|
||||
* Minified version
|
||||
* ```js
|
||||
* "use strict";(self.webpackChunk=self.webpackChunk||[]).push([[24072],{60715:function(e){e.exports=JSON.parse('{"Absolute":"..."}')}}]);
|
||||
* ```
|
||||
*/
|
||||
const chunkText = await response.text();
|
||||
|
||||
const replaceEscaped = (text) =>
|
||||
text.replace(/\\"/g, '"').replace(/\\n/g, '\n').replace(/\\\\/g, '\\').replace(/\\'/g, "'");
|
||||
|
||||
// 1. Try to remove start and end wrappers first
|
||||
try {
|
||||
// Matches from start of file to the beginning of JSON.parse('
|
||||
const START = /^(.*)JSON\.parse\(['"]/gms;
|
||||
// Matches from the end of the JSON string to the end of the file
|
||||
const END = /['"]?\)?\s*}?(\r\n|\r|\n)?}?]?\)?;(\r\n|\r|\n)?$/gms;
|
||||
|
||||
const jsonString = replaceEscaped(chunkText.replace(START, '').replace(END, ''));
|
||||
this.translations[locale] = JSON.parse(jsonString);
|
||||
return;
|
||||
} catch (e) {
|
||||
console.error('Failed to parse JSON from standard extraction.');
|
||||
// Try alternative extraction below
|
||||
}
|
||||
|
||||
// 2. Try to extract only the JSON string directly
|
||||
let jsonMatch = chunkText.match(/JSON\.parse\(['"](.*?)['"]\)/);
|
||||
if (jsonMatch) {
|
||||
let jsonString = jsonMatch[1]
|
||||
.replace(/\\"/g, '"')
|
||||
.replace(/\\n/g, '\n')
|
||||
.replace(/\\\\/g, '\\')
|
||||
.replace(/\\'/g, "'");
|
||||
try {
|
||||
const jsonString = replaceEscaped(jsonMatch[1]);
|
||||
this.translations[locale] = JSON.parse(jsonString);
|
||||
return;
|
||||
} catch (e) {
|
||||
console.error('Failed to parse JSON from direct extraction.');
|
||||
// Try direct extraction
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Fallback: extract everything between the first { and the last }
|
||||
const jsonStart = chunkText.indexOf('{');
|
||||
const jsonEnd = chunkText.lastIndexOf('}') + 1;
|
||||
if (jsonStart !== -1 && jsonEnd > jsonStart) {
|
||||
const jsonString = chunkText.substring(jsonStart, jsonEnd);
|
||||
try {
|
||||
this.translations[locale] = JSON.parse(jsonString);
|
||||
return;
|
||||
} catch (e) {
|
||||
console.error("Failed to parse JSON from chunk:", e);
|
||||
}
|
||||
@@ -1394,7 +1431,11 @@ const SlideCreator = {
|
||||
let trailerUrl = null;
|
||||
|
||||
// 1. Check for Remote Trailers (YouTube)
|
||||
if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
||||
// Priority: Custom Config URL > Metadata RemoteTrailer
|
||||
if (STATE.slideshow.customTrailerUrls && STATE.slideshow.customTrailerUrls[itemId]) {
|
||||
trailerUrl = STATE.slideshow.customTrailerUrls[itemId];
|
||||
console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
|
||||
} else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
||||
trailerUrl = item.RemoteTrailers[0].Url;
|
||||
}
|
||||
|
||||
@@ -2540,10 +2581,25 @@ const SlideshowManager = {
|
||||
*/
|
||||
parseCustomIds() {
|
||||
if (!CONFIG.enableSeasonalContent) {
|
||||
return CONFIG.customMediaIds
|
||||
.split(/[\n,]/) // Split by comma or newline
|
||||
.map((id) => id.trim()) // Remove whitespace
|
||||
.filter((id) => id); // Remove empty strings
|
||||
return CONFIG.customMediaIds
|
||||
.split(/[\n,]/).map((line) => {
|
||||
const urlMatch = line.match(/\[(.*?)\]/);
|
||||
let id = line;
|
||||
if (urlMatch) {
|
||||
const url = urlMatch[1];
|
||||
id = line.replace(/\[.*?\]/, '').trim();
|
||||
const guidMatch = id.match(/([0-9a-f]{32})/i);
|
||||
if (guidMatch) {
|
||||
id = guidMatch[1];
|
||||
} else {
|
||||
id = id.split('|')[0].trim();
|
||||
}
|
||||
STATE.slideshow.customTrailerUrls[id] = url;
|
||||
}
|
||||
return id.trim();
|
||||
})
|
||||
.map((id) => id.trim())
|
||||
.filter((id) => id);
|
||||
} else {
|
||||
return this.parseSeasonalIds();
|
||||
}
|
||||
@@ -2600,7 +2656,22 @@ const SlideshowManager = {
|
||||
|
||||
if (isInRange) {
|
||||
console.log(`Seasonal match found: ${line}`);
|
||||
const ids = idsPart.split(/[,]/).map(id => id.trim()).filter(id => id);
|
||||
const ids = idsPart.split(/[,]/).map(line => {
|
||||
const urlMatch = line.match(/\[(.*?)\]/);
|
||||
let id = line;
|
||||
if (urlMatch) {
|
||||
const url = urlMatch[1];
|
||||
id = line.replace(/\[.*?\]/, '').trim();
|
||||
const guidMatch = id.match(/([0-9a-f]{32})/i);
|
||||
if (guidMatch) {
|
||||
id = guidMatch[1];
|
||||
} else {
|
||||
id = id.split('|')[0].trim();
|
||||
}
|
||||
STATE.slideshow.customTrailerUrls[id] = url;
|
||||
}
|
||||
return id.trim();
|
||||
}).filter(id => id);
|
||||
rawIds.push(...ids);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,6 +144,9 @@ Configure the plugin via **Dashboard** > **Plugins** > **Media Bar Enhanced**.
|
||||
Define exactly what shows up in your bar.
|
||||
|
||||
* **Enable Custom Media IDs**: Restrict the slideshow to a specific list of IDs.
|
||||
* **Manual Trailer Override**: Add `[YouTube_URL]` after an ID to force a specific trailer.
|
||||
* Example ID: `a1b2c3d4e5... [https://www.youtube.com/watch?v=VIDEO_ID]`
|
||||
* Example Collection Name: `Halloween Collection [https://...] | My Description` (Note: Use `|` to separate description from name if using a name instead of an ID)
|
||||
* **Enable Seasonal Content Mode**: Advanced date-based scheduling.
|
||||
* Format: `DD.MM-DD.MM | Name | ID1, ID2, ID3`
|
||||
* Example: `20.10-31.10 | Halloween | <ID_OF_HALLOWEEN_COLLECTION>`
|
||||
|
||||
@@ -8,6 +8,22 @@
|
||||
"category": "General",
|
||||
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
||||
"versions": [
|
||||
{
|
||||
"version": "1.3.0.0",
|
||||
"changelog": "- feat: Enhance custom media ID functionality with manual trailer override support",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.3.0.0/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||
"checksum": "83c26ba8f7ad6e1a7fe73c7190f532f3",
|
||||
"timestamp": "2026-02-04T00:07:15Z"
|
||||
},
|
||||
{
|
||||
"version": "1.2.3.7",
|
||||
"changelog": "- Fixes the issue where buttons were cut off on smaller screens such as on S24/S25.\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 3.0.9 from original repo",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.2.3.7/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||
"checksum": "fa1bf48cff159cc7dbf0aab48511a37c",
|
||||
"timestamp": "2026-01-28T22:39:54Z"
|
||||
},
|
||||
{
|
||||
"version": "1.2.2.0",
|
||||
"changelog": "- Fixes issues with persistent slides-container visibility",
|
||||
|
||||
Reference in New Issue
Block a user