diff --git a/package.json b/package.json index 35c7bd4..44d08a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "0.1.0", + "version": "0.1.1", "author": "ThaUnknown_", "main": "src/index.js", "scripts": { diff --git a/src/index.js b/src/index.js index e0049d4..c7a3b18 100644 --- a/src/index.js +++ b/src/index.js @@ -40,7 +40,11 @@ function createWindow () { protocol.registerHttpProtocol('miru', (req, cb) => { const token = req.url.slice(7) - mainWindow.loadURL(path.join(__dirname, '/renderer/dist/index.html' + token)) + if (process.env.NODE_ENV !== 'development ') { + mainWindow.loadURL(path.join(__dirname, '/renderer/dist/index.html' + token)) + } else { + mainWindow.loadURL('http://localhost:3000/' + token) + } }) // mainWindow.removeMenu() diff --git a/src/renderer/src/lib/Router.svelte b/src/renderer/src/lib/Router.svelte index 090a9cb..0f5cecb 100644 --- a/src/renderer/src/lib/Router.svelte +++ b/src/renderer/src/lib/Router.svelte @@ -1,19 +1,20 @@ + +
- + {#if page === 'schedule'} {:else if page === 'settings'} diff --git a/src/renderer/src/lib/pages/Player.svelte b/src/renderer/src/lib/pages/Player.svelte index 244d1d2..b50d68b 100644 --- a/src/renderer/src/lib/pages/Player.svelte +++ b/src/renderer/src/lib/pages/Player.svelte @@ -149,6 +149,13 @@ subs.findSubtitleFiles(current) } } + } else { + media = null + fileMedia = null + hadImage = false + src = '' + video?.load() + currentTime = 0 } } @@ -160,14 +167,12 @@ interval: undefined, video: undefined }) - src = '' - video?.load() completed = false file.getStreamURL((err, url) => { src = url current = file video?.load() - currentTime = 0 + paused = false }) } } @@ -703,7 +708,7 @@
people - {torrent.peers} + {torrent.peers || 0} arrow_downward {fastPrettyBytes(torrent.down)}/s arrow_upward @@ -866,7 +871,7 @@ background-color: var(--dark-color-light); will-change: width; } - .player.miniplayer{ + .player.miniplayer { background: #00000066; backdrop-filter: blur(3px); } diff --git a/src/renderer/src/modules/torrent.js b/src/renderer/src/modules/torrent.js index 88acc12..6620875 100644 --- a/src/renderer/src/modules/torrent.js +++ b/src/renderer/src/modules/torrent.js @@ -1,5 +1,6 @@ import WebTorrent from 'webtorrent' import { set } from '@/lib/pages/Settings.svelte' +import { files } from '@/lib/Router.svelte' import { page } from '@/App.svelte' export const client = new WebTorrent({ downloadLimit: set.torrentSpeed * 1048576 || 0, @@ -31,10 +32,16 @@ if (worker) { } }) } +window.client = client +client.on('torrent', torrent => { + console.log('hash', torrent.infoHash) + files.set(torrent.files) +}) export function add (torrentID) { if (torrentID) { if (client.torrents.length) client.remove(client.torrents[0].infoHash) + files.set([]) page.set('player') client.add(torrentID, { path: set.torrentPath,