mirror of
https://github.com/Dangoware/dango-music-player.git
synced 2025-06-22 14:42:56 -05:00
moved react components to their own files for easier readability
This commit is contained in:
MrDulfin
parent
367d2ceda3
commit
83339b47e7
11 changed files with 594 additions and 569 deletions
3
.helix/ignore
Normal file
3
.helix/ignore
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
*.png
|
||||
*.ico
|
||||
*.icns
|
||||
565
src/App.tsx
565
src/App.tsx
|
|
@ -1,565 +0,0 @@
|
|||
import React, { MutableRefObject, useEffect, useRef, useState } from "react";
|
||||
import { convertFileSrc, invoke } from "@tauri-apps/api/core";
|
||||
import "./App.css";
|
||||
// import { EventEmitter } from "@tauri-apps/plugin-shell";
|
||||
// import { listen } from "@tauri-apps/api/event";
|
||||
// import { fetch } from "@tauri-apps/plugin-http";
|
||||
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import { PhysicalPosition } from "@tauri-apps/api/window";
|
||||
import { Menu, Submenu, SubmenuOptions } from "@tauri-apps/api/menu";
|
||||
import { Config } from "./bindings/Config";
|
||||
import { PlaybackInfo } from "./bindings/PlaybackInfo";
|
||||
import { PlayerLocation } from "./bindings/PlayerLocation";
|
||||
import { URI } from "./bindings/URI";
|
||||
import { Song } from "./bindings/Song";
|
||||
|
||||
const appWindow = getCurrentWebviewWindow();
|
||||
|
||||
// This needs to be changed to properly reflect cursor position
|
||||
// this will do for now.
|
||||
async function contextMenuPosition(event: React.MouseEvent) {
|
||||
return new PhysicalPosition(event.clientX, event.clientY);
|
||||
}
|
||||
|
||||
function App() {
|
||||
const library = useState<JSX.Element[]>([]);
|
||||
const [queue, setQueue] = useState<JSX.Element[]>([]);
|
||||
const [playing, setPlaying] = useState(false);
|
||||
const [playlists, setPlaylists] = useState<JSX.Element[]>([]);
|
||||
const [viewName, setViewName] = useState("Library");
|
||||
const playlistsInfo= useRef<PlaylistInfo[]>([]);
|
||||
const selectedSongMain = useRef<SongProps>();
|
||||
const selectedSongQueue = useRef<selectedQueueSong>({uuid: "0", index: 0, location: "Library"});
|
||||
const setSelectedSongMain = (props: SongProps) => {selectedSongMain.current = props;}
|
||||
const setSelectedSongQueue = (song: selectedQueueSong) => {selectedSongQueue.current = song; console.log(selectedSongQueue)}
|
||||
|
||||
const [nowPlaying, setNowPlaying] = useState<JSX.Element>(
|
||||
<NowPlaying
|
||||
title="Title"
|
||||
album="Album"
|
||||
artist="Artist"
|
||||
artwork={<img src={convertFileSrc("abc") + "?" + "default" } id="nowPlayingArtwork" alt="Now Playing Artwork" key={'default_image'} />}
|
||||
/>
|
||||
);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<Song>("now_playing_change", ({ payload, }) => {
|
||||
const displayArtwork = () => {
|
||||
invoke('display_album_art', { uuid: payload.uuid }).then(() => {})
|
||||
}
|
||||
|
||||
setNowPlaying(
|
||||
<NowPlaying
|
||||
title={ payload.tags.Title }
|
||||
album={ payload.tags.Album }
|
||||
artist={ payload.tags.Artist }
|
||||
artwork={ <img src={convertFileSrc("abc") + "?" + payload.uuid } id="nowPlayingArtwork" alt="Now Playing Artwork" key={payload.uuid} onDoubleClick={ displayArtwork } /> }
|
||||
/>
|
||||
)
|
||||
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<null>("queue_updated", (_) => {
|
||||
// console.log(event);
|
||||
invoke('get_queue').then((_songs) => {
|
||||
let songs = _songs as [Song, PlayerLocation][];
|
||||
setQueue(
|
||||
songs.filter((_, i) => i != 0).map((song, i) =>
|
||||
<QueueSong
|
||||
song={ song[0] }
|
||||
location={ song[1] }
|
||||
index={i+1}
|
||||
key={ Math.floor((Math.random() * 100_000_000_000) + 1) + '_' + Date.now() }
|
||||
setSelectedSong={ setSelectedSongQueue }
|
||||
/>
|
||||
)
|
||||
)
|
||||
})
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<boolean>("playing", (isPlaying) => {
|
||||
setPlaying(isPlaying.payload)
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
invoke("start_controller").then(() => {});
|
||||
}, [])
|
||||
|
||||
|
||||
return (
|
||||
<main>
|
||||
<div className="container">
|
||||
<div className="leftSide">
|
||||
<PlaylistHead playlists={ playlists } setPlaylists={ setPlaylists } setViewName={ setViewName } setLibrary={ library[1] } playlistsInfo={ playlistsInfo } setSelected={ setSelectedSongMain } />
|
||||
<MainView lib_ref={ library } viewName={ viewName } playlistsInfo={ playlistsInfo } setSelected={ setSelectedSongMain } selectedSong={ selectedSongMain} />
|
||||
</div>
|
||||
<div className="rightSide">
|
||||
{ nowPlaying }
|
||||
<Queue songs={ queue } selectedSong={ selectedSongQueue } />
|
||||
</div>
|
||||
</div>
|
||||
<div className="bottom">
|
||||
<PlayBar playing={ playing } setPlaying={ setPlaying } />
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
||||
interface PlaylistInfo {
|
||||
uuid: string,
|
||||
name: string,
|
||||
}
|
||||
|
||||
|
||||
interface PlaylistHeadProps {
|
||||
playlists: JSX.Element[]
|
||||
setPlaylists: React.Dispatch<React.SetStateAction<JSX.Element[]>>,
|
||||
setViewName: React.Dispatch<React.SetStateAction<string>>,
|
||||
setLibrary: React.Dispatch<React.SetStateAction<JSX.Element[]>>,
|
||||
playlistsInfo: MutableRefObject<PlaylistInfo[]>,
|
||||
setSelected: (props: SongProps) => void,
|
||||
}
|
||||
|
||||
function PlaylistHead({ playlists, setPlaylists, setViewName, setLibrary, playlistsInfo, setSelected }: PlaylistHeadProps) {
|
||||
function getPlaylist(playlist: PlaylistInfo) {
|
||||
invoke('get_playlist', { uuid: playlist.uuid }).then((list) => {
|
||||
setLibrary([...(list as Song[]).map((song, i) => {
|
||||
// console.log(song);
|
||||
const reload = () => getPlaylist(playlist)
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation={ {"Playlist" : playlist.uuid } }
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
reload = { reload }
|
||||
index = { i }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
setViewName( playlist.name )
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<PlaylistInfo[]>("playlists_gotten", (_res) => {
|
||||
const res = _res.payload;
|
||||
// console.log(event);
|
||||
playlistsInfo.current = [...res];
|
||||
// console.log(playlistsInfo, res);
|
||||
|
||||
setPlaylists([
|
||||
...res.map( (list) => {
|
||||
const _getPlaylist = () => getPlaylist(list)
|
||||
const deletePlaylist = () => {
|
||||
invoke('delete_playlist', { uuid: list.uuid }).then(() => {});
|
||||
invoke('get_playlists').then(() => {});
|
||||
}
|
||||
async function menuHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "delete_playlist" + list.uuid, text: "Delete Playlist", action: deletePlaylist }
|
||||
]
|
||||
});
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
return (
|
||||
<button onClick={ _getPlaylist }
|
||||
onContextMenu={ menuHandler }
|
||||
key={ 'playlist_' + list.uuid }>{ list.name }</button>
|
||||
)
|
||||
})
|
||||
])
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
let handle_import = () => {
|
||||
invoke('import_playlist').then((_res) => {
|
||||
let res = _res as PlaylistInfo;
|
||||
|
||||
setPlaylists([
|
||||
...playlists,
|
||||
<button onClick={ () => getPlaylist(res) } key={ 'playlist_' + res.uuid }>{ res.name }</button>
|
||||
])
|
||||
// console.log(res.name);
|
||||
})
|
||||
}
|
||||
return (
|
||||
<section className="playlistHead">
|
||||
<button onClick={() => {
|
||||
setViewName("Library");
|
||||
invoke('get_library').then((lib) => {
|
||||
let i = 0;
|
||||
setLibrary([...(lib as Song[]).map((song) => {
|
||||
// console.log(song);
|
||||
i++;
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation="Library"
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
index={ i - 1 }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
} }>Library</button>
|
||||
{ playlists }
|
||||
<button onClick={ handle_import }>Import .m3u Playlist</button>
|
||||
<button onClick={() => { invoke('open_config_window').then(() => {}) }} style={{marginLeft: "auto", float: "right"}}>Edit DMP</button>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
interface MainViewProps {
|
||||
lib_ref: [JSX.Element[], React.Dispatch<React.SetStateAction<JSX.Element[]>>],
|
||||
viewName: string,
|
||||
playlistsInfo: MutableRefObject<PlaylistInfo[]>,
|
||||
setSelected: (props: SongProps) => void,
|
||||
selectedSong: MutableRefObject<SongProps | undefined>,
|
||||
}
|
||||
|
||||
function MainView({ lib_ref, viewName, playlistsInfo, setSelected, selectedSong }: MainViewProps) {
|
||||
const [library, setLibrary] = lib_ref;
|
||||
|
||||
|
||||
const addToQueue = (_: string) => {
|
||||
invoke('add_song_to_queue', { uuid: selectedSong.current?.uuid, location: selectedSong.current?.playerLocation }).then(() => {});
|
||||
}
|
||||
const playNow = () => invoke("play_now", { uuid: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {})
|
||||
const playNext = () => invoke("play_next_queue", { uuid: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {})
|
||||
const removeLibPlaylist = () => {
|
||||
invoke("remove_from_lib_playlist", { song: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {
|
||||
if (selectedSong.current!.reload !== undefined) {
|
||||
selectedSong.current!.reload()
|
||||
}
|
||||
})
|
||||
}
|
||||
async function clickHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
|
||||
await invoke('get_playlists');
|
||||
let removeText = "Remove from Library";
|
||||
if (selectedSong.current!.playerLocation != "Library") {
|
||||
removeText = "Remove from Playlist";
|
||||
}
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "play_now_" + selectedSong.current!.uuid, text: "Play Now", action: playNow },
|
||||
{ id: "play_next_" + selectedSong.current!.uuid, text: "Play Next", action: playNext },
|
||||
{ id: "add_song_to_queue" + selectedSong.current!.uuid, text: "Add to Queue", action: addToQueue },
|
||||
await Submenu.new(
|
||||
{
|
||||
text: "Add to Playlist...",
|
||||
items: [...selectedSong.current!.playlists.current.map((list) => {
|
||||
const addToPlaylist = () => {
|
||||
invoke('add_song_to_playlist', { playlist: list.uuid, song: selectedSong.current!.uuid }).then(() => {});
|
||||
}
|
||||
return { id: "add_song_to_playlists" + selectedSong.current!.uuid + list.uuid, text: list.name, action: addToPlaylist }
|
||||
})]
|
||||
} as SubmenuOptions
|
||||
),
|
||||
{ id: "remove_from_lib_playlist" + selectedSong.current!.location + selectedSong.current!.uuid, text: removeText, action: removeLibPlaylist },
|
||||
]});
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<null>("library_loaded", (_) => {
|
||||
console.log("library_loaded");
|
||||
invoke('get_library').then((lib) => {
|
||||
setLibrary([...(lib as Song[]).map((song, i) => {
|
||||
console.log("duration", song.duration)
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation="Library"
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
index={ i }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
|
||||
invoke('get_playlists').then(() => {})
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
|
||||
return (
|
||||
<div
|
||||
onDoubleClick={ playNow }
|
||||
onContextMenu={ clickHandler }
|
||||
className="mainView">
|
||||
<h1>{ viewName }</h1>
|
||||
<div>{ library }</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
interface SongProps {
|
||||
location: URI[],
|
||||
playerLocation: PlayerLocation,
|
||||
uuid: string,
|
||||
plays: number,
|
||||
format?: string,
|
||||
duration: number,
|
||||
last_played?: string,
|
||||
date_added?: string,
|
||||
date_modified?: string,
|
||||
tags: any,
|
||||
playlists: MutableRefObject<PlaylistInfo[]>,
|
||||
index: number,
|
||||
setSelected: (props: SongProps) => void,
|
||||
reload?: () => void
|
||||
}
|
||||
|
||||
function MainViewSong(props: SongProps) {
|
||||
// console.log(props.tags);
|
||||
// useEffect(() => {
|
||||
// const unlistenPromise = listen<string>("add_song_to_queue", (event) => {
|
||||
// switch (event.payload) {
|
||||
// default:
|
||||
// console.log("Unimplemented application menu id:", event.payload);
|
||||
// }
|
||||
// });
|
||||
|
||||
// return () => {
|
||||
// unlistenPromise.then((unlisten) => unlisten());
|
||||
// };
|
||||
// }, []);
|
||||
const setSelected = () => {
|
||||
props.setSelected(props);
|
||||
console.log(props.tags.Title);
|
||||
}
|
||||
return(
|
||||
<div
|
||||
onContextMenu={ setSelected }
|
||||
onClick={ setSelected }
|
||||
className="song">
|
||||
<p className="artist unselectable">{ props.tags.Artist }</p>
|
||||
<p className="title unselectable">{ props.tags.Title }</p>
|
||||
<p className="album unselectable">{ props.tags.Album }</p>
|
||||
<p className="duration unselectable">
|
||||
{ Math.round(+props.duration / 60) }:
|
||||
{ (+props.duration % 60).toString().padStart(2, "0") }
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
interface PlayBarProps {
|
||||
playing: boolean,
|
||||
setPlaying: React.Dispatch<React.SetStateAction<boolean>>
|
||||
}
|
||||
|
||||
function PlayBar({ playing, setPlaying }: PlayBarProps) {
|
||||
const [position, setPosition] = useState(0);
|
||||
const [duration, setDuration] = useState(0);
|
||||
const [seekBarSize, setSeekBarSize] = useState(0);
|
||||
const seekBarRef = React.createRef<HTMLDivElement>();
|
||||
const volumeSliderRef = React.createRef<HTMLInputElement>();
|
||||
|
||||
const [lastFmLoggedIn, setLastFmLoggedIn] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<PlaybackInfo>("playback_info", ({ payload: info, }) => {
|
||||
const pos_ = Array.isArray(info.position) ? info.position![0] : 0;
|
||||
const dur_ = Array.isArray(info.duration) ? info.duration![0] : 0;
|
||||
|
||||
setPosition(pos_);
|
||||
setDuration(dur_);
|
||||
let progress = ((pos_/dur_) * 100);
|
||||
setSeekBarSize(progress)
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
const seek = (event: React.MouseEvent<HTMLDivElement>) => {
|
||||
event.stopPropagation();
|
||||
let rect = seekBarRef.current!.getBoundingClientRect();
|
||||
let val = ((event.clientX-rect.left) / (rect.width))*duration;
|
||||
|
||||
invoke('seek', { time: Math.round(val * 1000) }).then()
|
||||
};
|
||||
|
||||
const wheelVolume = (event: React.WheelEvent<HTMLDivElement>) => {
|
||||
const n = 5;
|
||||
if (event.deltaY < 0) {
|
||||
volumeSliderRef.current!.stepUp(n);
|
||||
} else {
|
||||
volumeSliderRef.current!.stepDown(n);
|
||||
}
|
||||
invoke('set_volume', { volume: volumeSliderRef.current?.valueAsNumber!.toString() }).then(() => {})
|
||||
};
|
||||
|
||||
return (
|
||||
<section id="playBar" className="playBar unselectable">
|
||||
<div className="seekBar" ref={ seekBarRef } onClick={ seek } onDrag={ seek }>
|
||||
<div className="seekOverlay" id="seekOverlay" style={{ width: seekBarSize + '%' } }></div>
|
||||
</div>
|
||||
<div className="bottomSpaced">
|
||||
<div className="bottomLeft">
|
||||
<button onClick={ (_) => {
|
||||
setPlaying( playing ? false : true );
|
||||
invoke( playing ? 'pause' : 'play' ).then(() => {})
|
||||
}}>{ playing ? '⏸' : '⏵' }</button>
|
||||
<button onClick={ () => invoke('stop').then(() => {}) }>⏹</button>
|
||||
<button onClick={ () => invoke('prev').then(() => {}) }>⏮</button>
|
||||
<button onClick={ () => invoke('next').then(() => {}) }>⏭</button>
|
||||
</div>
|
||||
<div className="bottomRight">
|
||||
<button>🔀</button>
|
||||
<button>🔁</button>
|
||||
<input ref={ volumeSliderRef } onWheel={wheelVolume} type="range" name="volume" id="volumeSlider" onChange={ (volume) => {
|
||||
invoke('set_volume', { volume: volume.target.value }).then(() => {})
|
||||
}} />
|
||||
<p id="timeDisplay">
|
||||
{ Math.floor(+position / 60).toString().padStart(2, "0") }:
|
||||
{ (+position % 60).toString().padStart(2, "0") }/
|
||||
{ Math.floor(+duration / 60).toString().padStart(2, "0") }:
|
||||
{ (+duration % 60).toString().padStart(2, "0") }
|
||||
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
interface NowPlayingProps {
|
||||
title: string | undefined,
|
||||
artist: string | undefined,
|
||||
album: string | undefined,
|
||||
artwork: JSX.Element
|
||||
}
|
||||
|
||||
function NowPlaying({ title, artist, album, artwork }: NowPlayingProps) {
|
||||
return (
|
||||
<section className="nowPlaying">
|
||||
<div className="artworkWrapper unselectable">
|
||||
{ artwork }
|
||||
</div>
|
||||
<h3>{ title? title : "Unknown Title" }</h3>
|
||||
<p>{ artist }</p>
|
||||
<p>{ album }</p>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
interface QueueProps {
|
||||
songs: JSX.Element[],
|
||||
// song element. put the proper type here :]???
|
||||
selectedSong: MutableRefObject<selectedQueueSong>,
|
||||
}
|
||||
|
||||
interface selectedQueueSong {
|
||||
uuid: string,
|
||||
index: number
|
||||
location: PlayerLocation,
|
||||
}
|
||||
|
||||
function Queue({ songs, selectedSong, }: QueueProps) {
|
||||
const removeFromQueue = () => {
|
||||
invoke('remove_from_queue', { index: selectedSong.current.index }).then(() => {});
|
||||
}
|
||||
const playNow = () => {
|
||||
invoke('queue_move_to', { index: selectedSong.current.index }).then(() => {});
|
||||
}
|
||||
const playNext = () => invoke('play_next_queue', { uuid: selectedSong.current.uuid, location: selectedSong.current.location }).then(() => {});
|
||||
const clearQueue = () => invoke('clear_queue').then();
|
||||
|
||||
async function menuHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "play_now" + selectedSong.current.index, text: "Play Now", action: playNow },
|
||||
{ id: "play_next_" + selectedSong.current.uuid + selectedSong.current.index, text: "Play Next in Queue", action: playNext },
|
||||
{ id: "remove_queue" + selectedSong.current.uuid + selectedSong.current.index, text: "Remove from Queue", action: removeFromQueue },
|
||||
{ id: "clear_queue", text: "Clear Queue", action: clearQueue },
|
||||
]
|
||||
})
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="Queue"
|
||||
onAuxClickCapture={ removeFromQueue }
|
||||
onDoubleClick={ playNow }
|
||||
onContextMenu={ menuHandler }
|
||||
>
|
||||
{ songs }
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
interface QueueSongProps {
|
||||
song: Song,
|
||||
location: PlayerLocation,
|
||||
index: number,
|
||||
setSelectedSong: (song: selectedQueueSong) => void,
|
||||
}
|
||||
|
||||
function QueueSong({ song, location, index, setSelectedSong }: QueueSongProps) {
|
||||
// console.log(song.tags);
|
||||
|
||||
let setSelected = () => setSelectedSong({uuid: song.uuid, index: index, location: location })
|
||||
|
||||
return (
|
||||
<div className="queueSong unselectable" onAuxClickCapture={ setSelected } onClick={ setSelected } onContextMenu={ setSelected }>
|
||||
<img className="queueSongCoverArt" src={ convertFileSrc('abc') + '?' + song.uuid } key={ 'coverArt_' + song.uuid }/>
|
||||
<div className="queueSongTags">
|
||||
<p className="queueSongTitle">{ song.tags.Title }</p>
|
||||
<p className="queueSongArtist">{ song.tags.Artist }</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function getConfig(): any {
|
||||
invoke('init_get_config').then( (_config) => {
|
||||
let config = _config as Config;
|
||||
if (config.libraries.libraries.length == 0) {
|
||||
invoke('create_new_library').then(() => {})
|
||||
} else {
|
||||
// console.log("else");
|
||||
invoke('lib_already_created').then(() => {})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
130
src/components/App.tsx
Normal file
130
src/components/App.tsx
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
import React, { useEffect, useRef, useState } from "react";
|
||||
import { convertFileSrc, invoke } from "@tauri-apps/api/core";
|
||||
import "./App.css";
|
||||
// import { EventEmitter } from "@tauri-apps/plugin-shell";
|
||||
// import { listen } from "@tauri-apps/api/event";
|
||||
// import { fetch } from "@tauri-apps/plugin-http";
|
||||
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import { PhysicalPosition } from "@tauri-apps/api/window";
|
||||
import { Config } from "../bindings/Config";
|
||||
import { PlayerLocation } from "../bindings/PlayerLocation";
|
||||
import { Song } from "../bindings/Song";
|
||||
import { PlaylistHead, PlaylistInfo } from "./PlaylistHead";
|
||||
import MainView, { SongProps } from "./MainView";
|
||||
import { Queue, QueueSong, selectedQueueSong } from "./Queue";
|
||||
import { NowPlaying } from "./NowPlaying";
|
||||
import { PlayBar } from "./PlayBar";
|
||||
|
||||
export const appWindow = getCurrentWebviewWindow();
|
||||
|
||||
// This needs to be changed to properly reflect cursor position
|
||||
// this will do for now.
|
||||
export async function contextMenuPosition(event: React.MouseEvent) {
|
||||
return new PhysicalPosition(event.clientX, event.clientY);
|
||||
}
|
||||
|
||||
export default function App() {
|
||||
const library = useState<JSX.Element[]>([]);
|
||||
const [queue, setQueue] = useState<JSX.Element[]>([]);
|
||||
const [playing, setPlaying] = useState(false);
|
||||
const [playlists, setPlaylists] = useState<JSX.Element[]>([]);
|
||||
const [viewName, setViewName] = useState("Library");
|
||||
const playlistsInfo= useRef<PlaylistInfo[]>([]);
|
||||
const selectedSongMain = useRef<SongProps>();
|
||||
const selectedSongQueue = useRef<selectedQueueSong>({uuid: "0", index: 0, location: "Library"});
|
||||
const setSelectedSongMain = (props: SongProps) => {selectedSongMain.current = props;}
|
||||
const setSelectedSongQueue = (song: selectedQueueSong) => {selectedSongQueue.current = song; console.log(selectedSongQueue)}
|
||||
|
||||
const [nowPlaying, setNowPlaying] = useState<JSX.Element>(
|
||||
<NowPlaying
|
||||
title="Title"
|
||||
album="Album"
|
||||
artist="Artist"
|
||||
artwork={<img src={convertFileSrc("abc") + "?" + "default" } id="nowPlayingArtwork" alt="Now Playing Artwork" key={'default_image'} />}
|
||||
/>
|
||||
);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<Song>("now_playing_change", ({ payload, }) => {
|
||||
const displayArtwork = () => {
|
||||
invoke('display_album_art', { uuid: payload.uuid }).then(() => {})
|
||||
}
|
||||
|
||||
setNowPlaying(
|
||||
<NowPlaying
|
||||
title={ payload.tags.Title }
|
||||
album={ payload.tags.Album }
|
||||
artist={ payload.tags.Artist }
|
||||
artwork={ <img src={convertFileSrc("abc") + "?" + payload.uuid } id="nowPlayingArtwork" alt="Now Playing Artwork" key={payload.uuid} onDoubleClick={ displayArtwork } /> }
|
||||
/>
|
||||
)
|
||||
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<null>("queue_updated", (_) => {
|
||||
// console.log(event);
|
||||
invoke('get_queue').then((_songs) => {
|
||||
let songs = _songs as [Song, PlayerLocation][];
|
||||
setQueue(
|
||||
songs.filter((_, i) => i != 0).map((song, i) =>
|
||||
<QueueSong
|
||||
song={ song[0] }
|
||||
location={ song[1] }
|
||||
index={i+1}
|
||||
key={ Math.floor((Math.random() * 100_000_000_000) + 1) + '_' + Date.now() }
|
||||
setSelectedSong={ setSelectedSongQueue }
|
||||
/>
|
||||
)
|
||||
)
|
||||
})
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<boolean>("playing", (isPlaying) => {
|
||||
setPlaying(isPlaying.payload)
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
invoke("start_controller").then(() => {});
|
||||
}, [])
|
||||
|
||||
|
||||
return (
|
||||
<main>
|
||||
<div className="container">
|
||||
<div className="leftSide">
|
||||
<PlaylistHead playlists={ playlists } setPlaylists={ setPlaylists } setViewName={ setViewName } setLibrary={ library[1] } playlistsInfo={ playlistsInfo } setSelected={ setSelectedSongMain } />
|
||||
<MainView lib_ref={ library } viewName={ viewName } playlistsInfo={ playlistsInfo } setSelected={ setSelectedSongMain } selectedSong={ selectedSongMain} />
|
||||
</div>
|
||||
<div className="rightSide">
|
||||
{ nowPlaying }
|
||||
<Queue songs={ queue } selectedSong={ selectedSongQueue } />
|
||||
</div>
|
||||
</div>
|
||||
<div className="bottom">
|
||||
<PlayBar playing={ playing } setPlaying={ setPlaying } />
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
function getConfig(): any {
|
||||
invoke('init_get_config').then( (_config) => {
|
||||
let config = _config as Config;
|
||||
if (config.libraries.libraries.length == 0) {
|
||||
invoke('create_new_library').then(() => {})
|
||||
} else {
|
||||
// console.log("else");
|
||||
invoke('lib_already_created').then(() => {})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
154
src/components/MainView.tsx
Normal file
154
src/components/MainView.tsx
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
import { MutableRefObject, useEffect } from "react";
|
||||
import { URI } from "../bindings/URI";
|
||||
import { PlayerLocation } from "../bindings/PlayerLocation";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { Menu, Submenu } from "@tauri-apps/api/menu";
|
||||
import { appWindow, contextMenuPosition } from "./App";
|
||||
import { Song } from "../bindings/Song";
|
||||
import { PlaylistInfo } from "./PlaylistHead";
|
||||
|
||||
export interface MainViewProps {
|
||||
lib_ref: [JSX.Element[], React.Dispatch<React.SetStateAction<JSX.Element[]>>],
|
||||
viewName: string,
|
||||
playlistsInfo: MutableRefObject<PlaylistInfo[]>,
|
||||
setSelected: (props: SongProps) => void,
|
||||
selectedSong: MutableRefObject<SongProps | undefined>,
|
||||
}
|
||||
|
||||
export default function MainView({ lib_ref, viewName, playlistsInfo, setSelected, selectedSong }: MainViewProps) {
|
||||
const [library, setLibrary] = lib_ref;
|
||||
|
||||
|
||||
const addToQueue = (_: string) => {
|
||||
invoke('add_song_to_queue', { uuid: selectedSong.current?.uuid, location: selectedSong.current?.playerLocation }).then(() => {});
|
||||
}
|
||||
const playNow = () => invoke("play_now", { uuid: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {})
|
||||
const playNext = () => invoke("play_next_queue", { uuid: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {})
|
||||
const removeLibPlaylist = () => {
|
||||
invoke("remove_from_lib_playlist", { song: selectedSong.current!.uuid, location: selectedSong.current!.playerLocation }).then(() => {
|
||||
if (selectedSong.current!.reload !== undefined) {
|
||||
selectedSong.current!.reload()
|
||||
}
|
||||
})
|
||||
}
|
||||
async function clickHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
|
||||
await invoke('get_playlists');
|
||||
let removeText = "Remove from Library";
|
||||
if (selectedSong.current!.playerLocation != "Library") {
|
||||
removeText = "Remove from Playlist";
|
||||
}
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "play_now_" + selectedSong.current!.uuid, text: "Play Now", action: playNow },
|
||||
{ id: "play_next_" + selectedSong.current!.uuid, text: "Play Next", action: playNext },
|
||||
{ id: "add_song_to_queue" + selectedSong.current!.uuid, text: "Add to Queue", action: addToQueue },
|
||||
await Submenu.new(
|
||||
{
|
||||
text: "Add to Playlist...",
|
||||
items: [...selectedSong.current!.playlists.current.map((list) => {
|
||||
const addToPlaylist = () => {
|
||||
invoke('add_song_to_playlist', { playlist: list.uuid, song: selectedSong.current!.uuid }).then(() => {});
|
||||
}
|
||||
return { id: "add_song_to_playlists" + selectedSong.current!.uuid + list.uuid, text: list.name, action: addToPlaylist }
|
||||
})]
|
||||
}
|
||||
),
|
||||
{ id: "remove_from_lib_playlist" + selectedSong.current!.location + selectedSong.current!.uuid, text: removeText, action: removeLibPlaylist },
|
||||
]});
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<null>("library_loaded", (_) => {
|
||||
console.log("library_loaded");
|
||||
invoke('get_library').then((lib) => {
|
||||
setLibrary([...(lib as Song[]).map((song, i) => {
|
||||
console.log("duration", song.duration)
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation="Library"
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
index={ i }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
|
||||
invoke('get_playlists').then(() => {})
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
|
||||
return (
|
||||
<div
|
||||
onDoubleClick={ playNow }
|
||||
onContextMenu={ clickHandler }
|
||||
className="mainView">
|
||||
<h1>{ viewName }</h1>
|
||||
<div>{ library }</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
export interface SongProps {
|
||||
location: URI[],
|
||||
playerLocation: PlayerLocation,
|
||||
uuid: string,
|
||||
plays: number,
|
||||
format?: string,
|
||||
duration: number,
|
||||
last_played?: string,
|
||||
date_added?: string,
|
||||
date_modified?: string,
|
||||
tags: any,
|
||||
playlists: MutableRefObject<PlaylistInfo[]>,
|
||||
index: number,
|
||||
setSelected: (props: SongProps) => void,
|
||||
reload?: () => void
|
||||
}
|
||||
|
||||
export function MainViewSong(props: SongProps) {
|
||||
// console.log(props.tags);
|
||||
// useEffect(() => {
|
||||
// const unlistenPromise = listen<string>("add_song_to_queue", (event) => {
|
||||
// switch (event.payload) {
|
||||
// default:
|
||||
// console.log("Unimplemented application menu id:", event.payload);
|
||||
// }
|
||||
// });
|
||||
|
||||
// return () => {
|
||||
// unlistenPromise.then((unlisten) => unlisten());
|
||||
// };
|
||||
// }, []);
|
||||
const setSelected = () => {
|
||||
props.setSelected(props);
|
||||
console.log(props.tags.Title);
|
||||
}
|
||||
return(
|
||||
<div
|
||||
onContextMenu={ setSelected }
|
||||
onClick={ setSelected }
|
||||
className="song">
|
||||
<p className="artist unselectable">{ props.tags.Artist }</p>
|
||||
<p className="title unselectable">{ props.tags.Title }</p>
|
||||
<p className="album unselectable">{ props.tags.Album }</p>
|
||||
<p className="duration unselectable">
|
||||
{ Math.round(+props.duration / 60) }:
|
||||
{ (+props.duration % 60).toString().padStart(2, "0") }
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
19
src/components/NowPlaying.tsx
Normal file
19
src/components/NowPlaying.tsx
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
export interface NowPlayingProps {
|
||||
title: string | undefined,
|
||||
artist: string | undefined,
|
||||
album: string | undefined,
|
||||
artwork: JSX.Element
|
||||
}
|
||||
|
||||
export function NowPlaying({ title, artist, album, artwork }: NowPlayingProps) {
|
||||
return (
|
||||
<section className="nowPlaying">
|
||||
<div className="artworkWrapper unselectable">
|
||||
{ artwork }
|
||||
</div>
|
||||
<h3>{ title? title : "Unknown Title" }</h3>
|
||||
<p>{ artist }</p>
|
||||
<p>{ album }</p>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
83
src/components/PlayBar.tsx
Normal file
83
src/components/PlayBar.tsx
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
import React, { useEffect, useState } from "react";
|
||||
import { appWindow } from "./App";
|
||||
import { PlaybackInfo } from "../bindings/PlaybackInfo";
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
|
||||
export interface PlayBarProps {
|
||||
playing: boolean,
|
||||
setPlaying: React.Dispatch<React.SetStateAction<boolean>>
|
||||
}
|
||||
|
||||
export function PlayBar({ playing, setPlaying }: PlayBarProps) {
|
||||
const [position, setPosition] = useState(0);
|
||||
const [duration, setDuration] = useState(0);
|
||||
const [seekBarSize, setSeekBarSize] = useState(0);
|
||||
const seekBarRef = React.createRef<HTMLDivElement>();
|
||||
const volumeSliderRef = React.createRef<HTMLInputElement>();
|
||||
|
||||
const [lastFmLoggedIn, setLastFmLoggedIn] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<PlaybackInfo>("playback_info", ({ payload: info, }) => {
|
||||
const pos_ = Array.isArray(info.position) ? info.position![0] : 0;
|
||||
const dur_ = Array.isArray(info.duration) ? info.duration![0] : 0;
|
||||
|
||||
setPosition(pos_);
|
||||
setDuration(dur_);
|
||||
let progress = ((pos_/dur_) * 100);
|
||||
setSeekBarSize(progress)
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
|
||||
const seek = (event: React.MouseEvent<HTMLDivElement>) => {
|
||||
event.stopPropagation();
|
||||
let rect = seekBarRef.current!.getBoundingClientRect();
|
||||
let val = ((event.clientX-rect.left) / (rect.width))*duration;
|
||||
|
||||
invoke('seek', { time: Math.round(val * 1000) }).then()
|
||||
};
|
||||
|
||||
const wheelVolume = (event: React.WheelEvent<HTMLDivElement>) => {
|
||||
const n = 5;
|
||||
if (event.deltaY < 0) {
|
||||
volumeSliderRef.current!.stepUp(n);
|
||||
} else {
|
||||
volumeSliderRef.current!.stepDown(n);
|
||||
}
|
||||
invoke('set_volume', { volume: volumeSliderRef.current?.valueAsNumber!.toString() }).then(() => {})
|
||||
};
|
||||
|
||||
return (
|
||||
<section id="playBar" className="playBar unselectable">
|
||||
<div className="seekBar" ref={ seekBarRef } onClick={ seek } onDrag={ seek }>
|
||||
<div className="seekOverlay" id="seekOverlay" style={{ width: seekBarSize + '%' } }></div>
|
||||
</div>
|
||||
<div className="bottomSpaced">
|
||||
<div className="bottomLeft">
|
||||
<button onClick={ (_) => {
|
||||
setPlaying( playing ? false : true );
|
||||
invoke( playing ? 'pause' : 'play' ).then(() => {})
|
||||
}}>{ playing ? '⏸' : '⏵' }</button>
|
||||
<button onClick={ () => invoke('stop').then(() => {}) }>⏹</button>
|
||||
<button onClick={ () => invoke('prev').then(() => {}) }>⏮</button>
|
||||
<button onClick={ () => invoke('next').then(() => {}) }>⏭</button>
|
||||
</div>
|
||||
<div className="bottomRight">
|
||||
<button>🔀</button>
|
||||
<button>🔁</button>
|
||||
<input ref={ volumeSliderRef } onWheel={wheelVolume} type="range" name="volume" id="volumeSlider" onChange={ (volume) => {
|
||||
invoke('set_volume', { volume: volume.target.value }).then(() => {})
|
||||
}} />
|
||||
<p id="timeDisplay">
|
||||
{ Math.floor(+position / 60).toString().padStart(2, "0") }:
|
||||
{ (+position % 60).toString().padStart(2, "0") }/
|
||||
{ Math.floor(+duration / 60).toString().padStart(2, "0") }:
|
||||
{ (+duration % 60).toString().padStart(2, "0") }
|
||||
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
125
src/components/PlaylistHead.tsx
Normal file
125
src/components/PlaylistHead.tsx
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
import { MutableRefObject, useEffect } from "react"
|
||||
import { MainViewSong, SongProps } from "./MainView"
|
||||
import { invoke } from "@tauri-apps/api/core"
|
||||
import { Song } from "../bindings/Song"
|
||||
import { appWindow, contextMenuPosition } from "./App"
|
||||
import { Menu } from "@tauri-apps/api/menu"
|
||||
|
||||
export interface PlaylistInfo {
|
||||
uuid: string,
|
||||
name: string,
|
||||
}
|
||||
|
||||
|
||||
export interface PlaylistHeadProps {
|
||||
playlists: JSX.Element[]
|
||||
setPlaylists: React.Dispatch<React.SetStateAction<JSX.Element[]>>,
|
||||
setViewName: React.Dispatch<React.SetStateAction<string>>,
|
||||
setLibrary: React.Dispatch<React.SetStateAction<JSX.Element[]>>,
|
||||
playlistsInfo: MutableRefObject<PlaylistInfo[]>,
|
||||
setSelected: (props: SongProps) => void,
|
||||
}
|
||||
|
||||
export function PlaylistHead({ playlists, setPlaylists, setViewName, setLibrary, playlistsInfo, setSelected }: PlaylistHeadProps) {
|
||||
function getPlaylist(playlist: PlaylistInfo) {
|
||||
invoke('get_playlist', { uuid: playlist.uuid }).then((list) => {
|
||||
setLibrary([...(list as Song[]).map((song, i) => {
|
||||
// console.log(song);
|
||||
const reload = () => getPlaylist(playlist)
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation={ {"Playlist" : playlist.uuid } }
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
reload = { reload }
|
||||
index = { i }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
setViewName( playlist.name )
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = appWindow.listen<PlaylistInfo[]>("playlists_gotten", (_res) => {
|
||||
const res = _res.payload;
|
||||
// console.log(event);
|
||||
playlistsInfo.current = [...res];
|
||||
// console.log(playlistsInfo, res);
|
||||
|
||||
setPlaylists([
|
||||
...res.map( (list) => {
|
||||
const _getPlaylist = () => getPlaylist(list)
|
||||
const deletePlaylist = () => {
|
||||
invoke('delete_playlist', { uuid: list.uuid }).then(() => {});
|
||||
invoke('get_playlists').then(() => {});
|
||||
}
|
||||
async function menuHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "delete_playlist" + list.uuid, text: "Delete Playlist", action: deletePlaylist }
|
||||
]
|
||||
});
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
return (
|
||||
<button onClick={ _getPlaylist }
|
||||
onContextMenu={ menuHandler }
|
||||
key={ 'playlist_' + list.uuid }>{ list.name }</button>
|
||||
)
|
||||
})
|
||||
])
|
||||
})
|
||||
return () => { unlisten.then((f) => f()) }
|
||||
}, []);
|
||||
let handle_import = () => {
|
||||
invoke('import_playlist').then((_res) => {
|
||||
let res = _res as PlaylistInfo;
|
||||
|
||||
setPlaylists([
|
||||
...playlists,
|
||||
<button onClick={ () => getPlaylist(res) } key={ 'playlist_' + res.uuid }>{ res.name }</button>
|
||||
])
|
||||
// console.log(res.name);
|
||||
})
|
||||
}
|
||||
return (
|
||||
<section className="playlistHead">
|
||||
<button onClick={() => {
|
||||
setViewName("Library");
|
||||
invoke('get_library').then((lib) => {
|
||||
let i = 0;
|
||||
setLibrary([...(lib as Song[]).map((song) => {
|
||||
// console.log(song);
|
||||
i++;
|
||||
return (
|
||||
<MainViewSong
|
||||
key={ song.uuid + Math.floor(Math.random() * 100_000_000_000) }
|
||||
location={ song.location }
|
||||
playerLocation="Library"
|
||||
uuid={ song.uuid }
|
||||
plays={ song.plays }
|
||||
duration={ song.duration }
|
||||
tags={ song.tags }
|
||||
playlists={ playlistsInfo }
|
||||
index={ i - 1 }
|
||||
setSelected={ setSelected }
|
||||
/>
|
||||
)
|
||||
})])
|
||||
})
|
||||
} }>Library</button>
|
||||
{ playlists }
|
||||
<button onClick={ handle_import }>Import .m3u Playlist</button>
|
||||
<button onClick={() => { invoke('open_config_window').then(() => {}) }} style={{marginLeft: "auto", float: "right"}}>Edit DMP</button>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
76
src/components/Queue.tsx
Normal file
76
src/components/Queue.tsx
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
import { MutableRefObject } from "react";
|
||||
import { PlayerLocation } from "../bindings/PlayerLocation";
|
||||
import { convertFileSrc, invoke } from "@tauri-apps/api/core";
|
||||
import { Menu } from "@tauri-apps/api/menu";
|
||||
import { contextMenuPosition } from "./App";
|
||||
import { Song } from "../bindings/Song";
|
||||
|
||||
export interface QueueProps {
|
||||
songs: JSX.Element[],
|
||||
// song element. put the proper type here :]???
|
||||
selectedSong: MutableRefObject<selectedQueueSong>,
|
||||
}
|
||||
|
||||
export interface selectedQueueSong {
|
||||
uuid: string,
|
||||
index: number
|
||||
location: PlayerLocation,
|
||||
}
|
||||
|
||||
export function Queue({ songs, selectedSong, }: QueueProps) {
|
||||
const removeFromQueue = () => {
|
||||
invoke('remove_from_queue', { index: selectedSong.current.index }).then(() => {});
|
||||
}
|
||||
const playNow = () => {
|
||||
invoke('queue_move_to', { index: selectedSong.current.index }).then(() => {});
|
||||
}
|
||||
const playNext = () => invoke('play_next_queue', { uuid: selectedSong.current.uuid, location: selectedSong.current.location }).then(() => {});
|
||||
const clearQueue = () => invoke('clear_queue').then();
|
||||
|
||||
async function menuHandler(event: React.MouseEvent) {
|
||||
event.preventDefault();
|
||||
|
||||
const menu = await Menu.new({
|
||||
items: [
|
||||
{ id: "play_now" + selectedSong.current.index, text: "Play Now", action: playNow },
|
||||
{ id: "play_next_" + selectedSong.current.uuid + selectedSong.current.index, text: "Play Next in Queue", action: playNext },
|
||||
{ id: "remove_queue" + selectedSong.current.uuid + selectedSong.current.index, text: "Remove from Queue", action: removeFromQueue },
|
||||
{ id: "clear_queue", text: "Clear Queue", action: clearQueue },
|
||||
]
|
||||
})
|
||||
menu.popup(await contextMenuPosition(event));
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="Queue"
|
||||
onAuxClickCapture={ removeFromQueue }
|
||||
onDoubleClick={ playNow }
|
||||
onContextMenu={ menuHandler }
|
||||
>
|
||||
{ songs }
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
export interface QueueSongProps {
|
||||
song: Song,
|
||||
location: PlayerLocation,
|
||||
index: number,
|
||||
setSelectedSong: (song: selectedQueueSong) => void,
|
||||
}
|
||||
|
||||
export function QueueSong({ song, location, index, setSelectedSong }: QueueSongProps) {
|
||||
// console.log(song.tags);
|
||||
|
||||
let setSelected = () => setSelectedSong({uuid: song.uuid, index: index, location: location })
|
||||
|
||||
return (
|
||||
<div className="queueSong unselectable" onAuxClickCapture={ setSelected } onClick={ setSelected } onContextMenu={ setSelected }>
|
||||
<img className="queueSongCoverArt" src={ convertFileSrc('abc') + '?' + song.uuid } key={ 'coverArt_' + song.uuid }/>
|
||||
<div className="queueSongTags">
|
||||
<p className="queueSongTitle">{ song.tags.Title }</p>
|
||||
<p className="queueSongArtist">{ song.tags.Artist }</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { ChangeEvent, useEffect, useRef, useState } from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import { Config, ConfigConnections } from "../types";
|
||||
import { TauriEvent } from "@tauri-apps/api/event";
|
||||
import { Config } from "../bindings/Config";
|
||||
|
||||
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
|
||||
<>
|
||||
|
|
@ -65,7 +65,7 @@ function ListenBrainz({ config, setConfig }: ListenBrainzProps) {
|
|||
return (
|
||||
<>
|
||||
<label>{ "Listenbrainz Token" }</label>
|
||||
<input type="text" value={ config?.connections.listenbrainz_token } onChange={updateToken} />
|
||||
<input type="text" value={ config?.connections.listenbrainz_token! } onChange={updateToken} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { StrictMode } from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import App from "./App";
|
||||
import App from "./components/App";
|
||||
|
||||
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
|
||||
// <StrictMode>
|
||||
|
|
|
|||
Loading…
Reference in a new issue