diff --git a/package.json b/package.json index fb1032f..0da7a57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "6.4.0", + "version": "6.4.1", "license": "BUSL-1.1", "private": true, "packageManager": "pnpm@9.14.4", diff --git a/src/lib/components/EpisodesList.svelte b/src/lib/components/EpisodesList.svelte index 9c35367..0674eaf 100644 --- a/src/lib/components/EpisodesList.svelte +++ b/src/lib/components/EpisodesList.svelte @@ -83,7 +83,7 @@
{#each getPage(currentPage, episodeList) as { episode, image, title, summary, airingAt, airdate, filler, length } (episode)} - {@const watched = _progress >= episode} + {@const watched = _progress >= episode && !completed} {@const target = _progress + 1 === episode}
play(episode)} diff --git a/src/lib/components/ui/sonner/sonner.svelte b/src/lib/components/ui/sonner/sonner.svelte index 8e3ec72..352862c 100644 --- a/src/lib/components/ui/sonner/sonner.svelte +++ b/src/lib/components/ui/sonner/sonner.svelte @@ -11,7 +11,7 @@ toastOptions={{ classes: { toast: 'group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg', - description: 'group-[.toast]:text-muted-foreground', + description: 'group-[.toast]:text-muted-foreground whitespace-pre-line', actionButton: 'group-[.toast]:bg-primary group-[.toast]:text-primary-foreground', cancelButton: 'group-[.toast]:bg-muted group-[.toast]:text-muted-foreground' } diff --git a/src/lib/components/ui/torrentclient/overview.svelte b/src/lib/components/ui/torrentclient/overview.svelte index 054f057..578eba2 100644 --- a/src/lib/components/ui/torrentclient/overview.svelte +++ b/src/lib/components/ui/torrentclient/overview.svelte @@ -127,7 +127,7 @@ Remaining
-
{eta(torrent.time.remaining)}
+
{eta(torrent.time.remaining / 1000)}
diff --git a/src/lib/modules/update.ts b/src/lib/modules/update.ts index ac8d918..d67b462 100644 --- a/src/lib/modules/update.ts +++ b/src/lib/modules/update.ts @@ -3,10 +3,19 @@ import { compare, diff } from 'semver' import native from './native' import { version } from '$app/environment' +import { highEntropyValues } from '$lib/utils' + +export const isBrokenVeryBadly = native.version().then(async nativeVersion => { + const entr = await highEntropyValues + if (entr && entr.platform !== 'Windows') return false + return compare(nativeVersion, '6.4.4') === -1 && compare(nativeVersion, '6.4.0') !== -1 +}) async function compareVersions (): Promise<'ui' | 'client' | undefined> { const nativeVersion = await native.version() const releaseType = diff(version, nativeVersion) + // TODO: REMOVE MEEE!!! + if (await isBrokenVeryBadly) return 'client' if (!releaseType) return if (releaseType === 'patch') return diff --git a/src/routes/update/+page.svelte b/src/routes/update/+page.svelte index 9067834..fc5976c 100644 --- a/src/routes/update/+page.svelte +++ b/src/routes/update/+page.svelte @@ -1,13 +1,26 @@
@@ -17,18 +30,24 @@
Update Required
A mandatory update is available for the {#await outdatedComponent then name}{name}{/await}.
Please update to continue.
- {#await outdatedComponent then name} - {#if name === 'client'} - {#await native.updateReady()} - - {:then _} - - {/await} + {#await isBrokenVeryBadly then brokey} + {#if brokey} + {:else} - {#await uiUpdate} - - {:then _} - + {#await outdatedComponent then name} + {#if name === 'client'} + {#await native.updateReady()} + + {:then _} + + {/await} + {:else} + {#await uiUpdate} + + {:then _} + + {/await} + {/if} {/await} {/if} {/await}