From cd14f12fd102efa970bad1b37fac7f4f384f794f Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Fri, 5 Aug 2022 18:21:43 +0200 Subject: [PATCH] chore: bump p2pcf fix: anime list state toggling fix: w2g GC --- package.json | 4 +- pnpm-lock.yaml | 41 +++++++++++-------- .../src/lib/ViewAnime/Controls.svelte | 11 ++--- .../lib/WatchTogether/WatchTogether.svelte | 1 + 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 585a508..fcd1a0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "2.14.4", + "version": "2.9.9", "author": "ThaUnknown_ ", "main": "src/index.js", "homepage": "https://github.com/ThaUnknown/miru#readme", @@ -114,7 +114,7 @@ "jassub": "^1.1.8", "matroska-subtitles": "github:ThaUnknown/matroska-subtitles#patch", "mime": "^3.0.0", - "p2pcf": "1.3.0", + "p2pcf": "1.3.5", "pump": "^3.0.0", "quartermoon": "^1.2.1", "range-parser": "^1.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f818e60..6d92062 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ specifiers: jassub: ^1.1.8 matroska-subtitles: github:ThaUnknown/matroska-subtitles#patch mime: ^3.0.0 - p2pcf: 1.3.0 + p2pcf: 1.3.5 pump: ^3.0.0 quartermoon: ^1.2.1 range-parser: ^1.2.1 @@ -37,7 +37,7 @@ dependencies: jassub: 1.1.8 matroska-subtitles: github.com/ThaUnknown/matroska-subtitles/70bee097ad540e07d9e31b8f91f1dd865f7f2b45 mime: 3.0.0 - p2pcf: 1.3.0 + p2pcf: 1.3.5 pump: 3.0.0 quartermoon: 1.2.1 range-parser: 1.2.1 @@ -207,7 +207,7 @@ packages: /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.6.3 + '@types/node': 18.6.4 dev: true /@types/glob/7.2.0: @@ -215,14 +215,14 @@ packages: requiresBuild: true dependencies: '@types/minimatch': 3.0.5 - '@types/node': 18.6.3 + '@types/node': 18.6.4 dev: true optional: true /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 16.11.47 + '@types/node': 18.6.4 dev: true /@types/minimatch/3.0.5: @@ -238,15 +238,15 @@ packages: resolution: {integrity: sha512-fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g==} dev: true - /@types/node/18.6.3: - resolution: {integrity: sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==} + /@types/node/18.6.4: + resolution: {integrity: sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==} dev: true /@types/plist/3.0.2: resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} requiresBuild: true dependencies: - '@types/node': 18.6.3 + '@types/node': 18.6.4 xmlbuilder: 15.1.1 dev: true optional: true @@ -254,7 +254,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 16.11.47 + '@types/node': 18.6.4 dev: true /@types/semver/7.3.10: @@ -271,8 +271,8 @@ packages: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} dev: true - /@types/yargs/17.0.10: - resolution: {integrity: sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==} + /@types/yargs/17.0.11: + resolution: {integrity: sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==} dependencies: '@types/yargs-parser': 21.0.0 dev: true @@ -315,6 +315,7 @@ packages: /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + requiresBuild: true dependencies: fast-deep-equal: 3.1.3 fast-json-stable-stringify: 2.1.0 @@ -1128,7 +1129,7 @@ packages: engines: {node: '>=14.0.0'} hasBin: true dependencies: - '@types/yargs': 17.0.10 + '@types/yargs': 17.0.11 app-builder-lib: 22.14.13 builder-util: 22.14.13 builder-util-runtime: 8.9.2 @@ -1512,6 +1513,7 @@ packages: /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + requiresBuild: true dev: true /fast-fifo/1.1.0: @@ -1531,6 +1533,7 @@ packages: /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + requiresBuild: true dev: true /fast-readable-async-iterator/1.1.1: @@ -2020,6 +2023,7 @@ packages: /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + requiresBuild: true dev: true /json-stringify-safe/5.0.1: @@ -2372,8 +2376,8 @@ packages: engines: {node: '>=6'} dev: true - /p2pcf/1.3.0: - resolution: {integrity: sha512-kh4m+AjviM6LuocHChxx5YRvNbmIFsM6JZQDodpzIJ+xIxGVILbITmZt1PvA/t8u28VtsPfF9cHg6d377+gQqA==} + /p2pcf/1.3.5: + resolution: {integrity: sha512-+5Y7RxOyVMCNsFuQWBza0kb9jat3mK1DMIaaTSRcSWEylEw2rYgSO6MEELGj/clhq0LII+3yCMXTVEhO1O49Qw==} dependencies: array-buffer-to-hex: 1.0.0 base64-arraybuffer: 1.0.2 @@ -2495,6 +2499,7 @@ packages: /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} + requiresBuild: true dev: true /pupa/2.1.1: @@ -3185,6 +3190,7 @@ packages: /uri-js/4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + requiresBuild: true dependencies: punycode: 2.1.1 dev: true @@ -3445,7 +3451,6 @@ packages: /xmlbuilder/15.1.1: resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==} engines: {node: '>=8.0'} - requiresBuild: true dev: true /y18n/5.0.8: @@ -3456,8 +3461,8 @@ packages: /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - /yargs-parser/21.1.0: - resolution: {integrity: sha512-xzm2t63xTV/f7+bGMSRzLhUNk1ajv/tDoaD5OeGyC3cFo2fl7My9Z4hS3q2VdQ7JaLvTxErO8Jp5pRIFGMD/zg==} + /yargs-parser/21.1.1: + resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} dev: true @@ -3471,7 +3476,7 @@ packages: require-directory: 2.1.1 string-width: 4.2.3 y18n: 5.0.8 - yargs-parser: 21.1.0 + yargs-parser: 21.1.1 dev: true /yauzl/2.10.0: diff --git a/src/renderer/src/lib/ViewAnime/Controls.svelte b/src/renderer/src/lib/ViewAnime/Controls.svelte index ea0b9a1..5c24835 100644 --- a/src/renderer/src/lib/ViewAnime/Controls.svelte +++ b/src/renderer/src/lib/ViewAnime/Controls.svelte @@ -8,15 +8,16 @@ import { playAnime } from '../RSSView.svelte' export let media = null const toggleStatusMap = { - CURRENT: true, - COMPLETED: true, - PAUSED: true, - REPEATING: true + CURRENT: 'DROPPED', + COMPLETED: 'REPEATING', + PAUSED: 'CURRENT', + REPEATING: 'CURRENT', + DROPPED: 'PLANNING' } async function toggleStatus () { if (media.mediaListEntry?.status !== 'PLANNING') { // add - await setStatus((media.mediaListEntry?.status in toggleStatusMap) ? 'DROPPED' : 'CURRENT') + await setStatus(toggleStatusMap[media.mediaListEntry?.status] || 'PLANNING') } else { // delete const variables = { diff --git a/src/renderer/src/lib/WatchTogether/WatchTogether.svelte b/src/renderer/src/lib/WatchTogether/WatchTogether.svelte index 42806ea..0e110b5 100644 --- a/src/renderer/src/lib/WatchTogether/WatchTogether.svelte +++ b/src/renderer/src/lib/WatchTogether/WatchTogether.svelte @@ -21,6 +21,7 @@ export const state = writable(false) let p2pcf = null function joinLobby (code = generateRandomHexCode(16)) { + if (p2pcf) cleanup() p2pcf = new P2PCF(generateRandomHexCode(16), code) p2pcf.on('peerconnect', async peer => { console.log(peer.id)