alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-28 10:30:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add a cancelable redirect handoff and drop the transitional migration status

Browse Source 
When the server finishes starting, show "Jellyfin started successfully" with a
5-second "Redirecting in N…" countdown and a Cancel button instead of reloading
immediately. Cancel stops the countdown and the background refresh so the
startup output can be reviewed, and offers a "Continue to Jellyfin" button to
reload manually. The buttons use the web client's emby-button styling.

Also drop the transitional "Applying migrations" activity: it only showed
briefly while the pending migration set was read, or for the whole step when
nothing was pending, so startup now goes from "Preparing migrations" straight
into "Running migration X of Y".
This commit is contained in:
Joshua M. Boniface
2026-06-25 00:42:31 -04:00
parent 2c98ad99db
commit 31070e8208
4 changed files with 127 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Server/ServerSetupApp/SetupServer.cs
View File

@@ -262,7 +262,7 @@ public sealed class SetupServer : IDisposable
/// Reports the current startup activity shown to all clients in the startup UI header.
/// Only pass generic, non-identifying text from <see cref="StartupActivity"/>.
/// </summary>
/// <param name="activity">A generic description such as <see cref="StartupActivity.ApplyingMigrations"/>.</param>
/// <param name="activity">A generic description such as <see cref="StartupActivity.PreparingMigrations"/>.</param>
internal static void ReportActivity(string activity)
{
_currentActivity = activity;

3
Jellyfin.Server/ServerSetupApp/StartupActivity.cs
View File

@@ -21,9 +21,6 @@ public static class StartupActivity
/// <summary>Preparing the system for migrations (e.g. taking safety backups).</summary>
public const string PreparingMigrations = "Preparing migrations";
/// <summary>Applying database/system migrations without a known count.</summary>
public const string ApplyingMigrations = "Applying migrations";
/// <summary>Restoring from a backup.</summary>
public const string RestoringBackup = "Restoring backup";

127
Jellyfin.Server/ServerSetupApp/index.mstemplate.html
View File

@@ -126,6 +126,63 @@
color: var(--jf-error);
}
/* Buttons — matching the web client's emby-button styles. */
.jf-button {
display: inline-flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
margin: 0;
padding: 0.9em 1em;
border: 0;
border-radius: 0.2em;
font-family: inherit;
font-size: inherit;
font-weight: 600;
line-height: 1.35;
cursor: pointer;
outline: none;
text-decoration: none;
transition: 0.2s;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
.jf-button-primary {
background: var(--jf-primary);
color: rgba(0, 0, 0, 0.87);
}
.jf-button-primary:hover,
.jf-button-primary:focus {
background: var(--jf-primary-dark);
}
.jf-button-secondary {
background: #424242;
color: var(--jf-text-secondary);
}
.jf-button-secondary:hover,
.jf-button-secondary:focus {
background: #616161;
}
/* Redirect countdown shown once the server is ready. */
.redirect-bar {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 1em;
margin-bottom: 1.5em;
text-align: center;
}
.redirect-countdown {
color: var(--jf-text-secondary);
}
/* Material (MDL) spinner — the same one the web client uses while loading. */
.mdl-spinner {
position: relative;
@@ -491,8 +548,8 @@
function poll() {
fetch(window.location.href, { cache: 'no-store' }).then(function (resp) {
if (resp.ok) {
// The real server is now answering (HTTP 200) -> load the actual app.
window.location.reload();
// The real server is now answering (HTTP 200) -> offer to continue to the app.
onServerReady();
return null;
}
return resp.text();
@@ -530,7 +587,71 @@
});
}
setInterval(poll, intervalMs);
// The server finished starting. Stop polling and present a cancelable countdown so the
// user can either ride the redirect into the app or stay to review the startup output.
function onServerReady() {
clearInterval(pollTimer);
var status = document.querySelector('.status');
var statusText = document.querySelector('.status-text');
var spinner = document.querySelector('.mdl-spinner');
if (spinner) {
spinner.style.display = 'none';
}
if (status) {
status.classList.add('is-success');
}
if (statusText) {
statusText.textContent = 'Jellyfin started successfully.';
}
if (!status) {
window.location.reload();
return;
}
var bar = document.createElement('div');
bar.className = 'redirect-bar';
var countdownText = document.createElement('span');
countdownText.className = 'redirect-countdown';
var cancelButton = document.createElement('button');
cancelButton.type = 'button';
cancelButton.className = 'jf-button jf-button-secondary';
cancelButton.textContent = 'Cancel';
bar.appendChild(countdownText);
bar.appendChild(cancelButton);
status.insertAdjacentElement('afterend', bar);
var remaining = 5;
function renderCountdown() {
countdownText.textContent = 'Redirecting in ' + remaining + '…';
}
renderCountdown();
var countdown = setInterval(function () {
remaining -= 1;
if (remaining <= 0) {
clearInterval(countdown);
window.location.reload();
return;
}
renderCountdown();
}, 1000);
// Cancel stops both the redirect and the refreshing, and offers a manual continue.
cancelButton.addEventListener('click', function () {
clearInterval(countdown);
bar.innerHTML = '';
var continueButton = document.createElement('button');
continueButton.type = 'button';
continueButton.className = 'jf-button jf-button-primary';
continueButton.textContent = 'Continue to Jellyfin';
continueButton.addEventListener('click', function () {
window.location.reload();
});
bar.appendChild(continueButton);
});
}
var pollTimer = setInterval(poll, intervalMs);
})();
</script>
</body>