Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TheDesk Mio (15.6.0) macOS

Browse Source
This commit is contained in:
Cutls P 2018-06-12 01:41:11 +09:00
parent cc95b26cdb
commit a8e0133edb
6 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
app/.DS_Store vendored
View File

Binary file not shown.

10
app/js/ui/spotify.js
View File

@ -104,6 +104,10 @@ function nowplaying(mode){
content = content.replace(regExp, ""); content = content.replace(regExp, "");
var regExp = new RegExp("{hz}", "g"); var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, ""); content = content.replace(regExp, "");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, "");
$("#textarea").val(content); $("#textarea").val(content);
}); });
}else{ }else{
@ -122,7 +126,7 @@ function nowplaying(mode){
var regExp = new RegExp("{song}", "g"); var regExp = new RegExp("{song}", "g");
content = content.replace(regExp, arg.name); content = content.replace(regExp, arg.name);
var regExp = new RegExp("{album}", "g"); var regExp = new RegExp("{album}", "g");
content = content.replace(regExp, arg.album.name); content = content.replace(regExp, arg.album);
var regExp = new RegExp("{artist}", "g"); var regExp = new RegExp("{artist}", "g");
content = content.replace(regExp, arg.artist); content = content.replace(regExp, arg.artist);
var regExp = new RegExp("{url}", "g"); var regExp = new RegExp("{url}", "g");
@ -131,6 +135,10 @@ function nowplaying(mode){
content = content.replace(regExp, arg.composer); content = content.replace(regExp, arg.composer);
var regExp = new RegExp("{hz}", "g"); var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, arg.sampleRate/1000+"kHz"); content = content.replace(regExp, arg.sampleRate/1000+"kHz");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, arg.bitRate+"kbps");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, arg.genre);
$("#textarea").val(content); $("#textarea").val(content);
}) })
} }

2
app/main.js
View File

@ -401,7 +401,7 @@ ipc.on('itunes', (e, args) => {
if(platform=="darwin"){ if(platform=="darwin"){
const nowplaying = require("itunes-nowplaying-mac") const nowplaying = require("itunes-nowplaying-mac")
nowplaying().then(function (value) { nowplaying.getRawData().then(function (value) {
mainWindow.webContents.send('itunes-np', value); mainWindow.webContents.send('itunes-np', value);
}).catch(function (error) { }).catch(function (error) {
// 非同期処理失敗。呼ばれない // 非同期処理失敗。呼ばれない

1
app/node_modules/itunes-nowplaying-mac/dist/itunes.js generated vendored
View File

@ -1,6 +1,7 @@
"use strict"; "use strict";
var itunes = Application("iTunes"); var itunes = Application("iTunes");
var track = itunes.currentTrack; var track = itunes.currentTrack;
function run(argv) { function run(argv) {
var state = itunes.playerState() var state = itunes.playerState()
if (state != "playing" && state != "paused") { if (state != "playing" && state != "paused") {

2
app/setting.html
View File

@ -244,7 +244,7 @@
<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist} <textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
{url}</textarea><br> {url}</textarea><br>
テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br> テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}が有効です。<br> iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。<br>
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button> <button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
<h5>Spotifyでアルバムアートワークを添付する</h5> <h5>Spotifyでアルバムアートワークを添付する</h5>
<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" /> <input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />