Compare commits
No commits in common. "9723c13bd3e57266bd2d92560fe8ce5e9cce1542" and "046bf6afe444dbf4da0787da92fe5d039083f05d" have entirely different histories.
9723c13bd3
...
046bf6afe4
@ -95,19 +95,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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>
|
|
||||||
</div>
|
|
||||||
<div class="fieldDescription" style="margin-top: 10px;">
|
|
||||||
Users can access this page directly at: <code>/web/configurationpage?name=JellyLMS%20Sync</code>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button is="emby-button" type="submit" class="raised button-submit block emby-button">
|
<button is="emby-button" type="submit" class="raised button-submit block emby-button">
|
||||||
<span>Save</span>
|
<span>Save</span>
|
||||||
|
|||||||
@ -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>
|
<ItemGroup>
|
||||||
<None Remove="Configuration\configPage.html" />
|
<None Remove="Configuration\configPage.html" />
|
||||||
<None Remove="Configuration\syncPage.html" />
|
|
||||||
<EmbeddedResource Include="Configuration\configPage.html" />
|
<EmbeddedResource Include="Configuration\configPage.html" />
|
||||||
<EmbeddedResource Include="Configuration\syncPage.html" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -49,11 +49,6 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
|||||||
{
|
{
|
||||||
Name = Name,
|
Name = Name,
|
||||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
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)
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -178,15 +178,12 @@ public class LmsDeviceDiscoveryService : IHostedService, IDisposable
|
|||||||
var isNew = !_registeredDeviceIds.ContainsKey(player.MacAddress);
|
var isNew = !_registeredDeviceIds.ContainsKey(player.MacAddress);
|
||||||
|
|
||||||
// Add our controller to the session using EnsureController pattern
|
// Add our controller to the session using EnsureController pattern
|
||||||
var libraryManager = _serviceProvider.GetRequiredService<ILibraryManager>();
|
|
||||||
var (controller, created) = session.EnsureController<LmsSessionController>(
|
var (controller, created) = session.EnsureController<LmsSessionController>(
|
||||||
s => new LmsSessionController(
|
s => new LmsSessionController(
|
||||||
_logger,
|
_logger,
|
||||||
_lmsClient,
|
_lmsClient,
|
||||||
player,
|
player,
|
||||||
s,
|
s));
|
||||||
sessionManager,
|
|
||||||
libraryManager));
|
|
||||||
|
|
||||||
if (created)
|
if (created)
|
||||||
{
|
{
|
||||||
@ -224,6 +221,72 @@ public class LmsDeviceDiscoveryService : IHostedService, IDisposable
|
|||||||
player.MacAddress,
|
player.MacAddress,
|
||||||
session.Id);
|
session.Id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Report playback progress if the controller has an active item
|
||||||
|
if (controller is LmsSessionController lmsController)
|
||||||
|
{
|
||||||
|
await ReportPlaybackProgressAsync(sessionManager, session, lmsController).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ReportPlaybackProgressAsync(
|
||||||
|
ISessionManager sessionManager,
|
||||||
|
SessionInfo session,
|
||||||
|
LmsSessionController controller)
|
||||||
|
{
|
||||||
|
if (!controller.IsPlaying || !controller.CurrentItemId.HasValue)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Get current playback status from LMS
|
||||||
|
var status = await _lmsClient.GetPlayerStatusAsync(controller.PlayerMac).ConfigureAwait(false);
|
||||||
|
if (status == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the item from Jellyfin library
|
||||||
|
var libraryManager = _serviceProvider.GetService<ILibraryManager>();
|
||||||
|
if (libraryManager == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var item = libraryManager.GetItemById(controller.CurrentItemId.Value);
|
||||||
|
if (item == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate position in ticks
|
||||||
|
var positionTicks = (long)(status.Time * TimeSpan.TicksPerSecond);
|
||||||
|
|
||||||
|
// Determine if paused
|
||||||
|
var isPaused = status.Mode == "pause";
|
||||||
|
|
||||||
|
// Create playback progress info
|
||||||
|
var progressInfo = new PlaybackProgressInfo
|
||||||
|
{
|
||||||
|
ItemId = controller.CurrentItemId.Value,
|
||||||
|
SessionId = session.Id,
|
||||||
|
IsPaused = isPaused,
|
||||||
|
PositionTicks = positionTicks,
|
||||||
|
PlayMethod = PlayMethod.DirectStream,
|
||||||
|
CanSeek = true,
|
||||||
|
IsMuted = status.Volume == 0,
|
||||||
|
VolumeLevel = status.Volume
|
||||||
|
};
|
||||||
|
|
||||||
|
// Report progress to session manager
|
||||||
|
await sessionManager.OnPlaybackProgress(progressInfo).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogDebug(ex, "Error reporting playback progress for player {Name}", controller.PlayerMac);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
|||||||
@ -3,8 +3,6 @@ using System.Text.Json;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Jellyfin.Plugin.JellyLMS.Models;
|
using Jellyfin.Plugin.JellyLMS.Models;
|
||||||
using MediaBrowser.Controller.Entities;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Session;
|
using MediaBrowser.Controller.Session;
|
||||||
using MediaBrowser.Model.Session;
|
using MediaBrowser.Model.Session;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@ -15,17 +13,12 @@ namespace Jellyfin.Plugin.JellyLMS.Services;
|
|||||||
/// Session controller for LMS player devices.
|
/// Session controller for LMS player devices.
|
||||||
/// Enables Jellyfin to send playback commands to LMS players via the cast interface.
|
/// Enables Jellyfin to send playback commands to LMS players via the cast interface.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class LmsSessionController : ISessionController, IDisposable
|
public class LmsSessionController : ISessionController
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly ILmsApiClient _lmsClient;
|
private readonly ILmsApiClient _lmsClient;
|
||||||
private readonly LmsPlayer _player;
|
private readonly LmsPlayer _player;
|
||||||
private readonly SessionInfo _session;
|
private readonly SessionInfo _session;
|
||||||
private readonly ISessionManager _sessionManager;
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
|
||||||
private Timer? _progressTimer;
|
|
||||||
private bool _disposed;
|
|
||||||
private BaseItem? _currentItem;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="LmsSessionController"/> class.
|
/// Initializes a new instance of the <see cref="LmsSessionController"/> class.
|
||||||
@ -34,22 +27,16 @@ public class LmsSessionController : ISessionController, IDisposable
|
|||||||
/// <param name="lmsClient">The LMS API client.</param>
|
/// <param name="lmsClient">The LMS API client.</param>
|
||||||
/// <param name="player">The LMS player this controller manages.</param>
|
/// <param name="player">The LMS player this controller manages.</param>
|
||||||
/// <param name="session">The Jellyfin session associated with this controller.</param>
|
/// <param name="session">The Jellyfin session associated with this controller.</param>
|
||||||
/// <param name="sessionManager">The session manager for reporting playback events.</param>
|
|
||||||
/// <param name="libraryManager">The library manager for item lookups.</param>
|
|
||||||
public LmsSessionController(
|
public LmsSessionController(
|
||||||
ILogger logger,
|
ILogger logger,
|
||||||
ILmsApiClient lmsClient,
|
ILmsApiClient lmsClient,
|
||||||
LmsPlayer player,
|
LmsPlayer player,
|
||||||
SessionInfo session,
|
SessionInfo session)
|
||||||
ISessionManager sessionManager,
|
|
||||||
ILibraryManager libraryManager)
|
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_lmsClient = lmsClient;
|
_lmsClient = lmsClient;
|
||||||
_player = player;
|
_player = player;
|
||||||
_session = session;
|
_session = session;
|
||||||
_sessionManager = sessionManager;
|
|
||||||
_libraryManager = libraryManager;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -152,148 +139,12 @@ public class LmsSessionController : ISessionController, IDisposable
|
|||||||
IsPlaying = true;
|
IsPlaying = true;
|
||||||
IsPaused = false;
|
IsPaused = false;
|
||||||
|
|
||||||
// Look up the item for duration info
|
|
||||||
_currentItem = _libraryManager.GetItemById(itemId);
|
|
||||||
|
|
||||||
// Seek to start position if specified
|
// Seek to start position if specified
|
||||||
var startPositionTicks = 0L;
|
|
||||||
if (playRequest.StartPositionTicks.HasValue && playRequest.StartPositionTicks.Value > 0)
|
if (playRequest.StartPositionTicks.HasValue && playRequest.StartPositionTicks.Value > 0)
|
||||||
{
|
{
|
||||||
startPositionTicks = playRequest.StartPositionTicks.Value;
|
var positionSeconds = playRequest.StartPositionTicks.Value / TimeSpan.TicksPerSecond;
|
||||||
var positionSeconds = startPositionTicks / TimeSpan.TicksPerSecond;
|
|
||||||
await _lmsClient.SeekAsync(_player.MacAddress, positionSeconds).ConfigureAwait(false);
|
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ReportPlaybackStartAsync(Guid itemId, long positionTicks)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var startInfo = new PlaybackStartInfo
|
|
||||||
{
|
|
||||||
ItemId = itemId,
|
|
||||||
SessionId = _session.Id,
|
|
||||||
PositionTicks = positionTicks,
|
|
||||||
PlayMethod = PlayMethod.DirectStream,
|
|
||||||
CanSeek = true,
|
|
||||||
IsPaused = false,
|
|
||||||
IsMuted = false
|
|
||||||
};
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Reporting playback start for item {ItemId}, duration: {Duration}",
|
|
||||||
itemId,
|
|
||||||
_currentItem?.RunTimeTicks);
|
|
||||||
await _sessionManager.OnPlaybackStart(startInfo).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Failed to report playback start");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void StartProgressTimer()
|
|
||||||
{
|
|
||||||
// Stop any existing timer
|
|
||||||
_progressTimer?.Dispose();
|
|
||||||
|
|
||||||
// Report progress every 2 seconds
|
|
||||||
_progressTimer = new Timer(
|
|
||||||
async _ => await ReportPlaybackProgressAsync().ConfigureAwait(false),
|
|
||||||
null,
|
|
||||||
TimeSpan.FromSeconds(2),
|
|
||||||
TimeSpan.FromSeconds(2));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void StopProgressTimer()
|
|
||||||
{
|
|
||||||
_progressTimer?.Dispose();
|
|
||||||
_progressTimer = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ReportPlaybackProgressAsync()
|
|
||||||
{
|
|
||||||
if (!IsPlaying || !CurrentItemId.HasValue)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var status = await _lmsClient.GetPlayerStatusAsync(_player.MacAddress).ConfigureAwait(false);
|
|
||||||
if (status == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var positionTicks = (long)(status.Time * TimeSpan.TicksPerSecond);
|
|
||||||
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")
|
|
||||||
{
|
|
||||||
_logger.LogInformation("LMS playback stopped, reporting to Jellyfin");
|
|
||||||
await ReportPlaybackStoppedAsync().ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var progressInfo = new PlaybackProgressInfo
|
|
||||||
{
|
|
||||||
ItemId = CurrentItemId.Value,
|
|
||||||
SessionId = _session.Id,
|
|
||||||
IsPaused = isPaused,
|
|
||||||
PositionTicks = positionTicks,
|
|
||||||
PlayMethod = PlayMethod.DirectStream,
|
|
||||||
CanSeek = true,
|
|
||||||
IsMuted = status.Volume == 0,
|
|
||||||
VolumeLevel = status.Volume
|
|
||||||
};
|
|
||||||
|
|
||||||
await _sessionManager.OnPlaybackProgress(progressInfo).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(ex, "Error reporting playback progress");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ReportPlaybackStoppedAsync()
|
|
||||||
{
|
|
||||||
if (!CurrentItemId.HasValue)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
StopProgressTimer();
|
|
||||||
|
|
||||||
var stopInfo = new PlaybackStopInfo
|
|
||||||
{
|
|
||||||
ItemId = CurrentItemId.Value,
|
|
||||||
SessionId = _session.Id
|
|
||||||
};
|
|
||||||
|
|
||||||
_logger.LogInformation("Reporting playback stopped for item {ItemId}", CurrentItemId.Value);
|
|
||||||
await _sessionManager.OnPlaybackStopped(stopInfo).ConfigureAwait(false);
|
|
||||||
|
|
||||||
IsPlaying = false;
|
|
||||||
IsPaused = false;
|
|
||||||
CurrentItemId = null;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Failed to report playback stopped");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -316,7 +167,9 @@ public class LmsSessionController : ISessionController, IDisposable
|
|||||||
case PlaystateCommand.Stop:
|
case PlaystateCommand.Stop:
|
||||||
var stopResult = await _lmsClient.StopAsync(_player.MacAddress).ConfigureAwait(false);
|
var stopResult = await _lmsClient.StopAsync(_player.MacAddress).ConfigureAwait(false);
|
||||||
_logger.LogInformation("Stop command result: {Result}", stopResult);
|
_logger.LogInformation("Stop command result: {Result}", stopResult);
|
||||||
await ReportPlaybackStoppedAsync().ConfigureAwait(false);
|
IsPlaying = false;
|
||||||
|
IsPaused = false;
|
||||||
|
CurrentItemId = null;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PlaystateCommand.Pause:
|
case PlaystateCommand.Pause:
|
||||||
@ -449,30 +302,4 @@ public class LmsSessionController : ISessionController, IDisposable
|
|||||||
|
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Disposes managed resources.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">Whether to dispose managed resources.</param>
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (_disposed)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
StopProgressTimer();
|
|
||||||
}
|
|
||||||
|
|
||||||
_disposed = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user