okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this SHOULD work, hopefully

Browse source
This commit is contained in:
child_duckling 2022-01-22 21:53:37 -08:00
parent 4520ec549f
commit aa83f2d747
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/base/app.ts
View file

@ -1,6 +1,5 @@
import * as electron from 'electron'; import * as electron from 'electron';
import * as path from 'path'; import * as path from 'path';
export class AppEvents { export class AppEvents {
private static protocols: any = [ private static protocols: any = [
"ame", "ame",
@ -125,45 +124,28 @@ export class AppEvents {
} }
// Play // Play
else if (arg.includes('/play/')) { //Steer away from protocol:// specific conditionals else if (arg.includes('/play/')) { //Steer away from protocol:// specific conditionals
const playParam = arg.split('/play/')[1] const playParam = arg.split('/play/')[1]
if (playParam.includes('s/')) { // song if (playParam.includes('s/')) { // song
console.log(playParam) console.log(playParam)
let song = playParam.split('s/')[1] let song = playParam.split('s/')[1]
console.warn(`[LinkHandler] Attempting to load song by id: ${song}`); console.warn(`[LinkHandler] Attempting to load song by id: ${song}`);
// AppEvents.window.webContents.executeJavaScript(` electron.ipcRenderer.send('play', 'song', song)
// MusicKit.getInstance().setQueue({ song: '${song}'}).then(function(queue) {
// MusicKit.getInstance().play();
// });
// `)
} else if (playParam.includes('a/')) { // album } else if (playParam.includes('a/')) { // album
console.log(playParam) console.log(playParam)
let album = playParam.split('a/')[1] let album = playParam.split('a/')[1]
console.warn(`[LinkHandler] Attempting to load album by id: ${album}`); console.warn(`[LinkHandler] Attempting to load album by id: ${album}`);
// AppEvents.window.webContents.executeJavaScript(` electron.ipcRenderer.send('play', 'album', album)
// MusicKit.getInstance().setQueue({ album: '${album}'}).then(function(queue) {
// MusicKit.getInstance().play();
// });
// `)
} else if (playParam.includes('p/')) { // playlist } else if (playParam.includes('p/')) { // playlist
console.log(playParam) console.log(playParam)
let playlist = playParam.split('p/')[1] let playlist = playParam.split('p/')[1]
console.warn(`[LinkHandler] Attempting to load playlist by id: ${playlist}`); console.warn(`[LinkHandler] Attempting to load playlist by id: ${playlist}`);
// AppEvents.window.webContents.executeJavaScript(` electron.ipcRenderer.send('play', 'playlist', playlist)
// MusicKit.getInstance().setQueue({ playlist: '${playlist}'}).then(function(queue) {
// MusicKit.getInstance().play();
// });
// `)
} }
} else if (arg.includes('music.apple.com')) { // URL (used with itms/itmss/music/musics uris) } else if (arg.includes('music.apple.com')) { // URL (used with itms/itmss/music/musics uris)
console.log(arg) console.log(arg)
let url = arg.split('//')[1] let url = arg.split('//')[1]
console.warn(`[LinkHandler] Attempting to load url: ${url}`); console.warn(`[LinkHandler] Attempting to load url: ${url}`);
// AppEvents.window.webContents.executeJavaScript(` electron.ipcRenderer.send('play', 'url', url)
// MusicKit.getInstance().setQueue({ url: 'https://${url}'}).then(function(queue) {
// MusicKit.getInstance().play();
// });
// `)
} }
} }
} }

9
src/main/base/win.ts
View file

@ -411,6 +411,14 @@ export class Win {
this.win.setFullScreen(flag) this.win.setFullScreen(flag)
}) })
electron.ipcMain.on('play', (event, type, id) => {
this.win.webContents.executeJavaScript(`
MusicKit.getInstance().setQueue({ ${type}: '${id}'}).then(function(queue) {
MusicKit.getInstance().play();
});
`)
})
function getIp() { function getIp() {
let ip = false; let ip = false;
let alias = 0; let alias = 0;
@ -488,7 +496,6 @@ export class Win {
return { action: "deny" }; return { action: "deny" };
}); });
} }
private async broadcastRemote() { private async broadcastRemote() {
function getIp() { function getIp() {
let ip :any = false; let ip :any = false;