diff --git a/package.json b/package.json index 4c6f385..3f21069 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "3.10.2", + "version": "3.10.3", "author": "ThaUnknown_ ", "description": "Stream anime torrents, real-time with no waiting for downloads.", "main": "src/index.js", @@ -66,12 +66,10 @@ "singleArchFiles": "node_modules/+(register-scheme|utp-native)/**", "category": "public.app-category.video", "icon": "build/icon.icns", - "target": [ - { - "arch": "universal", - "target": "dmg" - } - ] + "target": [{ + "arch": "universal", + "target": "dmg" + }] }, "win": { "artifactName": "${os}-${name}-${version}.${ext}", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dec383f..92ee976 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,7 +38,7 @@ dependencies: electron-updater: 4.6.5 jassub: 1.6.1 js-levenshtein: 1.1.6 - matroska-subtitles: github.com/ThaUnknown/matroska-subtitles/6241556509536ff09ba2ea3f050ceb7a3f12190a + matroska-subtitles: github.com/ThaUnknown/matroska-subtitles/446d0628ff0bcf13eb95184777615f3a0e6d8ae8 mime: 3.0.0 p2pcf: github.com/ThaUnknown/p2pcf/faefe2854c817315530636a58d07726de7050561 perfect-seekbar: 1.1.0 @@ -3254,10 +3254,10 @@ packages: version: 2.0.6 dev: false - github.com/ThaUnknown/matroska-subtitles/6241556509536ff09ba2ea3f050ceb7a3f12190a: - resolution: {tarball: https://codeload.github.com/ThaUnknown/matroska-subtitles/tar.gz/6241556509536ff09ba2ea3f050ceb7a3f12190a} + github.com/ThaUnknown/matroska-subtitles/446d0628ff0bcf13eb95184777615f3a0e6d8ae8: + resolution: {tarball: https://codeload.github.com/ThaUnknown/matroska-subtitles/tar.gz/446d0628ff0bcf13eb95184777615f3a0e6d8ae8} name: matroska-subtitles - version: 3.3.2 + version: 3.3.3 dependencies: ebml-stream: 1.0.3 pako: 2.1.0 diff --git a/src/renderer/src/lib/Player/MediaHandler.svelte b/src/renderer/src/lib/Player/MediaHandler.svelte index e0af090..60be925 100644 --- a/src/renderer/src/lib/Player/MediaHandler.svelte +++ b/src/renderer/src/lib/Player/MediaHandler.svelte @@ -107,7 +107,11 @@ result = videoFiles.filter(file => file.media.parseObject.anime_title === max) } - result.sort((a, b) => a.media.episode - b.media.episode) + result = result.filter(file => { + if (file.media.parseObject.anime_type?.toLowerCase() === 'nced') return false + if (file.media.parseObject.anime_type?.toLowerCase() === 'ncop') return false + return true + }).sort((a, b) => a.media.episode - b.media.episode) processed.set([...result, ...otherFiles]) await tick() diff --git a/src/renderer/src/lib/Player/Player.svelte b/src/renderer/src/lib/Player/Player.svelte index 0037418..84e8144 100644 --- a/src/renderer/src/lib/Player/Player.svelte +++ b/src/renderer/src/lib/Player/Player.svelte @@ -150,7 +150,7 @@ export let media - $: checkAvail(media) + $: checkAvail(current) let hasNext = false let hasLast = false function checkAvail () { @@ -646,7 +646,7 @@ if (detail.length) chapters = detail }) async function findChapters () { - if (!chapters.length) { + if (!chapters.length && current.media.media) { chapters = await getChaptersAniSkip(current, safeduration) } } @@ -684,7 +684,9 @@ const sanitised = [] let sum = 0 for (let { start, end, text } of chapters) { + if (start > safeduration * 1000) continue if (start < 0) start = 0 + if (end > safeduration * 1000) end = safeduration * 1000 if (!sanitised.length && start !== 0) { const size = start / 10 / safeduration sum += size diff --git a/vite.config.js b/vite.config.js index b07de6d..9ed9ac6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,6 +15,9 @@ export default defineConfig(({ mode }) => { }, plugins: [mode !== 'development' && commonjs(), svelte()], root, + server: { + hmr: false + }, base: './', build: { rollupOptions: {