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

Merge remote-tracking branch 'upstream/upcoming' into upcoming

Browse source
This commit is contained in:
Onur Gümüş 2022-01-22 18:53:09 +03:00
commit 8ed82cc5e8
8 changed files with 1598 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,6 +201,8 @@ export class Win {
*/
const remote = express();
remote.use(express.static(path.join(this.paths.srcPath, "./web-remote/")))
remote.set("views", path.join(this.paths.srcPath, "./web-remote/views"));
remote.set("view engine", "ejs");
getPort({port: 6942}).then((port) => {
this.remotePort = port;
remote.listen(this.remotePort, () => {
@ -218,6 +220,9 @@ export class Win {
}
firstRequest = false;
})
remote.get("/", (req, res) => {
res.render("index", this.EnvironmentVariables);
});
})
}

4
src/main/base/wsapi.ts
View file

@ -186,7 +186,7 @@ export class wsapi {
response.message = "Previous";
break;
case "musickit-api":
this._win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)})`);
this._win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)} , ${data.library})`);
break;
case "musickit-library-api":
break;
@ -218,7 +218,7 @@ export class wsapi {
this._win.hide()
break;
case "play-mediaitem":
this._win.webContents.executeJavaScript(`wsapi.playTrackById(${data.id}, \`${data.kind}\`)`);
this._win.webContents.executeJavaScript(`wsapi.playTrackById("${data.id}", \`${data.kind}\`)`);
response.message = "Playing track";
break;
case "get-status":