Compare commits
7
Commits
09808a2136
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9180da16be | ||
|
|
d3fbaef417 | ||
|
|
c02469c6d0 | ||
|
|
1b7b836b3e | ||
|
|
609a16f468 | ||
|
|
c967b062a2 | ||
|
|
a8e0dcaf37 |
@@ -19,11 +19,6 @@ jobs:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup .NET 9
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '9.0.x'
|
||||
|
||||
- name: Verify .NET installation
|
||||
run: dotnet --version
|
||||
|
||||
@@ -128,3 +123,51 @@ jobs:
|
||||
|
||||
echo "Release created successfully!"
|
||||
echo "View at: ${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/tag/${{ steps.get_version.outputs.version }}"
|
||||
|
||||
- name: Calculate checksum
|
||||
id: checksum
|
||||
run: |
|
||||
CHECKSUM=$(md5sum "${{ steps.jprm.outputs.artifact }}" | awk '{print $1}')
|
||||
echo "checksum=${CHECKSUM}" >> $GITHUB_OUTPUT
|
||||
echo "MD5 checksum: ${CHECKSUM}"
|
||||
|
||||
- name: Update manifest.json
|
||||
run: |
|
||||
VERSION="${{ steps.get_version.outputs.version_number }}"
|
||||
CHECKSUM="${{ steps.checksum.outputs.checksum }}"
|
||||
TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
|
||||
ARTIFACT_NAME="${{ steps.jprm.outputs.artifact_name }}"
|
||||
REPO_OWNER="${{ github.repository_owner }}"
|
||||
REPO_NAME="${{ github.event.repository.name }}"
|
||||
GITEA_URL="${{ github.server_url }}"
|
||||
DOWNLOAD_URL="${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/download/${{ steps.get_version.outputs.version }}/${ARTIFACT_NAME}"
|
||||
|
||||
# Create the new version entry
|
||||
NEW_VERSION=$(cat <<EOF
|
||||
{
|
||||
"version": "${VERSION}",
|
||||
"changelog": "Release ${VERSION}",
|
||||
"targetAbi": "10.10.0.0",
|
||||
"sourceUrl": "${DOWNLOAD_URL}",
|
||||
"checksum": "${CHECKSUM}",
|
||||
"timestamp": "${TIMESTAMP}"
|
||||
}
|
||||
EOF
|
||||
)
|
||||
|
||||
# Prepend new version to the versions array in manifest.json
|
||||
jq --argjson newver "${NEW_VERSION}" '.[0].versions = [$newver] + .[0].versions' manifest.json > manifest.tmp.json
|
||||
mv manifest.tmp.json manifest.json
|
||||
|
||||
echo "Updated manifest.json:"
|
||||
cat manifest.json
|
||||
|
||||
- name: Commit and push manifest
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
git config user.name "Gitea Actions"
|
||||
git config user.email "actions@gitea.tourolle.paris"
|
||||
git add manifest.json
|
||||
git commit -m "Update manifest.json for ${{ steps.get_version.outputs.version }}"
|
||||
git push origin HEAD:master
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Net.Mime;
|
||||
using System.Threading.Tasks;
|
||||
using Jellyfin.Data.Enums;
|
||||
using Jellyfin.Plugin.JellyLMS.Models;
|
||||
using Jellyfin.Plugin.JellyLMS.Services;
|
||||
using MediaBrowser.Controller.Entities;
|
||||
using MediaBrowser.Controller.Entities.Audio;
|
||||
using MediaBrowser.Controller.Library;
|
||||
using MediaBrowser.Model.Entities;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
@@ -23,6 +29,7 @@ public class JellyLmsController : ControllerBase
|
||||
private readonly ILmsApiClient _lmsClient;
|
||||
private readonly LmsPlayerManager _playerManager;
|
||||
private readonly LmsSessionManager _sessionManager;
|
||||
private readonly ILibraryManager _libraryManager;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="JellyLmsController"/> class.
|
||||
@@ -30,14 +37,17 @@ public class JellyLmsController : ControllerBase
|
||||
/// <param name="lmsClient">The LMS API client.</param>
|
||||
/// <param name="playerManager">The player manager.</param>
|
||||
/// <param name="sessionManager">The session manager.</param>
|
||||
/// <param name="libraryManager">The library manager.</param>
|
||||
public JellyLmsController(
|
||||
ILmsApiClient lmsClient,
|
||||
LmsPlayerManager playerManager,
|
||||
LmsSessionManager sessionManager)
|
||||
LmsSessionManager sessionManager,
|
||||
ILibraryManager libraryManager)
|
||||
{
|
||||
_lmsClient = lmsClient;
|
||||
_playerManager = playerManager;
|
||||
_sessionManager = sessionManager;
|
||||
_libraryManager = libraryManager;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -285,6 +295,87 @@ public class JellyLmsController : ControllerBase
|
||||
var success = await _sessionManager.SetVolumeAsync(sessionId, request.Volume).ConfigureAwait(false);
|
||||
return success ? Ok() : NotFound();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Discovers file paths used by Jellyfin's music libraries.
|
||||
/// Helps users configure path mappings for direct file access.
|
||||
/// </summary>
|
||||
/// <returns>Sample file paths from each music library.</returns>
|
||||
[HttpGet("DiscoverPaths")]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
public ActionResult<DiscoveredPathsResponse> DiscoverPaths()
|
||||
{
|
||||
var response = new DiscoveredPathsResponse();
|
||||
|
||||
// Get sample audio files from the library
|
||||
var query = new InternalItemsQuery
|
||||
{
|
||||
IncludeItemTypes = [BaseItemKind.Audio],
|
||||
Limit = 50,
|
||||
Recursive = true
|
||||
};
|
||||
|
||||
var items = _libraryManager.GetItemsResult(query).Items;
|
||||
|
||||
// Extract unique path prefixes
|
||||
var pathPrefixes = new HashSet<string>();
|
||||
|
||||
foreach (var item in items)
|
||||
{
|
||||
if (string.IsNullOrEmpty(item.Path))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Add sample paths
|
||||
if (response.SamplePaths.Count < 5)
|
||||
{
|
||||
response.SamplePaths.Add(item.Path);
|
||||
}
|
||||
|
||||
// Try to find common path prefixes
|
||||
var path = item.Path.Replace('\\', '/');
|
||||
var parts = path.Split('/');
|
||||
|
||||
// Build prefix from first few directory levels
|
||||
if (parts.Length > 2)
|
||||
{
|
||||
// Try different prefix lengths to find common ones
|
||||
for (var i = 2; i <= Math.Min(4, parts.Length - 1); i++)
|
||||
{
|
||||
var prefix = string.Join('/', parts.Take(i));
|
||||
if (!string.IsNullOrEmpty(prefix) && !prefix.Contains('.', StringComparison.Ordinal))
|
||||
{
|
||||
pathPrefixes.Add(prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort prefixes by length (shorter = more general)
|
||||
response.DetectedPrefixes = pathPrefixes
|
||||
.OrderBy(p => p.Length)
|
||||
.Take(10)
|
||||
.ToList();
|
||||
|
||||
return Ok(response);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Response containing discovered file paths from Jellyfin libraries.
|
||||
/// </summary>
|
||||
public class DiscoveredPathsResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets sample file paths from the music library.
|
||||
/// </summary>
|
||||
public List<string> SamplePaths { get; set; } = [];
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets detected common path prefixes.
|
||||
/// </summary>
|
||||
public List<string> DetectedPrefixes { get; set; } = [];
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,7 +1,24 @@
|
||||
using System.Collections.Generic;
|
||||
using MediaBrowser.Model.Plugins;
|
||||
|
||||
namespace Jellyfin.Plugin.JellyLMS.Configuration;
|
||||
|
||||
/// <summary>
|
||||
/// Represents a path mapping between Jellyfin and LMS file paths.
|
||||
/// </summary>
|
||||
public class PathMapping
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the path prefix as seen by Jellyfin.
|
||||
/// </summary>
|
||||
public string JellyfinPath { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the same path prefix as seen by LMS.
|
||||
/// </summary>
|
||||
public string LmsPath { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Plugin configuration for JellyLMS.
|
||||
/// </summary>
|
||||
@@ -62,4 +79,56 @@ public class PluginConfiguration : BasePluginConfiguration
|
||||
/// Gets or sets the Jellyfin API key for authenticating stream requests from LMS.
|
||||
/// </summary>
|
||||
public string JellyfinApiKey { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether to use direct file paths instead of HTTP streaming.
|
||||
/// When enabled, LMS accesses files directly from shared storage, enabling native seeking.
|
||||
/// </summary>
|
||||
public bool UseDirectFilePath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the media path prefix as seen by Jellyfin.
|
||||
/// Used for path mapping when UseDirectFilePath is enabled.
|
||||
/// Deprecated: Use PathMappings instead. Kept for backwards compatibility.
|
||||
/// </summary>
|
||||
public string JellyfinMediaPath { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the media path prefix as seen by LMS.
|
||||
/// Used for path mapping when UseDirectFilePath is enabled.
|
||||
/// Deprecated: Use PathMappings instead. Kept for backwards compatibility.
|
||||
/// </summary>
|
||||
public string LmsMediaPath { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the list of path mappings between Jellyfin and LMS.
|
||||
/// Each mapping allows files from different locations to be played via direct file access.
|
||||
/// </summary>
|
||||
public List<PathMapping> PathMappings { get; set; } = new();
|
||||
|
||||
/// <summary>
|
||||
/// Gets all effective path mappings, including legacy single mapping if configured.
|
||||
/// </summary>
|
||||
/// <returns>Enumerable of all configured path mappings.</returns>
|
||||
public IEnumerable<PathMapping> GetAllPathMappings()
|
||||
{
|
||||
// Return configured list mappings first
|
||||
foreach (var mapping in PathMappings)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(mapping.JellyfinPath) && !string.IsNullOrEmpty(mapping.LmsPath))
|
||||
{
|
||||
yield return mapping;
|
||||
}
|
||||
}
|
||||
|
||||
// Fall back to legacy single mapping for backwards compatibility
|
||||
if (!string.IsNullOrEmpty(JellyfinMediaPath) && !string.IsNullOrEmpty(LmsMediaPath))
|
||||
{
|
||||
yield return new PathMapping
|
||||
{
|
||||
JellyfinPath = JellyfinMediaPath,
|
||||
LmsPath = LmsMediaPath
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,64 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>JellyLMS</title>
|
||||
<style>
|
||||
.sync-group {
|
||||
border: 2px solid #00a4dc;
|
||||
border-radius: 8px;
|
||||
padding: 12px;
|
||||
margin-bottom: 12px;
|
||||
background: rgba(0, 164, 220, 0.05);
|
||||
}
|
||||
.sync-group-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.sync-group-players {
|
||||
color: #ccc;
|
||||
}
|
||||
.player-sync-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 8px 0;
|
||||
border-bottom: 1px solid #333;
|
||||
}
|
||||
.player-sync-row:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
.player-sync-checkbox {
|
||||
margin-right: 12px;
|
||||
}
|
||||
.player-sync-name {
|
||||
flex: 1;
|
||||
font-weight: 500;
|
||||
}
|
||||
.player-sync-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
color: #888;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.status-dot {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.status-dot.on { background: #52b54b; }
|
||||
.status-dot.standby { background: #f9a825; }
|
||||
.status-dot.off { background: #f44336; }
|
||||
.sync-actions {
|
||||
margin-top: 15px;
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
}
|
||||
#syncStatus {
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="JellyLmsConfigPage" data-role="page" class="page type-interior pluginConfigurationPage" data-require="emby-input,emby-button,emby-select,emby-checkbox">
|
||||
@@ -73,18 +131,6 @@
|
||||
</label>
|
||||
<div class="fieldDescription checkboxFieldDescription">Automatically sync players when playing to multiple devices</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="verticalSection">
|
||||
<h3>LMS Players</h3>
|
||||
<div id="playersList">
|
||||
<p>Click "Refresh Players" to discover LMS players.</p>
|
||||
</div>
|
||||
<div>
|
||||
<button is="emby-button" type="button" id="btnRefreshPlayers" class="raised button-alt block emby-button">
|
||||
<span>Refresh Players</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="inputContainer" style="margin-top: 15px;">
|
||||
<label class="inputLabel inputLabelUnfocused" for="DefaultPlayerMac">Default Player</label>
|
||||
@@ -96,15 +142,66 @@
|
||||
</div>
|
||||
|
||||
<div class="verticalSection">
|
||||
<h3>Player Sync Management</h3>
|
||||
<p>Manage synchronized playback groups for multi-room audio.</p>
|
||||
<div>
|
||||
<a is="emby-button" href="configurationpage?name=JellyLMS%20Sync" class="raised button-alt block emby-button" style="display: inline-block; text-decoration: none;">
|
||||
<span>Open Sync Manager</span>
|
||||
</a>
|
||||
<h3>Direct File Access (Optional)</h3>
|
||||
<p class="fieldDescription">If LMS and Jellyfin share the same storage (e.g., NAS), enable direct file access for native seeking support. This provides smooth seeking without audio restart.</p>
|
||||
|
||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||
<label class="emby-checkbox-label">
|
||||
<input id="UseDirectFilePath" name="UseDirectFilePath" type="checkbox" is="emby-checkbox" />
|
||||
<span>Enable Direct File Access</span>
|
||||
</label>
|
||||
<div class="fieldDescription checkboxFieldDescription">When enabled, LMS will access files directly instead of streaming via HTTP</div>
|
||||
</div>
|
||||
<div class="fieldDescription" style="margin-top: 10px;">
|
||||
Users can access this page directly at: <code>/web/configurationpage?name=JellyLMS%20Sync</code>
|
||||
|
||||
<div id="directPathSettings" style="margin-top: 15px;">
|
||||
<h4 style="margin-bottom: 10px;">Path Mappings</h4>
|
||||
<p class="fieldDescription">Map Jellyfin paths to LMS paths. Add multiple mappings if your music and podcasts are in different locations.</p>
|
||||
|
||||
<div style="margin-bottom: 15px;">
|
||||
<button is="emby-button" type="button" id="btnDiscoverPaths" class="raised button-alt emby-button">
|
||||
<span>Discover Jellyfin Paths</span>
|
||||
</button>
|
||||
<span id="discoverStatus" style="margin-left: 10px;"></span>
|
||||
</div>
|
||||
|
||||
<div id="discoveredPaths" style="display: none; margin-bottom: 15px; padding: 10px; background: rgba(0,0,0,0.2); border-radius: 4px;">
|
||||
<strong>Detected Jellyfin paths:</strong>
|
||||
<ul id="detectedPrefixList" style="margin: 5px 0; padding-left: 20px;"></ul>
|
||||
<div class="fieldDescription">Click a path to use it as the Jellyfin path in a new mapping</div>
|
||||
</div>
|
||||
|
||||
<div id="pathMappingsList">
|
||||
<!-- Dynamic path mappings will be added here -->
|
||||
</div>
|
||||
|
||||
<div style="margin-top: 10px;">
|
||||
<button is="emby-button" type="button" id="btnAddMapping" class="raised button-alt emby-button">
|
||||
<span>+ Add Mapping</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="verticalSection">
|
||||
<h3>Player Sync</h3>
|
||||
<p class="fieldDescription">Select players to sync together for multi-room audio. Synced players play in perfect sync.</p>
|
||||
|
||||
<div id="currentSyncGroups">
|
||||
<!-- Existing sync groups shown here -->
|
||||
</div>
|
||||
|
||||
<div id="playerSyncList">
|
||||
<p>Loading players...</p>
|
||||
</div>
|
||||
|
||||
<div class="sync-actions">
|
||||
<button is="emby-button" type="button" id="btnSyncSelected" class="raised button-submit emby-button" disabled>
|
||||
<span>Sync Selected</span>
|
||||
</button>
|
||||
<button is="emby-button" type="button" id="btnRefreshPlayers" class="raised button-alt emby-button">
|
||||
<span>Refresh</span>
|
||||
</button>
|
||||
<span id="syncStatus"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -118,45 +215,34 @@
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
var JellyLmsConfig = {
|
||||
pluginUniqueId: 'a5b8c9d0-1e2f-3a4b-5c6d-7e8f9a0b1c2d'
|
||||
pluginUniqueId: 'a5b8c9d0-1e2f-3a4b-5c6d-7e8f9a0b1c2d',
|
||||
players: [],
|
||||
syncGroups: []
|
||||
};
|
||||
|
||||
function getStatusClass(player) {
|
||||
if (!player.IsConnected) return 'off';
|
||||
return player.IsPoweredOn ? 'on' : 'standby';
|
||||
}
|
||||
|
||||
function getStatusText(player) {
|
||||
if (!player.IsConnected) return 'Disconnected';
|
||||
return player.IsPoweredOn ? 'On' : 'Standby';
|
||||
}
|
||||
|
||||
function loadPlayers() {
|
||||
var playersList = document.querySelector('#playersList');
|
||||
var defaultSelect = document.querySelector('#DefaultPlayerMac');
|
||||
var currentDefault = defaultSelect.value;
|
||||
|
||||
playersList.innerHTML = '<p>Loading players...</p>';
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/Players', { refresh: true }),
|
||||
type: 'GET',
|
||||
dataType: 'json'
|
||||
}).then(function(players) {
|
||||
JellyLmsConfig.players = players || [];
|
||||
defaultSelect.innerHTML = '<option value="">None</option>';
|
||||
|
||||
if (!players || players.length === 0) {
|
||||
playersList.innerHTML = '<p>No players found. Make sure LMS is running and has connected players.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '<table class="tblGenres detailTable" style="width: 100%;">';
|
||||
html += '<thead><tr><th>Name</th><th>Model</th><th>Status</th><th>Volume</th><th>Synced</th></tr></thead>';
|
||||
html += '<tbody>';
|
||||
|
||||
players.forEach(function(player) {
|
||||
var status = player.IsConnected ? (player.IsPoweredOn ? 'On' : 'Standby') : 'Disconnected';
|
||||
var statusColor = player.IsConnected ? (player.IsPoweredOn ? 'green' : 'orange') : 'red';
|
||||
var syncStatus = player.IsSynced ? 'Yes' : 'No';
|
||||
|
||||
html += '<tr>';
|
||||
html += '<td>' + player.Name + '</td>';
|
||||
html += '<td>' + player.Model + '</td>';
|
||||
html += '<td style="color: ' + statusColor + ';">' + status + '</td>';
|
||||
html += '<td>' + player.Volume + '%</td>';
|
||||
html += '<td>' + syncStatus + '</td>';
|
||||
html += '</tr>';
|
||||
|
||||
var option = document.createElement('option');
|
||||
option.value = player.MacAddress;
|
||||
option.text = player.Name;
|
||||
@@ -166,14 +252,179 @@
|
||||
defaultSelect.appendChild(option);
|
||||
});
|
||||
|
||||
html += '</tbody></table>';
|
||||
playersList.innerHTML = html;
|
||||
renderPlayerList();
|
||||
}).catch(function(err) {
|
||||
playersList.innerHTML = '<p style="color: red;">Error loading players. Check LMS connection.</p>';
|
||||
document.querySelector('#playerSyncList').innerHTML = '<p style="color: red;">Error loading players. Check LMS connection.</p>';
|
||||
console.error('Error loading players:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function loadSyncGroups() {
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups'),
|
||||
type: 'GET',
|
||||
dataType: 'json'
|
||||
}).then(function(groups) {
|
||||
JellyLmsConfig.syncGroups = groups || [];
|
||||
renderSyncGroups();
|
||||
renderPlayerList();
|
||||
}).catch(function(err) {
|
||||
console.error('Error loading sync groups:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function renderSyncGroups() {
|
||||
var container = document.querySelector('#currentSyncGroups');
|
||||
var groups = JellyLmsConfig.syncGroups;
|
||||
|
||||
if (!groups || groups.length === 0) {
|
||||
container.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '';
|
||||
groups.forEach(function(group) {
|
||||
var playerNames = [];
|
||||
var masterPlayer = JellyLmsConfig.players.find(function(p) { return p.MacAddress === group.MasterMac; });
|
||||
if (masterPlayer) playerNames.push(masterPlayer.Name);
|
||||
|
||||
group.SlaveMacs.forEach(function(mac) {
|
||||
var player = JellyLmsConfig.players.find(function(p) { return p.MacAddress === mac; });
|
||||
if (player) playerNames.push(player.Name);
|
||||
});
|
||||
|
||||
html += '<div class="sync-group">';
|
||||
html += '<div class="sync-group-header">';
|
||||
html += '<span class="sync-group-players">' + playerNames.join(' + ') + '</span>';
|
||||
html += '<button is="emby-button" type="button" class="raised button-alt emby-button btnUnsyncGroup" data-master="' + group.MasterMac + '">';
|
||||
html += '<span>Unsync</span>';
|
||||
html += '</button>';
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
});
|
||||
|
||||
container.innerHTML = html;
|
||||
|
||||
container.querySelectorAll('.btnUnsyncGroup').forEach(function(btn) {
|
||||
btn.addEventListener('click', function() {
|
||||
unsyncGroup(this.getAttribute('data-master'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function renderPlayerList() {
|
||||
var container = document.querySelector('#playerSyncList');
|
||||
var players = JellyLmsConfig.players;
|
||||
|
||||
if (!players || players.length === 0) {
|
||||
container.innerHTML = '<p>No players found. Make sure LMS is running.</p>';
|
||||
updateSyncButton();
|
||||
return;
|
||||
}
|
||||
|
||||
// Get MACs of already synced players
|
||||
var syncedMacs = new Set();
|
||||
JellyLmsConfig.syncGroups.forEach(function(group) {
|
||||
syncedMacs.add(group.MasterMac);
|
||||
group.SlaveMacs.forEach(function(mac) { syncedMacs.add(mac); });
|
||||
});
|
||||
|
||||
// Only show unsynced players
|
||||
var unsyncedPlayers = players.filter(function(p) {
|
||||
return !syncedMacs.has(p.MacAddress);
|
||||
});
|
||||
|
||||
if (unsyncedPlayers.length === 0) {
|
||||
container.innerHTML = '<p>All players are synced.</p>';
|
||||
updateSyncButton();
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '';
|
||||
unsyncedPlayers.forEach(function(player) {
|
||||
var statusClass = getStatusClass(player);
|
||||
html += '<div class="player-sync-row">';
|
||||
html += '<input type="checkbox" class="player-sync-checkbox" data-mac="' + player.MacAddress + '" id="sync-' + player.MacAddress + '">';
|
||||
html += '<label class="player-sync-name" for="sync-' + player.MacAddress + '">' + player.Name + '</label>';
|
||||
html += '<div class="player-sync-status">';
|
||||
html += '<span class="status-dot ' + statusClass + '"></span>';
|
||||
html += '<span>' + getStatusText(player) + '</span>';
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
});
|
||||
|
||||
container.innerHTML = html;
|
||||
|
||||
// Add change listeners
|
||||
container.querySelectorAll('.player-sync-checkbox').forEach(function(cb) {
|
||||
cb.addEventListener('change', updateSyncButton);
|
||||
});
|
||||
|
||||
updateSyncButton();
|
||||
}
|
||||
|
||||
function getSelectedMacs() {
|
||||
var checkboxes = document.querySelectorAll('.player-sync-checkbox:checked');
|
||||
var macs = [];
|
||||
checkboxes.forEach(function(cb) {
|
||||
macs.push(cb.getAttribute('data-mac'));
|
||||
});
|
||||
return macs;
|
||||
}
|
||||
|
||||
function updateSyncButton() {
|
||||
var btn = document.querySelector('#btnSyncSelected');
|
||||
var selected = getSelectedMacs();
|
||||
btn.disabled = selected.length < 2;
|
||||
}
|
||||
|
||||
function syncSelected() {
|
||||
var macs = getSelectedMacs();
|
||||
if (macs.length < 2) return;
|
||||
|
||||
var statusDiv = document.querySelector('#syncStatus');
|
||||
statusDiv.innerHTML = '<span style="color: orange;">Syncing...</span>';
|
||||
|
||||
// First MAC becomes master (arbitrary, user doesn't need to know)
|
||||
var masterMac = macs[0];
|
||||
var slaveMacs = macs.slice(1);
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups'),
|
||||
type: 'POST',
|
||||
contentType: 'application/json',
|
||||
data: JSON.stringify({
|
||||
MasterMac: masterMac,
|
||||
SlaveMacs: slaveMacs
|
||||
})
|
||||
}).then(function() {
|
||||
statusDiv.innerHTML = '<span style="color: green;">Synced!</span>';
|
||||
setTimeout(function() {
|
||||
statusDiv.innerHTML = '';
|
||||
loadSyncGroups();
|
||||
}, 1500);
|
||||
}).catch(function(err) {
|
||||
statusDiv.innerHTML = '<span style="color: red;">Failed to sync.</span>';
|
||||
console.error('Error syncing:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function unsyncGroup(masterMac) {
|
||||
var statusDiv = document.querySelector('#syncStatus');
|
||||
statusDiv.innerHTML = '<span style="color: orange;">Unsyncing...</span>';
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups/' + encodeURIComponent(masterMac)),
|
||||
type: 'DELETE'
|
||||
}).then(function() {
|
||||
statusDiv.innerHTML = '';
|
||||
loadSyncGroups();
|
||||
}).catch(function(err) {
|
||||
statusDiv.innerHTML = '<span style="color: red;">Failed to unsync.</span>';
|
||||
console.error('Error unsyncing:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function testConnection() {
|
||||
var statusDiv = document.querySelector('#connectionStatus');
|
||||
statusDiv.innerHTML = '<span style="color: orange;">Testing connection...</span>';
|
||||
@@ -186,6 +437,7 @@
|
||||
if (result.IsConnected) {
|
||||
statusDiv.innerHTML = '<span style="color: green;">Connected! Found ' + result.PlayerCount + ' player(s).</span>';
|
||||
loadPlayers();
|
||||
loadSyncGroups();
|
||||
} else {
|
||||
statusDiv.innerHTML = '<span style="color: red;">Connection failed: ' + (result.LastError || 'Unknown error') + '</span>';
|
||||
}
|
||||
@@ -195,6 +447,113 @@
|
||||
});
|
||||
}
|
||||
|
||||
// Path Mapping Functions
|
||||
function renderPathMappings(mappings) {
|
||||
var container = document.querySelector('#pathMappingsList');
|
||||
if (!mappings || mappings.length === 0) {
|
||||
container.innerHTML = '<p class="fieldDescription">No path mappings configured. Click "Discover Jellyfin Paths" to get started.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '';
|
||||
mappings.forEach(function(mapping, index) {
|
||||
html += '<div class="path-mapping-row" style="display: flex; gap: 10px; align-items: flex-end; margin-bottom: 10px; padding: 10px; background: rgba(0,0,0,0.1); border-radius: 4px;">';
|
||||
html += '<div style="flex: 1;">';
|
||||
html += '<label class="inputLabel inputLabelUnfocused">Jellyfin Path</label>';
|
||||
html += '<input type="text" is="emby-input" class="mapping-jellyfin-path" data-index="' + index + '" value="' + (mapping.JellyfinPath || '') + '" placeholder="/media/music" />';
|
||||
html += '</div>';
|
||||
html += '<div style="flex: 1;">';
|
||||
html += '<label class="inputLabel inputLabelUnfocused">LMS Path</label>';
|
||||
html += '<input type="text" is="emby-input" class="mapping-lms-path" data-index="' + index + '" value="' + (mapping.LmsPath || '') + '" placeholder="/mnt/music" />';
|
||||
html += '</div>';
|
||||
html += '<button is="emby-button" type="button" class="raised button-alt emby-button btnRemoveMapping" data-index="' + index + '" style="margin-bottom: 0;">';
|
||||
html += '<span>Remove</span>';
|
||||
html += '</button>';
|
||||
html += '</div>';
|
||||
});
|
||||
container.innerHTML = html;
|
||||
|
||||
// Add remove handlers
|
||||
container.querySelectorAll('.btnRemoveMapping').forEach(function(btn) {
|
||||
btn.addEventListener('click', function() {
|
||||
var idx = parseInt(this.getAttribute('data-index'));
|
||||
JellyLmsConfig.pathMappings.splice(idx, 1);
|
||||
renderPathMappings(JellyLmsConfig.pathMappings);
|
||||
});
|
||||
});
|
||||
|
||||
// Update stored mappings when inputs change
|
||||
container.querySelectorAll('.mapping-jellyfin-path, .mapping-lms-path').forEach(function(input) {
|
||||
input.addEventListener('change', function() {
|
||||
var idx = parseInt(this.getAttribute('data-index'));
|
||||
if (this.classList.contains('mapping-jellyfin-path')) {
|
||||
JellyLmsConfig.pathMappings[idx].JellyfinPath = this.value;
|
||||
} else {
|
||||
JellyLmsConfig.pathMappings[idx].LmsPath = this.value;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function addPathMapping(jellyfinPath, lmsPath) {
|
||||
JellyLmsConfig.pathMappings = JellyLmsConfig.pathMappings || [];
|
||||
JellyLmsConfig.pathMappings.push({
|
||||
JellyfinPath: jellyfinPath || '',
|
||||
LmsPath: lmsPath || ''
|
||||
});
|
||||
renderPathMappings(JellyLmsConfig.pathMappings);
|
||||
}
|
||||
|
||||
function discoverPaths() {
|
||||
var statusDiv = document.querySelector('#discoverStatus');
|
||||
statusDiv.innerHTML = '<span style="color: orange;">Discovering...</span>';
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/DiscoverPaths'),
|
||||
type: 'GET',
|
||||
dataType: 'json'
|
||||
}).then(function(result) {
|
||||
statusDiv.innerHTML = '';
|
||||
var discoveredDiv = document.querySelector('#discoveredPaths');
|
||||
var prefixList = document.querySelector('#detectedPrefixList');
|
||||
|
||||
if (result.DetectedPrefixes && result.DetectedPrefixes.length > 0) {
|
||||
discoveredDiv.style.display = 'block';
|
||||
var html = '';
|
||||
result.DetectedPrefixes.forEach(function(prefix) {
|
||||
html += '<li><a href="#" class="detected-prefix-link" data-path="' + prefix + '" style="color: #00a4dc;">' + prefix + '</a></li>';
|
||||
});
|
||||
prefixList.innerHTML = html;
|
||||
|
||||
// Add click handlers to use detected paths
|
||||
prefixList.querySelectorAll('.detected-prefix-link').forEach(function(link) {
|
||||
link.addEventListener('click', function(e) {
|
||||
e.preventDefault();
|
||||
addPathMapping(this.getAttribute('data-path'), '');
|
||||
});
|
||||
});
|
||||
} else {
|
||||
discoveredDiv.style.display = 'block';
|
||||
prefixList.innerHTML = '<li>No audio files found in library</li>';
|
||||
}
|
||||
}).catch(function(err) {
|
||||
statusDiv.innerHTML = '<span style="color: red;">Discovery failed</span>';
|
||||
console.error('Path discovery failed:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function getPathMappingsFromUI() {
|
||||
var mappings = [];
|
||||
document.querySelectorAll('.path-mapping-row').forEach(function(row) {
|
||||
var jellyfinPath = row.querySelector('.mapping-jellyfin-path').value;
|
||||
var lmsPath = row.querySelector('.mapping-lms-path').value;
|
||||
if (jellyfinPath || lmsPath) {
|
||||
mappings.push({ JellyfinPath: jellyfinPath, LmsPath: lmsPath });
|
||||
}
|
||||
});
|
||||
return mappings;
|
||||
}
|
||||
|
||||
document.querySelector('#JellyLmsConfigPage')
|
||||
.addEventListener('pageshow', function() {
|
||||
Dashboard.showLoadingMsg();
|
||||
@@ -207,7 +566,23 @@
|
||||
document.querySelector('#ConnectionTimeoutSeconds').value = config.ConnectionTimeoutSeconds || 10;
|
||||
document.querySelector('#EnableAutoSync').checked = config.EnableAutoSync !== false;
|
||||
document.querySelector('#DefaultPlayerMac').value = config.DefaultPlayerMac || '';
|
||||
document.querySelector('#UseDirectFilePath').checked = config.UseDirectFilePath || false;
|
||||
|
||||
// Load path mappings (new list format, with fallback to legacy single mapping)
|
||||
JellyLmsConfig.pathMappings = config.PathMappings || [];
|
||||
// If no list mappings but legacy single mapping exists, show it
|
||||
if (JellyLmsConfig.pathMappings.length === 0 && config.JellyfinMediaPath && config.LmsMediaPath) {
|
||||
JellyLmsConfig.pathMappings = [{
|
||||
JellyfinPath: config.JellyfinMediaPath,
|
||||
LmsPath: config.LmsMediaPath
|
||||
}];
|
||||
}
|
||||
renderPathMappings(JellyLmsConfig.pathMappings);
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
|
||||
loadPlayers();
|
||||
loadSyncGroups();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -226,6 +601,12 @@
|
||||
document.querySelector('#btnRefreshPlayers')
|
||||
.addEventListener('click', function() {
|
||||
loadPlayers();
|
||||
loadSyncGroups();
|
||||
});
|
||||
|
||||
document.querySelector('#btnSyncSelected')
|
||||
.addEventListener('click', function() {
|
||||
syncSelected();
|
||||
});
|
||||
|
||||
document.querySelector('#JellyLmsConfigForm')
|
||||
@@ -240,6 +621,11 @@
|
||||
config.ConnectionTimeoutSeconds = parseInt(document.querySelector('#ConnectionTimeoutSeconds').value) || 10;
|
||||
config.EnableAutoSync = document.querySelector('#EnableAutoSync').checked;
|
||||
config.DefaultPlayerMac = document.querySelector('#DefaultPlayerMac').value;
|
||||
config.UseDirectFilePath = document.querySelector('#UseDirectFilePath').checked;
|
||||
// Save path mappings (clear legacy single mapping when using list)
|
||||
config.PathMappings = getPathMappingsFromUI();
|
||||
config.JellyfinMediaPath = '';
|
||||
config.LmsMediaPath = '';
|
||||
ApiClient.updatePluginConfiguration(JellyLmsConfig.pluginUniqueId, config).then(function (result) {
|
||||
Dashboard.processPluginConfigurationUpdateResult(result);
|
||||
});
|
||||
@@ -248,6 +634,16 @@
|
||||
e.preventDefault();
|
||||
return false;
|
||||
});
|
||||
|
||||
document.querySelector('#btnDiscoverPaths')
|
||||
.addEventListener('click', function() {
|
||||
discoverPaths();
|
||||
});
|
||||
|
||||
document.querySelector('#btnAddMapping')
|
||||
.addEventListener('click', function() {
|
||||
addPathMapping('', '');
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -1,490 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>LMS Player Sync</title>
|
||||
<style>
|
||||
.sync-container {
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.player-card {
|
||||
border: 1px solid #444;
|
||||
border-radius: 8px;
|
||||
padding: 15px;
|
||||
min-width: 200px;
|
||||
background: #1a1a1a;
|
||||
}
|
||||
.player-card.synced {
|
||||
border-color: #00a4dc;
|
||||
}
|
||||
.player-card.master {
|
||||
border-color: #52b54b;
|
||||
border-width: 2px;
|
||||
}
|
||||
.player-name {
|
||||
font-weight: bold;
|
||||
font-size: 1.1em;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.player-info {
|
||||
color: #888;
|
||||
font-size: 0.9em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.player-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.status-dot {
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.status-dot.on { background: #52b54b; }
|
||||
.status-dot.standby { background: #f9a825; }
|
||||
.status-dot.off { background: #f44336; }
|
||||
.sync-group {
|
||||
border: 2px dashed #00a4dc;
|
||||
border-radius: 12px;
|
||||
padding: 15px;
|
||||
margin-bottom: 20px;
|
||||
background: rgba(0, 164, 220, 0.05);
|
||||
}
|
||||
.sync-group-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.sync-group-title {
|
||||
font-weight: bold;
|
||||
color: #00a4dc;
|
||||
}
|
||||
.sync-group-players {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
}
|
||||
.sync-badge {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 0.75em;
|
||||
margin-left: 8px;
|
||||
}
|
||||
.sync-badge.master {
|
||||
background: #52b54b;
|
||||
color: white;
|
||||
}
|
||||
.sync-badge.slave {
|
||||
background: #00a4dc;
|
||||
color: white;
|
||||
}
|
||||
.unsynced-section {
|
||||
margin-top: 30px;
|
||||
}
|
||||
.create-sync-section {
|
||||
margin-top: 30px;
|
||||
padding: 20px;
|
||||
border: 1px solid #444;
|
||||
border-radius: 8px;
|
||||
background: #1a1a1a;
|
||||
}
|
||||
.player-checkbox-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 15px;
|
||||
margin: 15px 0;
|
||||
}
|
||||
.player-checkbox-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px;
|
||||
border: 1px solid #444;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.player-checkbox-item:hover {
|
||||
border-color: #00a4dc;
|
||||
}
|
||||
.player-checkbox-item.selected {
|
||||
border-color: #52b54b;
|
||||
background: rgba(82, 181, 75, 0.1);
|
||||
}
|
||||
.player-checkbox-item.master-selected {
|
||||
border-color: #52b54b;
|
||||
border-width: 2px;
|
||||
}
|
||||
.action-buttons {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.volume-slider {
|
||||
width: 100%;
|
||||
margin: 5px 0;
|
||||
}
|
||||
.help-text {
|
||||
color: #888;
|
||||
font-size: 0.9em;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="JellyLmsSyncPage" data-role="page" class="page type-interior pluginConfigurationPage" data-require="emby-input,emby-button,emby-select,emby-checkbox">
|
||||
<div data-role="content">
|
||||
<div class="content-primary">
|
||||
<h2>LMS Player Sync Management</h2>
|
||||
<p>Manage synchronized playback groups for your LMS players. Synced players will play audio in perfect sync.</p>
|
||||
|
||||
<div>
|
||||
<button is="emby-button" type="button" id="btnRefresh" class="raised button-alt emby-button">
|
||||
<span>Refresh</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div id="syncGroupsSection" style="margin-top: 20px;">
|
||||
<h3>Current Sync Groups</h3>
|
||||
<div id="syncGroupsList">
|
||||
<p>Loading sync groups...</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="unsyncedPlayersSection" class="unsynced-section">
|
||||
<h3>Available Players</h3>
|
||||
<div id="unsyncedPlayersList">
|
||||
<p>Loading players...</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="create-sync-section">
|
||||
<h3>Create Sync Group</h3>
|
||||
<p class="help-text">Select players to sync together. The first selected player will be the master (controls playback).</p>
|
||||
|
||||
<div id="playerSelectionList" class="player-checkbox-list">
|
||||
<!-- Players will be populated here -->
|
||||
</div>
|
||||
|
||||
<div class="action-buttons">
|
||||
<button is="emby-button" type="button" id="btnCreateSync" class="raised button-submit emby-button" disabled>
|
||||
<span>Create Sync Group</span>
|
||||
</button>
|
||||
<button is="emby-button" type="button" id="btnClearSelection" class="raised button-alt emby-button">
|
||||
<span>Clear Selection</span>
|
||||
</button>
|
||||
</div>
|
||||
<div id="syncStatus" style="margin-top: 10px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
var JellyLmsSync = {
|
||||
pluginUniqueId: 'a5b8c9d0-1e2f-3a4b-5c6d-7e8f9a0b1c2d',
|
||||
players: [],
|
||||
syncGroups: [],
|
||||
selectedPlayers: []
|
||||
};
|
||||
|
||||
function getStatusClass(player) {
|
||||
if (!player.IsConnected) return 'off';
|
||||
return player.IsPoweredOn ? 'on' : 'standby';
|
||||
}
|
||||
|
||||
function getStatusText(player) {
|
||||
if (!player.IsConnected) return 'Disconnected';
|
||||
return player.IsPoweredOn ? 'On' : 'Standby';
|
||||
}
|
||||
|
||||
function loadData() {
|
||||
Promise.all([
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/Players', { refresh: true }),
|
||||
type: 'GET',
|
||||
dataType: 'json'
|
||||
}),
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups'),
|
||||
type: 'GET',
|
||||
dataType: 'json'
|
||||
})
|
||||
]).then(function(results) {
|
||||
JellyLmsSync.players = results[0] || [];
|
||||
JellyLmsSync.syncGroups = results[1] || [];
|
||||
renderSyncGroups();
|
||||
renderUnsyncedPlayers();
|
||||
renderPlayerSelection();
|
||||
}).catch(function(err) {
|
||||
console.error('Error loading data:', err);
|
||||
document.querySelector('#syncGroupsList').innerHTML = '<p style="color: red;">Error loading data. Check LMS connection.</p>';
|
||||
});
|
||||
}
|
||||
|
||||
function renderSyncGroups() {
|
||||
var container = document.querySelector('#syncGroupsList');
|
||||
var groups = JellyLmsSync.syncGroups;
|
||||
|
||||
if (!groups || groups.length === 0) {
|
||||
container.innerHTML = '<p>No sync groups configured. Create one below!</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '';
|
||||
groups.forEach(function(group) {
|
||||
html += '<div class="sync-group">';
|
||||
html += '<div class="sync-group-header">';
|
||||
html += '<span class="sync-group-title">Sync Group (' + group.PlayerCount + ' players)</span>';
|
||||
html += '<button is="emby-button" type="button" class="raised button-alt emby-button btnDissolveGroup" data-master="' + group.MasterMac + '">';
|
||||
html += '<span>Dissolve Group</span>';
|
||||
html += '</button>';
|
||||
html += '</div>';
|
||||
html += '<div class="sync-group-players">';
|
||||
|
||||
// Master player
|
||||
var masterPlayer = JellyLmsSync.players.find(function(p) { return p.MacAddress === group.MasterMac; });
|
||||
if (masterPlayer) {
|
||||
html += renderPlayerCard(masterPlayer, true, false);
|
||||
}
|
||||
|
||||
// Slave players
|
||||
group.SlaveMacs.forEach(function(slaveMac, index) {
|
||||
var slavePlayer = JellyLmsSync.players.find(function(p) { return p.MacAddress === slaveMac; });
|
||||
if (slavePlayer) {
|
||||
html += renderPlayerCard(slavePlayer, false, true, group.SlaveNames[index]);
|
||||
}
|
||||
});
|
||||
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
});
|
||||
|
||||
container.innerHTML = html;
|
||||
|
||||
// Attach event listeners for dissolve buttons
|
||||
container.querySelectorAll('.btnDissolveGroup').forEach(function(btn) {
|
||||
btn.addEventListener('click', function() {
|
||||
dissolveGroup(this.getAttribute('data-master'));
|
||||
});
|
||||
});
|
||||
|
||||
// Attach event listeners for unsync buttons
|
||||
container.querySelectorAll('.btnUnsyncPlayer').forEach(function(btn) {
|
||||
btn.addEventListener('click', function() {
|
||||
unsyncPlayer(this.getAttribute('data-mac'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function renderPlayerCard(player, isMaster, isSlave, slaveName) {
|
||||
var statusClass = getStatusClass(player);
|
||||
var cardClass = 'player-card';
|
||||
if (isMaster) cardClass += ' master';
|
||||
else if (isSlave) cardClass += ' synced';
|
||||
|
||||
var html = '<div class="' + cardClass + '">';
|
||||
html += '<div class="player-name">' + player.Name;
|
||||
if (isMaster) html += '<span class="sync-badge master">Master</span>';
|
||||
else if (isSlave) html += '<span class="sync-badge slave">Synced</span>';
|
||||
html += '</div>';
|
||||
html += '<div class="player-info">' + player.Model + '</div>';
|
||||
html += '<div class="player-status">';
|
||||
html += '<span class="status-dot ' + statusClass + '"></span>';
|
||||
html += '<span>' + getStatusText(player) + '</span>';
|
||||
html += '<span style="margin-left: auto;">Vol: ' + player.Volume + '%</span>';
|
||||
html += '</div>';
|
||||
|
||||
if (isSlave) {
|
||||
html += '<button is="emby-button" type="button" class="raised button-alt emby-button btnUnsyncPlayer" data-mac="' + player.MacAddress + '" style="width: 100%; margin-top: 5px;">';
|
||||
html += '<span>Unsync</span>';
|
||||
html += '</button>';
|
||||
}
|
||||
|
||||
html += '</div>';
|
||||
return html;
|
||||
}
|
||||
|
||||
function renderUnsyncedPlayers() {
|
||||
var container = document.querySelector('#unsyncedPlayersList');
|
||||
var syncedMacs = new Set();
|
||||
|
||||
JellyLmsSync.syncGroups.forEach(function(group) {
|
||||
syncedMacs.add(group.MasterMac);
|
||||
group.SlaveMacs.forEach(function(mac) { syncedMacs.add(mac); });
|
||||
});
|
||||
|
||||
var unsyncedPlayers = JellyLmsSync.players.filter(function(p) {
|
||||
return !syncedMacs.has(p.MacAddress);
|
||||
});
|
||||
|
||||
if (unsyncedPlayers.length === 0) {
|
||||
container.innerHTML = '<p>All players are in sync groups.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '<div class="sync-container">';
|
||||
unsyncedPlayers.forEach(function(player) {
|
||||
html += renderPlayerCard(player, false, false);
|
||||
});
|
||||
html += '</div>';
|
||||
container.innerHTML = html;
|
||||
}
|
||||
|
||||
function renderPlayerSelection() {
|
||||
var container = document.querySelector('#playerSelectionList');
|
||||
var players = JellyLmsSync.players;
|
||||
|
||||
if (!players || players.length === 0) {
|
||||
container.innerHTML = '<p>No players available.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
// Only show unsynced players for selection
|
||||
var syncedMacs = new Set();
|
||||
JellyLmsSync.syncGroups.forEach(function(group) {
|
||||
syncedMacs.add(group.MasterMac);
|
||||
group.SlaveMacs.forEach(function(mac) { syncedMacs.add(mac); });
|
||||
});
|
||||
|
||||
var availablePlayers = players.filter(function(p) {
|
||||
return !syncedMacs.has(p.MacAddress);
|
||||
});
|
||||
|
||||
if (availablePlayers.length < 2) {
|
||||
container.innerHTML = '<p>Need at least 2 unsynced players to create a sync group.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '';
|
||||
availablePlayers.forEach(function(player) {
|
||||
var isSelected = JellyLmsSync.selectedPlayers.indexOf(player.MacAddress) !== -1;
|
||||
var isMaster = JellyLmsSync.selectedPlayers.length > 0 && JellyLmsSync.selectedPlayers[0] === player.MacAddress;
|
||||
var statusClass = getStatusClass(player);
|
||||
|
||||
var itemClass = 'player-checkbox-item';
|
||||
if (isSelected) itemClass += ' selected';
|
||||
if (isMaster) itemClass += ' master-selected';
|
||||
|
||||
html += '<div class="' + itemClass + '" data-mac="' + player.MacAddress + '">';
|
||||
html += '<span class="status-dot ' + statusClass + '"></span>';
|
||||
html += '<span>' + player.Name + '</span>';
|
||||
if (isMaster) html += '<span class="sync-badge master">Master</span>';
|
||||
else if (isSelected) html += '<span class="sync-badge slave">Slave</span>';
|
||||
html += '</div>';
|
||||
});
|
||||
|
||||
container.innerHTML = html;
|
||||
|
||||
// Attach click listeners
|
||||
container.querySelectorAll('.player-checkbox-item').forEach(function(item) {
|
||||
item.addEventListener('click', function() {
|
||||
togglePlayerSelection(this.getAttribute('data-mac'));
|
||||
});
|
||||
});
|
||||
|
||||
updateCreateButton();
|
||||
}
|
||||
|
||||
function togglePlayerSelection(mac) {
|
||||
var index = JellyLmsSync.selectedPlayers.indexOf(mac);
|
||||
if (index === -1) {
|
||||
JellyLmsSync.selectedPlayers.push(mac);
|
||||
} else {
|
||||
JellyLmsSync.selectedPlayers.splice(index, 1);
|
||||
}
|
||||
renderPlayerSelection();
|
||||
}
|
||||
|
||||
function updateCreateButton() {
|
||||
var btn = document.querySelector('#btnCreateSync');
|
||||
btn.disabled = JellyLmsSync.selectedPlayers.length < 2;
|
||||
}
|
||||
|
||||
function createSyncGroup() {
|
||||
if (JellyLmsSync.selectedPlayers.length < 2) return;
|
||||
|
||||
var statusDiv = document.querySelector('#syncStatus');
|
||||
statusDiv.innerHTML = '<span style="color: orange;">Creating sync group...</span>';
|
||||
|
||||
var masterMac = JellyLmsSync.selectedPlayers[0];
|
||||
var slaveMacs = JellyLmsSync.selectedPlayers.slice(1);
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups'),
|
||||
type: 'POST',
|
||||
contentType: 'application/json',
|
||||
data: JSON.stringify({
|
||||
MasterMac: masterMac,
|
||||
SlaveMacs: slaveMacs
|
||||
})
|
||||
}).then(function() {
|
||||
statusDiv.innerHTML = '<span style="color: green;">Sync group created successfully!</span>';
|
||||
JellyLmsSync.selectedPlayers = [];
|
||||
setTimeout(function() {
|
||||
statusDiv.innerHTML = '';
|
||||
loadData();
|
||||
}, 1500);
|
||||
}).catch(function(err) {
|
||||
statusDiv.innerHTML = '<span style="color: red;">Failed to create sync group.</span>';
|
||||
console.error('Error creating sync group:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function dissolveGroup(masterMac) {
|
||||
if (!confirm('Dissolve this sync group? All players will be unsynced.')) return;
|
||||
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups/' + encodeURIComponent(masterMac)),
|
||||
type: 'DELETE'
|
||||
}).then(function() {
|
||||
loadData();
|
||||
}).catch(function(err) {
|
||||
alert('Failed to dissolve sync group.');
|
||||
console.error('Error dissolving sync group:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function unsyncPlayer(mac) {
|
||||
ApiClient.ajax({
|
||||
url: ApiClient.getUrl('JellyLms/SyncGroups/Players/' + encodeURIComponent(mac)),
|
||||
type: 'DELETE'
|
||||
}).then(function() {
|
||||
loadData();
|
||||
}).catch(function(err) {
|
||||
alert('Failed to unsync player.');
|
||||
console.error('Error unsyncing player:', err);
|
||||
});
|
||||
}
|
||||
|
||||
function clearSelection() {
|
||||
JellyLmsSync.selectedPlayers = [];
|
||||
renderPlayerSelection();
|
||||
}
|
||||
|
||||
document.querySelector('#JellyLmsSyncPage')
|
||||
.addEventListener('pageshow', function() {
|
||||
loadData();
|
||||
});
|
||||
|
||||
document.querySelector('#btnRefresh')
|
||||
.addEventListener('click', function() {
|
||||
loadData();
|
||||
});
|
||||
|
||||
document.querySelector('#btnCreateSync')
|
||||
.addEventListener('click', function() {
|
||||
createSyncGroup();
|
||||
});
|
||||
|
||||
document.querySelector('#btnClearSelection')
|
||||
.addEventListener('click', function() {
|
||||
clearSelection();
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -27,9 +27,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Configuration\configPage.html" />
|
||||
<None Remove="Configuration\syncPage.html" />
|
||||
<EmbeddedResource Include="Configuration\configPage.html" />
|
||||
<EmbeddedResource Include="Configuration\syncPage.html" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -49,11 +49,6 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
||||
{
|
||||
Name = Name,
|
||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
||||
},
|
||||
new PluginPageInfo
|
||||
{
|
||||
Name = "JellyLMS Sync",
|
||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.syncPage.html", GetType().Namespace)
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@@ -226,8 +226,10 @@ public class LmsApiClient : ILmsApiClient, IDisposable
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger.LogInformation("LMS SeekAsync: player {Mac}, position {Seconds}s", playerMac, positionSeconds);
|
||||
await SendCommandAsync<object>(playerMac, ["time", positionSeconds.ToString("F1", CultureInfo.InvariantCulture)])
|
||||
.ConfigureAwait(false);
|
||||
_logger.LogInformation("LMS SeekAsync: command sent successfully");
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -26,6 +26,9 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
private Timer? _progressTimer;
|
||||
private bool _disposed;
|
||||
private BaseItem? _currentItem;
|
||||
private Guid[] _playlist = [];
|
||||
private int _playlistIndex;
|
||||
private long _seekOffsetTicks; // Offset from transcoded stream start position
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="LmsSessionController"/> class.
|
||||
@@ -86,10 +89,20 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
_logger.LogInformation(
|
||||
"LMS Session Controller received message {MessageType} for player {PlayerName} ({Mac})",
|
||||
"LMS Session Controller received message {MessageType} for player {PlayerName} ({Mac}), data type: {DataType}",
|
||||
name,
|
||||
_player.Name,
|
||||
_player.MacAddress);
|
||||
_player.MacAddress,
|
||||
data?.GetType().Name ?? "null");
|
||||
|
||||
// Log the data for debugging
|
||||
if (data is PlaystateRequest psr)
|
||||
{
|
||||
_logger.LogInformation(
|
||||
"PlaystateRequest: Command={Command}, SeekPositionTicks={Ticks}",
|
||||
psr.Command,
|
||||
psr.SeekPositionTicks);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
@@ -137,41 +150,60 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
await _lmsClient.PowerOnAsync(_player.MacAddress).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
// For now, play the first item
|
||||
// TODO: Support playlists/queues
|
||||
if (playRequest.ItemIds.Length > 0)
|
||||
{
|
||||
var itemId = playRequest.ItemIds[0];
|
||||
var streamUrl = BuildStreamUrl(itemId);
|
||||
// Store the full playlist
|
||||
_playlist = playRequest.ItemIds;
|
||||
_playlistIndex = playRequest.StartIndex ?? 0;
|
||||
|
||||
_logger.LogInformation("Playing stream URL: {Url}", streamUrl);
|
||||
await _lmsClient.PlayUrlAsync(_player.MacAddress, streamUrl).ConfigureAwait(false);
|
||||
|
||||
// Track current playback state
|
||||
CurrentItemId = itemId;
|
||||
IsPlaying = true;
|
||||
IsPaused = false;
|
||||
|
||||
// Look up the item for duration info
|
||||
_currentItem = _libraryManager.GetItemById(itemId);
|
||||
|
||||
// Seek to start position if specified
|
||||
var startPositionTicks = 0L;
|
||||
if (playRequest.StartPositionTicks.HasValue && playRequest.StartPositionTicks.Value > 0)
|
||||
{
|
||||
startPositionTicks = playRequest.StartPositionTicks.Value;
|
||||
var positionSeconds = startPositionTicks / TimeSpan.TicksPerSecond;
|
||||
await _lmsClient.SeekAsync(_player.MacAddress, positionSeconds).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
// Report playback start to Jellyfin
|
||||
await ReportPlaybackStartAsync(itemId, startPositionTicks).ConfigureAwait(false);
|
||||
|
||||
// Start progress reporting timer (every 2 seconds)
|
||||
StartProgressTimer();
|
||||
// Play the item at the start index
|
||||
await PlayItemAtIndexAsync(_playlistIndex, playRequest.StartPositionTicks ?? 0).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task PlayItemAtIndexAsync(int index, long startPositionTicks = 0)
|
||||
{
|
||||
if (index < 0 || index >= _playlist.Length)
|
||||
{
|
||||
_logger.LogWarning("Invalid playlist index {Index}, playlist has {Count} items", index, _playlist.Length);
|
||||
return;
|
||||
}
|
||||
|
||||
var itemId = _playlist[index];
|
||||
_playlistIndex = index;
|
||||
|
||||
// Look up the item first - we need it for file path if using direct mode
|
||||
_currentItem = _libraryManager.GetItemById(itemId);
|
||||
|
||||
// Build stream URL/path with start position
|
||||
var (streamUrl, useDirectPath) = BuildPlaybackUrl(itemId, startPositionTicks);
|
||||
_logger.LogInformation(
|
||||
"Playing item {Index}/{Total} from position {Position}s (direct={Direct}): {Url}",
|
||||
index + 1,
|
||||
_playlist.Length,
|
||||
startPositionTicks / TimeSpan.TicksPerSecond,
|
||||
useDirectPath,
|
||||
streamUrl);
|
||||
|
||||
await _lmsClient.PlayUrlAsync(_player.MacAddress, streamUrl).ConfigureAwait(false);
|
||||
|
||||
// Track current playback state
|
||||
CurrentItemId = itemId;
|
||||
IsPlaying = true;
|
||||
IsPaused = false;
|
||||
|
||||
// Track the seek offset so we report the correct position
|
||||
// When using direct file paths, LMS handles seeking natively so no offset needed
|
||||
// When using HTTP streaming with startTimeTicks, the stream starts at 0 but we need to report actual position
|
||||
_seekOffsetTicks = useDirectPath ? 0 : startPositionTicks;
|
||||
|
||||
// Report playback start to Jellyfin
|
||||
await ReportPlaybackStartAsync(itemId, startPositionTicks).ConfigureAwait(false);
|
||||
|
||||
// Start progress reporting timer (every 2 seconds)
|
||||
StartProgressTimer();
|
||||
}
|
||||
|
||||
private async Task ReportPlaybackStartAsync(Guid itemId, long positionTicks)
|
||||
{
|
||||
try
|
||||
@@ -233,17 +265,45 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
return;
|
||||
}
|
||||
|
||||
var positionTicks = (long)(status.Time * TimeSpan.TicksPerSecond);
|
||||
// LMS reports time relative to the current stream, but after seeking
|
||||
// we're playing a transcoded stream that starts at the seek position.
|
||||
// Add the seek offset to get the actual track position.
|
||||
var positionTicks = (long)(status.Time * TimeSpan.TicksPerSecond) + _seekOffsetTicks;
|
||||
var isPaused = status.Mode == "pause";
|
||||
|
||||
// Update our local state from LMS
|
||||
IsPaused = isPaused;
|
||||
|
||||
// Check if playback has stopped on LMS side
|
||||
if (status.Mode == "stop")
|
||||
// Check if playback has stopped on LMS side (track ended)
|
||||
// Only advance if we're not paused - LMS can briefly report "stop" during transitions
|
||||
if (status.Mode == "stop" && !IsPaused)
|
||||
{
|
||||
_logger.LogInformation("LMS playback stopped, reporting to Jellyfin");
|
||||
await ReportPlaybackStoppedAsync().ConfigureAwait(false);
|
||||
// Double-check by getting status again after a brief delay to avoid false positives
|
||||
await Task.Delay(500).ConfigureAwait(false);
|
||||
var confirmStatus = await _lmsClient.GetPlayerStatusAsync(_player.MacAddress).ConfigureAwait(false);
|
||||
if (confirmStatus?.Mode != "stop")
|
||||
{
|
||||
_logger.LogDebug("LMS mode changed from stop, ignoring");
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.LogInformation("LMS playback stopped, checking if we should advance to next track");
|
||||
|
||||
// Check if there are more tracks in the playlist
|
||||
if (_playlistIndex < _playlist.Length - 1)
|
||||
{
|
||||
_logger.LogInformation(
|
||||
"Track ended, advancing to next track (index {Index}/{Total})",
|
||||
_playlistIndex + 2,
|
||||
_playlist.Length);
|
||||
await PlayItemAtIndexAsync(_playlistIndex + 1).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogInformation("Playlist finished, reporting playback stopped");
|
||||
await ReportPlaybackStoppedAsync().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -350,22 +410,80 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
break;
|
||||
|
||||
case PlaystateCommand.Seek:
|
||||
if (playstateRequest.SeekPositionTicks.HasValue)
|
||||
_logger.LogInformation(
|
||||
"Seek command received for player {PlayerName}, SeekPositionTicks: {Ticks}, CurrentItemId: {ItemId}, CurrentSeekOffset: {Offset}",
|
||||
_player.Name,
|
||||
playstateRequest.SeekPositionTicks,
|
||||
CurrentItemId,
|
||||
_seekOffsetTicks);
|
||||
if (playstateRequest.SeekPositionTicks.HasValue && CurrentItemId.HasValue)
|
||||
{
|
||||
var positionSeconds = playstateRequest.SeekPositionTicks.Value / TimeSpan.TicksPerSecond;
|
||||
_logger.LogInformation(
|
||||
"Seeking player {PlayerName} to {Seconds} seconds",
|
||||
_player.Name,
|
||||
positionSeconds);
|
||||
await _lmsClient.SeekAsync(_player.MacAddress, positionSeconds).ConfigureAwait(false);
|
||||
var positionTicks = playstateRequest.SeekPositionTicks.Value;
|
||||
var positionSeconds = positionTicks / TimeSpan.TicksPerSecond;
|
||||
|
||||
// Check if we're using direct file path mode - if so, LMS can seek natively
|
||||
if (CanSeekNatively())
|
||||
{
|
||||
// Use native LMS seeking - much smoother!
|
||||
_logger.LogInformation("Seeking natively to {Seconds}s using LMS time command", positionSeconds);
|
||||
await _lmsClient.SeekAsync(_player.MacAddress, positionSeconds).ConfigureAwait(false);
|
||||
// No seek offset needed - LMS handles position tracking natively
|
||||
_seekOffsetTicks = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// For HTTP streams, LMS can't seek directly - we need to restart with startTimeTicks
|
||||
// Build a new URL with the seek position and restart playback
|
||||
var streamUrl = BuildStreamUrlWithPosition(CurrentItemId.Value, positionTicks);
|
||||
_logger.LogInformation(
|
||||
"Seeking by restarting stream at position {Seconds}s: {Url}",
|
||||
positionSeconds,
|
||||
streamUrl);
|
||||
|
||||
await _lmsClient.PlayUrlAsync(_player.MacAddress, streamUrl).ConfigureAwait(false);
|
||||
|
||||
// Track the seek offset so we report the correct position
|
||||
// The transcoded stream starts at 0, but we need to report the actual track position
|
||||
_seekOffsetTicks = positionTicks;
|
||||
}
|
||||
|
||||
_logger.LogInformation("Seek offset is now {Ticks} ticks ({Seconds}s)", _seekOffsetTicks, _seekOffsetTicks / TimeSpan.TicksPerSecond);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogWarning("Seek command received but SeekPositionTicks or CurrentItemId is null");
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case PlaystateCommand.NextTrack:
|
||||
if (_playlistIndex < _playlist.Length - 1)
|
||||
{
|
||||
_logger.LogInformation("Skipping to next track (index {Index})", _playlistIndex + 1);
|
||||
await PlayItemAtIndexAsync(_playlistIndex + 1).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogInformation("Already at last track, stopping playback");
|
||||
await _lmsClient.StopAsync(_player.MacAddress).ConfigureAwait(false);
|
||||
await ReportPlaybackStoppedAsync().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case PlaystateCommand.PreviousTrack:
|
||||
// TODO: Implement playlist navigation
|
||||
_logger.LogDebug("Track navigation not yet implemented");
|
||||
if (_playlistIndex > 0)
|
||||
{
|
||||
_logger.LogInformation("Skipping to previous track (index {Index})", _playlistIndex - 1);
|
||||
await PlayItemAtIndexAsync(_playlistIndex - 1).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
// At first track, restart from beginning
|
||||
_logger.LogInformation("At first track, restarting from beginning");
|
||||
await _lmsClient.SeekAsync(_player.MacAddress, 0).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -432,15 +550,113 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the playback URL or file path for the given item.
|
||||
/// Returns a tuple of (url/path, isDirectFilePath).
|
||||
/// </summary>
|
||||
private (string Url, bool IsDirectPath) BuildPlaybackUrl(Guid itemId, long startPositionTicks)
|
||||
{
|
||||
var config = Plugin.Instance?.Configuration;
|
||||
|
||||
// Check if direct file path mode is enabled
|
||||
if (config?.UseDirectFilePath == true && _currentItem?.Path != null)
|
||||
{
|
||||
// Try each path mapping until one matches
|
||||
foreach (var mapping in config.GetAllPathMappings())
|
||||
{
|
||||
var directPath = BuildDirectFilePath(_currentItem.Path, mapping.JellyfinPath, mapping.LmsPath);
|
||||
if (directPath != null)
|
||||
{
|
||||
_logger.LogDebug(
|
||||
"Using direct file path with mapping '{JellyfinPath}' -> '{LmsPath}': {OriginalPath} -> {MappedPath}",
|
||||
mapping.JellyfinPath,
|
||||
mapping.LmsPath,
|
||||
_currentItem.Path,
|
||||
directPath);
|
||||
return (directPath, true);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.LogWarning(
|
||||
"Direct file path mode enabled but no path mapping matched for: {Path}",
|
||||
_currentItem.Path);
|
||||
}
|
||||
|
||||
// Fall back to HTTP streaming
|
||||
return (BuildStreamUrlWithPosition(itemId, startPositionTicks), false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Checks if the current item can use native LMS seeking (direct file path mode).
|
||||
/// </summary>
|
||||
private bool CanSeekNatively()
|
||||
{
|
||||
var config = Plugin.Instance?.Configuration;
|
||||
if (config?.UseDirectFilePath != true || _currentItem?.Path == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if any mapping matches the current item's path
|
||||
foreach (var mapping in config.GetAllPathMappings())
|
||||
{
|
||||
var normalizedPath = _currentItem.Path.Replace('\\', '/');
|
||||
var normalizedPrefix = mapping.JellyfinPath.TrimEnd('/', '\\').Replace('\\', '/');
|
||||
if (normalizedPath.StartsWith(normalizedPrefix, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Maps a Jellyfin file path to an LMS file path using the configured path prefixes.
|
||||
/// </summary>
|
||||
private static string? BuildDirectFilePath(string jellyfinPath, string jellyfinPrefix, string lmsPrefix)
|
||||
{
|
||||
// Normalize path separators for comparison
|
||||
var normalizedPath = jellyfinPath.Replace('\\', '/');
|
||||
var normalizedJellyfinPrefix = jellyfinPrefix.TrimEnd('/', '\\').Replace('\\', '/');
|
||||
var normalizedLmsPrefix = lmsPrefix.TrimEnd('/', '\\').Replace('\\', '/');
|
||||
|
||||
if (!normalizedPath.StartsWith(normalizedJellyfinPrefix, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
// Replace the prefix
|
||||
var relativePath = normalizedPath[normalizedJellyfinPrefix.Length..];
|
||||
return normalizedLmsPrefix + relativePath;
|
||||
}
|
||||
|
||||
private string BuildStreamUrl(Guid itemId)
|
||||
{
|
||||
return BuildStreamUrlWithPosition(itemId, 0);
|
||||
}
|
||||
|
||||
private string BuildStreamUrlWithPosition(Guid itemId, long startPositionTicks)
|
||||
{
|
||||
var config = Plugin.Instance?.Configuration;
|
||||
var jellyfinUrl = config?.JellyfinServerUrl?.TrimEnd('/') ?? "http://localhost:8096";
|
||||
var apiKey = config?.JellyfinApiKey ?? string.Empty;
|
||||
|
||||
// Build audio stream URL that LMS can fetch
|
||||
// Use direct stream endpoint - simpler and more compatible
|
||||
var url = $"{jellyfinUrl}/Audio/{itemId}/stream?static=true";
|
||||
string url;
|
||||
|
||||
if (startPositionTicks > 0)
|
||||
{
|
||||
// For seeking, we need to use transcoding (static=true doesn't support startTimeTicks)
|
||||
// Use MP3 transcoding with the start position
|
||||
// Add a cache-busting parameter to ensure we get a fresh stream on each seek
|
||||
var cacheBuster = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
||||
url = $"{jellyfinUrl}/Audio/{itemId}/stream.mp3?audioCodec=mp3&audioBitRate=320000&startTimeTicks={startPositionTicks}&_={cacheBuster}";
|
||||
}
|
||||
else
|
||||
{
|
||||
// For normal playback from start, use static streaming (better quality, no transcoding)
|
||||
url = $"{jellyfinUrl}/Audio/{itemId}/stream.mp3?static=true";
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(apiKey))
|
||||
{
|
||||
|
||||
@@ -2,6 +2,20 @@
|
||||
|
||||
A Jellyfin plugin that bridges audio playback to Logitech Media Server (LMS) for multi-room synchronized playback.
|
||||
|
||||
## Quick Install
|
||||
|
||||
Add the following repository URL to your Jellyfin server to install JellyLMS directly from the plugin catalog:
|
||||
|
||||
```
|
||||
https://gitea.tourolle.paris/dtourolle/jellyLMS/raw/branch/master/manifest.json
|
||||
```
|
||||
|
||||
**Steps:**
|
||||
1. Go to **Dashboard** → **Plugins** → **Repositories**
|
||||
2. Click **Add** and paste the URL above
|
||||
3. Go to **Catalog** and find "JellyLMS"
|
||||
4. Click **Install** and restart Jellyfin
|
||||
|
||||
## Overview
|
||||
|
||||
JellyLMS enables Jellyfin to stream audio to LMS, which acts as a multi-room speaker system. The architecture is:
|
||||
@@ -37,6 +51,28 @@ JellyLMS enables Jellyfin to stream audio to LMS, which acts as a multi-room spe
|
||||
- **Playback Control**: Play, pause, stop, seek, and volume control forwarded to LMS
|
||||
- **Stream Bridging**: Generates audio stream URLs from Jellyfin for LMS to consume
|
||||
|
||||
## Screenshots
|
||||
|
||||
### Cast to LMS Players
|
||||
Select any LMS player directly from Jellyfin's "Play On" menu:
|
||||
|
||||

|
||||
|
||||
### Plugin Configuration
|
||||
Configure LMS and Jellyfin server connections:
|
||||
|
||||

|
||||
|
||||
### Player Discovery
|
||||
View discovered LMS players with their status and volume levels:
|
||||
|
||||

|
||||
|
||||
### Sync Group Management
|
||||
Create and manage synchronized playback groups for multi-room audio:
|
||||
|
||||

|
||||
|
||||
## Requirements
|
||||
|
||||
- Jellyfin Server 10.10.0 or later
|
||||
@@ -146,6 +182,30 @@ The plugin communicates with LMS using the `slim.request` JSON-RPC method.
|
||||
2. Check that audio files are in a format supported by your LMS players
|
||||
3. Ensure players are powered on (plugin can auto-power-on if configured)
|
||||
|
||||
## Known Limitations
|
||||
|
||||
### Seeking with HTTP Streaming
|
||||
|
||||
When using HTTP streaming (the default), LMS cannot seek within audio streams. To work around this, when you seek or cast from a specific position, JellyLMS restarts playback with a new transcoded stream that begins at the requested position. This means:
|
||||
|
||||
- **Seeking triggers a brief audio restart** rather than a smooth jump
|
||||
- **Starting playback mid-track** uses transcoding (MP3 320kbps) instead of direct streaming
|
||||
- **Playback from the beginning** uses direct/static streaming for best quality
|
||||
|
||||
This is a fundamental limitation of how LMS handles HTTP streams.
|
||||
|
||||
### Solution: Direct File Access
|
||||
|
||||
If your Jellyfin and LMS servers can both access the same storage (e.g., a NAS), you can enable **Direct File Access** mode in the plugin settings. This allows LMS to read files directly from disk, enabling:
|
||||
|
||||
- **Native smooth seeking** - no audio restart when scrubbing
|
||||
- **Full quality playback** - no transcoding needed
|
||||
- **Better performance** - no HTTP overhead
|
||||
|
||||
To configure, set the path mappings in the plugin settings:
|
||||
- **Jellyfin Media Path**: The path prefix as Jellyfin sees your library (e.g., `/media/music`)
|
||||
- **LMS Media Path**: The same location as LMS sees it (e.g., `/mnt/music` or `//nas/music`)
|
||||
|
||||
## Development
|
||||
|
||||
### Project Structure
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 127 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 50 KiB |
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"guid": "a5b8c9d0-1e2f-3a4b-5c6d-7e8f9a0b1c2d",
|
||||
"name": "JellyLMS",
|
||||
"description": "Stream Jellyfin audio to Logitech Media Server (LMS) for multi-room playback",
|
||||
"overview": "Bridges Jellyfin audio playback to LMS for synchronized multi-room playback across Squeezebox players",
|
||||
"owner": "dtourolle",
|
||||
"category": "Music",
|
||||
"versions": []
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user