Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29cd6dfaeb | ||
| 9180da16be | |||
| d3fbaef417 | |||
| c02469c6d0 | |||
| 1b7b836b3e |
@ -123,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
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -141,6 +141,47 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="verticalSection">
|
||||
<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 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>
|
||||
@ -406,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();
|
||||
@ -418,6 +566,19 @@
|
||||
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();
|
||||
@ -460,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);
|
||||
});
|
||||
@ -468,6 +634,16 @@
|
||||
e.preventDefault();
|
||||
return false;
|
||||
});
|
||||
|
||||
document.querySelector('#btnDiscoverPaths')
|
||||
.addEventListener('click', function() {
|
||||
discoverPaths();
|
||||
});
|
||||
|
||||
document.querySelector('#btnAddMapping')
|
||||
.addEventListener('click', function() {
|
||||
addPathMapping('', '');
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@ -172,8 +172,18 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
var itemId = _playlist[index];
|
||||
_playlistIndex = index;
|
||||
|
||||
var streamUrl = BuildStreamUrl(itemId);
|
||||
_logger.LogInformation("Playing item {Index}/{Total}: {Url}", index + 1, _playlist.Length, streamUrl);
|
||||
// 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);
|
||||
|
||||
@ -181,17 +191,11 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
CurrentItemId = itemId;
|
||||
IsPlaying = true;
|
||||
IsPaused = false;
|
||||
_seekOffsetTicks = 0; // Reset seek offset when starting a new track
|
||||
|
||||
// Look up the item for duration info
|
||||
_currentItem = _libraryManager.GetItemById(itemId);
|
||||
|
||||
// Seek to start position if specified
|
||||
if (startPositionTicks > 0)
|
||||
{
|
||||
var positionSeconds = startPositionTicks / TimeSpan.TicksPerSecond;
|
||||
await _lmsClient.SeekAsync(_player.MacAddress, positionSeconds).ConfigureAwait(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);
|
||||
@ -415,21 +419,35 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
if (playstateRequest.SeekPositionTicks.HasValue && CurrentItemId.HasValue)
|
||||
{
|
||||
var positionTicks = playstateRequest.SeekPositionTicks.Value;
|
||||
var positionSeconds = positionTicks / TimeSpan.TicksPerSecond;
|
||||
|
||||
// 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}",
|
||||
positionTicks / TimeSpan.TicksPerSecond,
|
||||
streamUrl);
|
||||
// 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);
|
||||
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("Set seek offset to {Ticks} ticks ({Seconds}s)", positionTicks, positionTicks / TimeSpan.TicksPerSecond);
|
||||
// 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
|
||||
{
|
||||
@ -532,6 +550,87 @@ 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);
|
||||
@ -549,7 +648,9 @@ public class LmsSessionController : ISessionController, IDisposable
|
||||
{
|
||||
// For seeking, we need to use transcoding (static=true doesn't support startTimeTicks)
|
||||
// Use MP3 transcoding with the start position
|
||||
url = $"{jellyfinUrl}/Audio/{itemId}/stream.mp3?audioCodec=mp3&audioBitRate=320000&startTimeTicks={startPositionTicks}";
|
||||
// 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
|
||||
{
|
||||
|
||||
38
README.md
38
README.md
@ -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:
|
||||
@ -168,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
|
||||
|
||||
20
manifest.json
Normal file
20
manifest.json
Normal file
@ -0,0 +1,20 @@
|
||||
[
|
||||
{
|
||||
"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": [
|
||||
{
|
||||
"version": "1.0.0",
|
||||
"changelog": "Release 1.0.0",
|
||||
"targetAbi": "10.10.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyLMS/releases/download/v1.0.0/jellylms_1.0.0.0.zip",
|
||||
"checksum": "b6194d5ceb5ec0ea711a48f6d34a290d",
|
||||
"timestamp": "2025-12-20T13:54:14Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
Loading…
x
Reference in New Issue
Block a user