- {#each Object.entries($toasts) as [index, toast] (index)}
-
-
-
diff --git a/src/renderer/css.css b/src/renderer/css.css
index 23e9eb7..89a9329 100644
--- a/src/renderer/css.css
+++ b/src/renderer/css.css
@@ -28,6 +28,20 @@
--dm-button-secondary-bg-color-hover: #ddd !important;
}
+[data-sonner-toaster][data-theme='dark'] {
+ --normal-bg: var(--dark-color) !important;
+ --normal-border: none !important;
+ --normal-text: var(--dm-base-text-color) !important;
+
+ /* --success-bg: var(--success-color) !important; */
+ --success-border: none !important;
+ /* --success-text: var(--lm-base-text-color) !important; */
+
+ /* --error-bg: hsl(358, 76%, 10%); */
+ --error-border: none !important;
+ /* --error-text: hsl(358, 100%, 81%); */
+}
+
.material-symbols-outlined {
font-family: "Material Symbols Outlined Variable";
font-weight: normal;
diff --git a/src/renderer/modules/anilist.js b/src/renderer/modules/anilist.js
index f9b81b6..70c6fa7 100644
--- a/src/renderer/modules/anilist.js
+++ b/src/renderer/modules/anilist.js
@@ -3,7 +3,7 @@ import { writable } from 'simple-store-svelte'
import Bottleneck from 'bottleneck'
import { alToken } from '../views/Settings.svelte'
-import { addToast } from '../components/Toasts.svelte'
+import { toast } from 'svelte-sonner'
import { sleep } from './util.js'
const codes = {
@@ -106,10 +106,8 @@ if (alToken) {
function printError (error) {
console.warn(error)
- addToast({
- text: /* html */`Failed making request to anilist!
-
-
- {/each}
-{toast.title}
- {@html toast.text} -Try again in a minute.
${error.status || 429} - ${error.message || codes[error.status || 429]}`, - title: 'Search Failed', - type: 'danger', + toast.error('Search Failed', { + description: `Failed making request to anilist!\nTry again in a minute.\n${error.status || 429} - ${error.message || codes[error.status || 429]}`, duration: 3000 }) } diff --git a/src/renderer/modules/anime.js b/src/renderer/modules/anime.js index eca7bdd..6544efb 100644 --- a/src/renderer/modules/anime.js +++ b/src/renderer/modules/anime.js @@ -3,7 +3,7 @@ import { DOMPARSER, PromiseBatch, binarySearch } from './util.js' import { alRequest, alSearch } from './anilist.js' import anitomyscript from 'anitomyscript' import { media } from '../views/Player/MediaHandler.svelte' -import { addToast } from '../components/Toasts.svelte' +import { toast } from 'svelte-sonner' import { view } from '@/App.svelte' import { playAnime } from '../views/RSSView.svelte' @@ -15,7 +15,17 @@ window.addEventListener('paste', ({ clipboardData }) => { // WAIT image lookup o const item = clipboardData.items[0] if (!item) return const { type } = item - if (type.startsWith('image')) return traceAnime(item.getAsFile()) + if (type.startsWith('image')) { + const promise = traceAnime(item.getAsFile()) + toast.promise(promise, { + description: 'You can also paste an URL to an image.', + loading: 'Looking up anime for image...', + success: 'Found anime for image!', + error: 'Couldn\'t find anime for specified image! Try to remove black bars, or use a more detailed image.' + + }) + return + } if (!type.startsWith('text')) return item.getAsString(text => { if (torrentRx.exec(text)) { @@ -28,26 +38,19 @@ window.addEventListener('paste', ({ clipboardData }) => { // WAIT image lookup o } else if (imageRx.exec(text)) { src = text } - if (src) traceAnime(src) + if (src) { + const promise = traceAnime(src) + toast.promise(promise, { + description: 'You can also paste an URL to an image.', + loading: 'Looking up anime for image...', + success: 'Found anime for image!', + error: 'Couldn\'t find anime for specified image! Try to remove black bars, or use a more detailed image.' + }) + } } }) }) export async function traceAnime (image) { // WAIT lookup logic - if (image instanceof Blob) { - const reader = new FileReader() - reader.onload = e => { - addToast({ - title: 'Looking up anime for image', - text: /* html */`You can also paste an URL to an image!
${media.title.userPreferred} - ${episode - offset}`, - title: 'Parsing Error', - type: 'secondary' + toast('Parsing Error', { + description: `Failed resolving anime episode!\n${media.title.userPreferred} - ${episode - offset}` }) } return obj diff --git a/src/renderer/modules/providers/tosho.js b/src/renderer/modules/providers/tosho.js index afa7290..57a0e87 100644 --- a/src/renderer/modules/providers/tosho.js +++ b/src/renderer/modules/providers/tosho.js @@ -45,6 +45,8 @@ export default async function tosho ({ media, episode }) { found.seeders = complete } + if (!mapped?.length) throw new Error('no entries found') + return mapped } diff --git a/src/renderer/modules/rss.js b/src/renderer/modules/rss.js index 380716c..2548c0d 100644 --- a/src/renderer/modules/rss.js +++ b/src/renderer/modules/rss.js @@ -1,6 +1,6 @@ import { DOMPARSER } from '@/modules/util.js' import { set } from '@/views/Settings.svelte' -import { addToast } from '@/components/Toasts.svelte' +import { toast } from 'svelte-sonner' import { add } from '@/modules/torrent.js' import { resolveFileMedia, getEpisodeMetadataForMedia } from './anime.js' import { hasNextPage } from '@/modules/sections.js' @@ -49,19 +49,15 @@ export async function getRSSContent (url) { try { const res = await fetch(url) if (!res.ok) { - addToast({ - text: 'Failed fetching RSS!
' + res.statusText, - title: 'Search Failed', - type: 'danger' + toast.error('Search Failed', { + description: 'Failed fetching RSS!\n' + res.statusText }) console.error('Failed to fetch rss', res.statusText) } return DOMPARSER(await res.text(), 'text/xml') } catch (e) { - addToast({ - text: 'Failed fetching RSS!
' + e.message, - title: 'Search Failed', - type: 'danger' + toast.error('Search Failed', { + description: 'Failed fetching RSS!\n' + e.message }) console.error('Failed to fetch rss', e) } diff --git a/src/renderer/modules/scroll.js b/src/renderer/modules/scroll.js index 8e125fc..1612986 100644 --- a/src/renderer/modules/scroll.js +++ b/src/renderer/modules/scroll.js @@ -1,6 +1,6 @@ import { set } from '@/views/Settings.svelte' -export default function scroll (t, { speed = 120, smooth = 10 } = {}) { +export default function (t, { speed = 120, smooth = 10 } = {}) { if (!set.smoothScroll) return let moving = false let pos = 0 diff --git a/src/renderer/views/Player/Player.svelte b/src/renderer/views/Player/Player.svelte index 9d37d6d..80deab5 100644 --- a/src/renderer/views/Player/Player.svelte +++ b/src/renderer/views/Player/Player.svelte @@ -6,7 +6,7 @@ import { alEntry } from '@/modules/anilist.js' import Subtitles from '@/modules/subtitles.js' import { toTS, videoRx, fastPrettyBytes } from '@/modules/util.js' - import { addToast } from '../../components/Toasts.svelte' + import { toast } from 'svelte-sonner' import { getChaptersAniSkip } from '@/modules/anime.js' import Seekbar from 'perfect-seekbar' import { click } from '@/modules/click.js' @@ -71,10 +71,8 @@ function checkAudio () { if ('audioTracks' in HTMLVideoElement.prototype) { if (!video.audioTracks.length) { - addToast({ - text: "This torrent's audio codec is not supported, try a different release by disabling Autoplay Torrents in RSS settings.", - title: 'Audio Codec Unsupported', - type: 'danger' + toast.error('Audio Codec Unsupported', { + description: "This torrent's audio codec is not supported, try a different release by disabling Autoplay Torrents in RSS settings." }) } else if (video.audioTracks.length > 1) { const preferredTrack = [...video.audioTracks].find(({ language }) => language === set.audioLanguage) @@ -335,10 +333,8 @@ }) ]) canvas.remove() - addToast({ - text: 'Saved screenshot to clipboard.', - title: 'Screenshot', - type: 'success' + toast.success('Screenshot', { + description: 'Saved screenshot to clipboard.' }) } } @@ -830,31 +826,25 @@ break case target.error.MEDIA_ERR_NETWORK: console.warn('A network error caused the video download to fail part-way.', target.error) - addToast({ - text: 'A network error caused the video download to fail part-way. Click here to reload the video.', - title: 'Video Network Error', - type: 'danger', + toast.error('Video Network Error', { + description: 'A network error caused the video download to fail part-way. Click here to reload the video.', duration: 1000000, - click: () => target.load() + onClick: () => target.load() }) break case target.error.MEDIA_ERR_DECODE: console.warn('The video playback was aborted due to a corruption problem or because the video used features your browser did not support.', target.error) - addToast({ - text: 'The video playback was aborted due to a corruption problem. Click here to reload the video.', - title: 'Video Decode Error', - type: 'danger', + toast.error('Video Decode Error', { + description: 'The video playback was aborted due to a corruption problem. Click here to reload the video.', duration: 1000000, - click: () => target.load() + onClick: () => target.load() }) break case target.error.MEDIA_ERR_SRC_NOT_SUPPORTED: if (target.error.message !== 'MEDIA_ELEMENT_ERROR: Empty src attribute') { console.warn('The video could not be loaded, either because the server or network failed or because the format is not supported.', target.error) - addToast({ - text: 'The video could not be loaded, either because the server or network failed or because the format is not supported. Try a different release by disabling Autoplay Torrents in RSS settings.', - title: 'Video Codec Unsupported', - type: 'danger', + toast.error('Video Codec Unsupported', { + description: 'The video could not be loaded, either because the server or network failed or because the format is not supported. Try a different release by disabling Autoplay Torrents in RSS settings.', duration: 300000 }) } @@ -881,8 +871,7 @@ on:keypress={resetImmerse} on:mouseleave={immersePlayer}> {#if showKeybinds && !miniplayer} -
-
+
(showKeybinds = false)} tabindex='-1' role='button'>
diff --git a/src/renderer/views/RSSView.svelte b/src/renderer/views/RSSView.svelte
index 6de1d34..f196ea8 100644
--- a/src/renderer/views/RSSView.svelte
+++ b/src/renderer/views/RSSView.svelte
@@ -1,7 +1,7 @@
{item?.id || ''}