octo/mastoradio-fork
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refact status processing

Browse Source
This commit is contained in:
wryk
2020-02-15 23:12:53 +01:00
parent 307331855d
commit 49deded9bd
6 changed files with 183 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/Radio.svelte
View File

@ -1,5 +1,5 @@
<svelte:head>
<title>{`${ $current ? `${$current.metadata.title} ∴ ` : ''}Eldritch Radio`}</title>
<title>{`${ $current ? `${$current.title} ∴ ` : ''}Eldritch Radio`}</title>
</svelte:head>
<div class="app container">
@ -28,8 +28,8 @@
import Controls from '/components/Controls.svelte'
import Queue from '/components/Queue.svelte'
import Viewer from '/components/Viewer.svelte'
import { hashtagIterator, combinedIterator } from '/services/mastodon.js'
import { mkTracksIterator } from '/services/misc.js'
import { hashtagsIterator } from '/services/mastodon.js'
import { tracksIterator } from '/services/misc.js'
import { domain, hashtags, queue, next, current, enqueueing, select } from '/store.js'
@ -37,13 +37,10 @@
let currentUnsubcribe = null
onMount(async () => {
// const iterator = mkTracksIterator(hashtagIterator(get(domain), get(hashtags)[0]))
const domainValue = get(domain)
const hashtagsValue = get(hashtags)
const iterator = combinedIterator(
hashtagsValue.map(hashtag => mkTracksIterator(hashtagIterator(domainValue, hashtag)))
)
const iterator = tracksIterator(hashtagsIterator(domainValue, hashtagsValue))
const { value: first } = await iterator.next()