Merge pull request #38 from kPherox/dont-fire-itunes-event
'itunes-np' リスナが残っているときにnowplayingのイベントを無視する
This commit is contained in:
		@@ -156,7 +156,6 @@ function media(b64, type, no) {
 | 
			
		||||
			Materialize.toast(lang.lang_postimg_aftupload, 1000);
 | 
			
		||||
			$("#imgup").text("");
 | 
			
		||||
			$("#imgsel").show();
 | 
			
		||||
			uploadnow=false;
 | 
			
		||||
			localStorage.removeItem("image");
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -63,7 +63,6 @@ function spotifyFlagSave(){
 | 
			
		||||
        Materialize.toast(lang.lang_spotify_imgno, 3000);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
var uploadnow=false;
 | 
			
		||||
function nowplaying(mode){
 | 
			
		||||
    if(mode=="spotify"){
 | 
			
		||||
        var start = "https://thedesk.top/now-playing?at="+localStorage.getItem("spotify")+"&rt="+localStorage.getItem("spotify-refresh");
 | 
			
		||||
@@ -124,6 +123,10 @@ function nowplaying(mode){
 | 
			
		||||
    }else if(mode=="itunes"){
 | 
			
		||||
        var electron = require("electron");
 | 
			
		||||
	    var ipc = electron.ipcRenderer;
 | 
			
		||||
        if (ipc.listenerCount('itunes-np') > 0) {
 | 
			
		||||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
	    ipc.send('itunes', "");
 | 
			
		||||
	    ipc.once('itunes-np', function (event, arg) {
 | 
			
		||||
            console.log(arg);
 | 
			
		||||
@@ -135,13 +138,11 @@ function nowplaying(mode){
 | 
			
		||||
            var remote=electron.remote;
 | 
			
		||||
            var platform=remote.process.platform;
 | 
			
		||||
            if(platform=="win32"){
 | 
			
		||||
                if(!uploadnow && flag && arg.path){
 | 
			
		||||
                    uploadnow=true;
 | 
			
		||||
                if(flag && arg.path){
 | 
			
		||||
                    media(arg.path,"image/png","new");
 | 
			
		||||
                }
 | 
			
		||||
            }else if(platform=="darwin"){
 | 
			
		||||
                if(!uploadnow && flag && arg.artworks[0]){
 | 
			
		||||
                    uploadnow=true;
 | 
			
		||||
                if(flag && arg.artworks[0]){
 | 
			
		||||
                    ipc.send('bmp-image', [arg.artworks[0].path,0]);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user