Salastil/streamwall
1
0
Fork 0
mirror of https://github.com/streamwall/streamwall.git synced 2026-01-28 16:02:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add support for custom streams list

Browse Source 
Also, fix bug where unique stream ids were not being generated.
This commit is contained in:
Max Goodhart
2020-06-19 19:14:03 -07:00
parent e80b0075f6
commit 490b626a06
4 changed files with 144 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/browser/overlay.js
View File

@@ -20,22 +20,30 @@ Mousetrap.bind('ctrl+shift+i', () => {
ipcRenderer.send('devtools-overlay')
})
function Overlay({ spaces, streamData }) {
const activeSpaces = spaces.filter((s) => s.matches('displaying'))
function Overlay({ views, streams, customStreams }) {
const activeViews = views
.map(({ state, context }) => State.from(state, context))
.filter((s) => s.matches('displaying'))
return (
<div>
{activeSpaces.map((spaceState) => {
const { url, pos } = spaceState.context
const data = streamData.find((d) => url === d.Link)
const isListening = spaceState.matches('displaying.running.listening')
const isLoading = spaceState.matches('displaying.loading')
{activeViews.map((viewState) => {
const { url, pos } = viewState.context
const data = [...streams, ...customStreams].find((d) => url === d.Link)
const isListening = viewState.matches('displaying.running.listening')
const isLoading = viewState.matches('displaying.loading')
return (
<SpaceBorder pos={pos} isListening={isListening}>
{data && (
<StreamTitle isListening={isListening}>
<StreamIcon url={url} />
<span>
{data.Source} &ndash; {data.City} {data.State}
{data.hasOwnProperty('Label') ? (
data.Label
) : (
<>
{data.Source} &ndash; {data.City} {data.State}
</>
)}
</span>
</StreamTitle>
)}
@@ -49,21 +57,22 @@ function Overlay({ spaces, streamData }) {
}
function App() {
const [spaces, setSpaces] = useState([])
const [streamData, setStreamData] = useState([])
const [state, setState] = useState({
views: [],
streams: [],
customStreams: [],
})
useEffect(() => {
ipcRenderer.on('view-states', (ev, viewStates) => {
setSpaces(
viewStates.map(({ state, context }) => State.from(state, context)),
)
})
ipcRenderer.on('stream-data', (ev, data) => {
setStreamData(data)
ipcRenderer.on('state', (ev, state) => {
setState(state)
})
}, [])
return <Overlay spaces={spaces} streamData={streamData} />
const { views, streams, customStreams } = state
return (
<Overlay views={views} streams={streams} customStreams={customStreams} />
)
}
function StreamIcon({ url, ...props }) {