myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-07-07 10:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixing

Browse Source
This commit is contained in:
Geomitron
2024-07-11 00:03:59 -05:00
parent c698e6bb63
commit 1f7184dcc3
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -19,10 +19,10 @@
"start": "concurrently \"npm run start:angular\" \"npm run start:electron\" -n angular,electron -c red,yellow", "start": "concurrently \"npm run start:angular\" \"npm run start:electron\" -n angular,electron -c red,yellow",
"start:angular": "ng serve", "start:angular": "ng serve",
"start:electron": "nodemon --exec \"tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron ./dist/electron/src-electron/main.js --dev\" --watch src-electron/ -e ts", "start:electron": "nodemon --exec \"tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron ./dist/electron/src-electron/main.js --dev\" --watch src-electron/ -e ts",
"build:windows": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && electron-builder build --windows", "build:windows": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron-builder build --windows",
"build:mac": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && electron-builder build --mac", "build:mac": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron-builder build --mac",
"build:linux": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && electron-builder build --linux", "build:linux": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron-builder build --linux",
"release": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && electron-builder build" "release": "ng build -c production && tsc -p src-electron/tsconfig.electron.json && node src-electron/rename-to-mjs.js && electron-builder build"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^18.0.6", "@angular/animations": "^18.0.6",

7
src-angular/app/components/browse/status-bar/status-bar.component.ts
View File

@@ -2,6 +2,7 @@ import { Component, ElementRef, ViewChild } from '@angular/core'
import _ from 'lodash' import _ from 'lodash'
import { removeStyleTags } from '../../../../../src-shared/UtilFunctions.js'
import { DownloadService } from '../../../core/services/download.service' import { DownloadService } from '../../../core/services/download.service'
import { SearchService } from '../../../core/services/search.service' import { SearchService } from '../../../core/services/search.service'
import { SelectionService } from '../../../core/services/selection.service' import { SelectionService } from '../../../core/services/selection.service'
@@ -32,7 +33,11 @@ export class StatusBarComponent {
async downloadSelected() { async downloadSelected() {
const selectedGroupIds = this.selectedGroupIds const selectedGroupIds = this.selectedGroupIds
for (const chart of this.searchService.groupedSongs.filter(gs => selectedGroupIds.includes(gs[0].groupId))) { const selectedCharts = this.searchService.groupedSongs.filter(gs => selectedGroupIds.includes(gs[0].groupId))
for (const chart of _.uniqBy(selectedCharts, gs => `${removeStyleTags(gs[0].artist ?? 'Unknown Artist')
} - ${removeStyleTags(gs[0].name ?? 'Unknown Name')
} (${removeStyleTags(gs[0].charter ?? 'Unknown Charter')})`)) {
this.downloadService.addDownload(chart[0]) this.downloadService.addDownload(chart[0])
} }
} }

6
src-electron/main.ts
View File

@@ -162,5 +162,9 @@ function getLoadUrl() {
} }
export function emitIpcEvent<E extends keyof IpcFromMainEmitEvents>(event: E, data: IpcFromMainEmitEvents[E]) { export function emitIpcEvent<E extends keyof IpcFromMainEmitEvents>(event: E, data: IpcFromMainEmitEvents[E]) {
mainWindow.webContents.send(event, data) try {
mainWindow.webContents.send(event, data)
} catch (err) {
// Ignore; happens when closing Bridge
}
} }