zedcode/bs-manager
1
0
Fork 0
mirror of https://github.com/Zagrios/bs-manager.git synced 2026-07-03 14:08:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Zagrios/bs-manager

Browse Source
This commit is contained in:
MathieuG-P
2024-09-22 13:59:31 +02:00
parent 96fc2b4efb 3280ca1984
commit 8335494a9f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/modal/modal-types/playlist/playlist-details-modal/local-playlist-details-modal.component.tsx
+7 -3
View File
@@ -34,8 +34,12 @@ export const LocalPlaylistDetailsModal: ModalComponent<void, Props> = ({resolver
const installedMaps = useObservable(() => options.data.installedMaps$, null);
const isMissingMaps$ = useConstant(() => combineLatest([options.data.installedMaps$, options.data.localPlaylist$]).pipe(map(([maps, playlist]) => maps.length !== playlist.songs.length)));
const isPlaylistDownloading$ = useConstant(() => options.data.localPlaylist$.pipe(switchMap(playlist => playlistDownloader.$isPlaylistDownloading(playlist.path, options.data.version))));
const isPlaylistInQueue$ = useConstant(() => options.data.localPlaylist$.pipe(switchMap(playlist => playlistDownloader.$isPlaylistInQueue(playlist.path, options.data.version))));
const isPlaylistDownloading$ = useConstant(() => options.data.localPlaylist$.pipe(switchMap(
playlist => playlistDownloader.$isPlaylistDownloading(playlist?.customData?.syncURL ?? playlist.path, options.data.version)
)));
const isPlaylistInQueue$ = useConstant(() => options.data.localPlaylist$.pipe(switchMap(
playlist => playlistDownloader.$isPlaylistInQueue(playlist?.customData?.syncURL ?? playlist.path, options.data.version)
)));
const isInQueue = useObservable(() => isPlaylistInQueue$, false);
@@ -44,7 +48,7 @@ export const LocalPlaylistDetailsModal: ModalComponent<void, Props> = ({resolver
const ignoreSongsHashs = installedMaps?.map(map => map.hash);
const obs$ = playlistDownloader.downloadPlaylist({
downloadSource: localPlaylist.path,
downloadSource: localPlaylist?.customData?.syncURL ?? localPlaylist.path,
dest: localPlaylist.path,
version: options.data.version,
ignoreSongsHashs,
src/renderer/components/modal/modal.component.tsx
+2 -2
View File
@@ -17,7 +17,7 @@ export function Modal() {
useEffect(() => {
const onEscape = (e: KeyboardEvent) => {
if (currentModal.options.closable === false || e.key !== "Escape") {
if (currentModal.options?.closable === false || e.key !== "Escape") {
return;
}
currentModal.resolver({ exitCode: ModalExitCode.CLOSED });
@@ -65,7 +65,7 @@ export function Modal() {
}
const onOverlayClicked = () => {
if (currentModal.options.closable === false) {
if (currentModal.options?.closable === false) {
return;
}