diff --git a/.gitignore b/.gitignore index e3be8f6..b635690 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ node_modules **/node_modules **/git_modules/ -package-lock.json \ No newline at end of file +package-lock.json + diff --git a/common/Router.svelte b/common/Router.svelte index 0236a89..3487009 100644 --- a/common/Router.svelte +++ b/common/Router.svelte @@ -16,6 +16,7 @@ import Search from './views/Search.svelte' import AiringSchedule from './views/AiringSchedule.svelte' import { readable } from 'simple-store-svelte' + import { files } from './views/Player/MediaHandler.svelte' // this is sooo hacky and possibly delaying viewer on startup export let page = 'home' @@ -23,7 +24,7 @@ $: maxwidth = $isMobile ? '200px' : '60rem' -
+
@@ -32,9 +33,9 @@ {:else if page === 'home'} -{:else if page === 'search'} - -{:else if page === 'schedule'} + +{:else if page === 'schedule' || page === 'search'} {:else if page === 'watchtogether'} diff --git a/common/components/Navbar.svelte b/common/components/Navbar.svelte index 54f6cdb..ccbf049 100644 --- a/common/components/Navbar.svelte +++ b/common/components/Navbar.svelte @@ -6,21 +6,22 @@ const view = getContext('view') export let page const links = [ - { - click: () => { - page = 'search' - }, - css: 'ml-auto', - page: 'search', - icon: 'search', - text: 'Search' - }, + // { + // click: () => { + // page = 'search' + // }, + // css: 'ml-auto', + // page: 'search', + // icon: 'search', + // text: 'Search' + // }, { click: () => { page = 'schedule' }, + css: 'ml-auto', page: 'schedule', - icon: 'schedule', + icon: 'search', text: 'Schedule' }, { diff --git a/common/modules/torrent.js b/common/modules/torrent.js index ad84e8a..92aa2da 100644 --- a/common/modules/torrent.js +++ b/common/modules/torrent.js @@ -3,6 +3,9 @@ import { page } from '@/App.svelte' import { toast } from 'svelte-sonner' import clipboard from './clipboard.js' import IPC from '@/modules/ipc.js' +import { settings } from '@/modules/settings.js' +import { get } from 'svelte/store'; + import 'browser-event-target-emitter' const torrentRx = /(^magnet:){1}|(^[A-F\d]{8,40}$){1}|(.*\.torrent$){1}/i @@ -49,7 +52,8 @@ class TorrentWorker extends EventTarget { export const client = new TorrentWorker() -client.send('load', localStorage.getItem('torrent')) +if (!get(settings).disableStartupVideo) //hacky but works :p + client.send('load', localStorage.getItem('torrent')) client.on('files', ({ detail }) => { files.set(detail) diff --git a/common/modules/util.js b/common/modules/util.js index 3ed3394..cfebe28 100644 --- a/common/modules/util.js +++ b/common/modules/util.js @@ -128,10 +128,12 @@ export const defaults = { playerDeband: false, rssQuality: '1080', rssFeedsNew: SUPPORTS.extensions ? [['New Releases', 'SubsPlease']] : [], + rssAutoplay: false, torrentSpeed: 5, // legacy downloadSpeed: 5, uploadSpeed: 1, slowSeeding: true, + disableStartupVideo: true, torrentPersist: false, torrentDHT: false, torrentPeX: false, @@ -140,7 +142,7 @@ export const defaults = { dhtPort: 0, missingFont: true, maxConns: 50, - subtitleRenderHeight: SUPPORTS.isAndroid ? '720' : '0', + subtitleRenderHeight: SUPPORTS.isAndroid ? '1080' : '0', subtitleLanguage: 'eng', audioLanguage: 'jpn', enableDoH: false, diff --git a/common/views/Settings/TorrentSettings.svelte b/common/views/Settings/TorrentSettings.svelte index 19a3b18..f905b51 100644 --- a/common/views/Settings/TorrentSettings.svelte +++ b/common/views/Settings/TorrentSettings.svelte @@ -165,7 +165,7 @@
- +