Local NowPlaying for Windows

2019-01-26 23:27:35 +09:00
parent 77ad2bd200
commit 7921633efd
17 changed files with 228 additions and 141 deletions
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -170,10 +170,10 @@ var tlid=0;
 		<a onclick="adobe()">Adobe Photo Editor</a>
 	</li>
 	<li>
-		<a onclick="nowplaying('spotify');">Spotify NowPlaying</a>
+		<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
 	</li>
 	<li>
-		<a onclick="nowplaying('itunes');">iTunes NowPlaying(macOS)</a>
+		<a onclick="nowplaying('itunes');">NowPlaying</a>
 	</li>
 	<li>
 		<a onclick="schedule();">Scheduled toot</a>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -308,6 +308,22 @@
 			<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
 		</div>
 		<div class="collapsible-body">
+			<h5>NowPlaying Provider(Windows)</h5>
+			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required.<br>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+			<label for="aimp">AIMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+			<label for="itunes">iTunes</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+			<label for="npmm">MediaMonkey</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+			<label for="winamp">Winamp</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+			<label for="wmp">WMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+			<label for="wlm">WLM</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+			<label for="cad">CAD</label><br><br>
 			Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
 			<h5>Account Connection</h5>
 			TheDesk save your data on thedesk.top server.<br>
@@ -318,8 +334,9 @@
 			<br>
 			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
-				Refer:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
-				iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.<br>
+				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
+				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
+				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -170,10 +170,10 @@ var tlid=0;
 		<a onclick="adobe()">Adobeフォトエディタ</a>
 	</li>
 	<li>
-		<a onclick="nowplaying('spotify');">Spotify NowPlaying</a>
+		<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
 	</li>
 	<li>
-		<a onclick="nowplaying('itunes');">iTunes NowPlaying(macOS)</a>
+		<a onclick="nowplaying('itunes');">NowPlaying</a>
 	</li>
 	<li>
 		<a onclick="schedule();">時間指定投稿</a>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -308,6 +308,22 @@
 			<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
 		</div>
 		<div class="collapsible-body">
+			<h5>NowPlayingのソース(Windows)</h5>
+			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。<br>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+			<label for="aimp">AIMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+			<label for="itunes">iTunes</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+			<label for="npmm">MediaMonkey</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+			<label for="winamp">Winamp</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+			<label for="wmp">WMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+			<label for="wlm">WLM</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+			<label for="cad">CAD</label><br><br>
 			<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
 			<h5>アカウントの連携</h5>
 			APIの性質上，thedesk.topへアクセスします。<br>
@@ -318,12 +334,13 @@
 			以下を編集してテンプレートを変更できます。<br>
 			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
-				テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
-				iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。<br>
+				Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
+				macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}<br>
+				Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
-			<h5>Spotifyでアルバムアートワークを添付する</h5>
+			<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
 			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 			<label for="awk_yes">はい</label>
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -9,8 +9,8 @@
    "selfile":"Attach..",
    "adobephoto":"Adobe Photo Editor",
    "insertEmoji":"Emojis",
-    "NPSpotify":"Spotify NowPlaying",
-    "NPiTunes":"iTunes NowPlaying(macOS)",
+    "NPSpotify":"NowPlaying(Spotify)",
+    "NPiTunes":"NowPlaying",
    "schedule":"Scheduled toot",
    "postat":"Post at",
    "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -9,8 +9,8 @@
    "selfile":"ファイルを選択",
    "adobephoto":"Adobeフォトエディタ",
    "insertEmoji":"絵文字を挿入",
-    "NPSpotify":"Spotify NowPlaying",
-    "NPiTunes":"iTunes NowPlaying(macOS)",
+    "NPSpotify":"NowPlaying(Spotify)",
+    "NPiTunes":"NowPlaying",
    "schedule":"時間指定投稿",
    "postat":"時間指定投稿",
    "scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。",
--- a/app/view/make/language/setting.en.json
+++ b/app/view/make/language/setting.en.json
@@ -107,6 +107,8 @@
    "useerempwarn":"Set on users data modals.",
    "empcolorwarn":"Use this color to emphasis",
    "spotify":"Spotify and NowPlaying Preferences",
+    "npProvider":"NowPlaying Provider(Windows)",
+    "npPeoviderWarn":"macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required.",
    "spotifynote1":"Click ",
    "spotifynote2":"icon to NowPlaying",
    "link":"Account Connection",
@@ -115,8 +117,9 @@
    "disconnect":"Disconnect",
    "templeteedit":"Edit a template",
    "templeteeditwarn":"",
-    "templete1":"Refer:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-    "templete2":"iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.",
+    "templete1":"Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+    "templete2":"macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+    "templete3":"Windows:{song}:Song name/{album}:Album name/{artist}:Artist name",
    "postartwork":"Attach an Artwork of Spotify",
    "tts":"TTS(text to speech) Preferences",
    "speed":"Speed",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@@ -107,6 +107,8 @@
    "useerempwarn":"各ユーザーのデータ表示画面で設定できます。",
    "empcolorwarn":"強調色(テーマによって異なります。)",
    "spotify":"SpotifyとNowPlayingの設定",
+    "npProvider":"NowPlayingのソース(Windows)",
+    "npPeoviderWarn":"macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。",
    "spotifynote1":"",
    "spotifynote2":"ボタンから簡単にNowPlayingができます。",
    "link":"アカウントの連携",
@@ -115,9 +117,10 @@
    "disconnect":"切断",
    "templeteedit":"テンプレートの編集",
    "templeteeditwarn":"以下を編集してテンプレートを変更できます。",
-    "templete1":"テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
-    "templete2":"iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。",
-    "postartwork":"Spotifyでアルバムアートワークを添付する",
+    "templete1":"Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
+    "templete2":"macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
+    "templete3":"Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名",
+    "postartwork":"アルバムアートワークを添付する(Spotify/Windows)",
    "tts":"読み上げの設定",
    "speed":"読み上げの速さ",
    "speedwarn":"1-100まで、デフォルトは10。",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -308,6 +308,22 @@
 			<i class="fa fa-spotify"></i>{{spotify}}
 		</div>
 		<div class="collapsible-body">
+			<h5>{{npProvider}}</h5>
+			{{npPeoviderWarn}}<br>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+			<label for="aimp">AIMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+			<label for="itunes">iTunes</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+			<label for="npmm">MediaMonkey</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+			<label for="winamp">Winamp</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+			<label for="wmp">WMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+			<label for="wlm">WLM</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+			<label for="cad">CAD</label><br><br>
 			{{spotifynote1}}<i class="material-icons" style="font-size:24px;">music_note</i>{{spotifynote2}}<br>
 			<h5>{{link}}</h5>
 			{{linkwarn}}<br>
@@ -320,6 +336,7 @@
 {url}</textarea><br>
 				{{templete1}}<br>
 				{{templete2}}<br>
+				{{templete3}}<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">{{set}}</button>