From e16c9fba43b2c2ca26f534ebc237bb3f491862b3 Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 20 Mar 2019 13:50:00 +0900 Subject: [PATCH 01/15] compare for itunes-artworks --- app/package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 206f712c..e5dd793f 100644 --- a/app/package.json +++ b/app/package.json @@ -30,6 +30,11 @@ "name": "ぽぷんじゃ", "url": "https://popon.pptdn.jp/@popn_ja", "email": "popn.ja@gmail.com" + }, + { + "name": "kPherox", + "url": "https://www.kr-kp.com/", + "email": "admin@mail.kr-kp.com" } ], "license": "GPL-3.0", @@ -43,7 +48,7 @@ "vue": "^2.6.9" }, "optionalDependencies": { - "itunes-nowplaying-mac": "^0.2.3", + "itunes-nowplaying-mac": "github:rinsuki/itunes-nowplaying-mac#pull/1/head", "nowplaying-node": "^0.1.3" }, "build": { From 25662e87368102f5017600e68408dc3c89e90694 Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 20 Mar 2019 15:29:13 +0900 Subject: [PATCH 02/15] prepare for itunes-nowplaying artworks --- app/package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index ab63ffc0..6767665e 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "17.3.0", + "version": "18.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1602,8 +1602,7 @@ }, "itunes-nowplaying-mac": { "version": "0.2.3", - "resolved": "https://registry.npmjs.org/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.2.3.tgz", - "integrity": "sha512-1n418TnV4BnpSP6IzuxVECgPYnlm/nUZIXsblvzFVu4+rxmswXPnz3xi8XUq0r28I9njTi3g6vmBFa5YFHb8TA==", + "resolved": "github:rinsuki/itunes-nowplaying-mac#25e1902f83a609c759e1c6be8d8a3162a280b87f", "optional": true }, "jimp": { @@ -3374,4 +3373,4 @@ } } } -} +} \ No newline at end of file From e36379de44af6a4c861106001d5101f28aecc220 Mon Sep 17 00:00:00 2001 From: cutls Date: Wed, 20 Mar 2019 04:02:59 -0700 Subject: [PATCH 03/15] Nowplaying on macOS with an album artwork --- app/js/ui/spotify.js | 3 +++ app/main.js | 2 +- app/package-lock.json | 7 +++---- app/package.json | 17 ++++++++++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index d40f47fc..408db5ff 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -134,6 +134,9 @@ function nowplaying(mode){ if(flag && arg.path){ media(arg.path,"image/png","new"); } + if(flag && arg.artworks[0].path){ + ipc.send('bmp-image', [arg.artworks[0].path,0]); + } var regExp = new RegExp("{song}", "g"); content = content.replace(regExp, arg.name); var regExp = new RegExp("{album}", "g"); diff --git a/app/main.js b/app/main.js index ba30fc1c..918b5040 100644 --- a/app/main.js +++ b/app/main.js @@ -465,7 +465,7 @@ ipc.on('itunes', (e, args) => { if(platform=="darwin"){ const nowplaying = require("itunes-nowplaying-mac") nowplaying.getRawData().then(function (value) { - mainWindow.webContents.send('itunes-np', value); + mainWindow.webContents.send('itunes-np', value); }).catch(function (error) { // 非同期処理失敗。呼ばれない console.log(error); diff --git a/app/package-lock.json b/app/package-lock.json index 6767665e..ed662863 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1601,9 +1601,8 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "itunes-nowplaying-mac": { - "version": "0.2.3", - "resolved": "github:rinsuki/itunes-nowplaying-mac#25e1902f83a609c759e1c6be8d8a3162a280b87f", - "optional": true + "version": "github:rinsuki/itunes-nowplaying-mac#faf0f53c39d5f895eab9afadbac762914693a1fd", + "from": "github:rinsuki/itunes-nowplaying-mac#pull/1/head" }, "jimp": { "version": "0.2.28", @@ -3373,4 +3372,4 @@ } } } -} \ No newline at end of file +} diff --git a/app/package.json b/app/package.json index e5dd793f..56c11a78 100644 --- a/app/package.json +++ b/app/package.json @@ -48,8 +48,8 @@ "vue": "^2.6.9" }, "optionalDependencies": { - "itunes-nowplaying-mac": "github:rinsuki/itunes-nowplaying-mac#pull/1/head", - "nowplaying-node": "^0.1.3" + "nowplaying-node": "^0.1.3", + "itunes-nowplaying-mac": "github:rinsuki/itunes-nowplaying-mac#pull/1/head" }, "build": { "productName": "TheDesk", @@ -66,11 +66,14 @@ ] }, "appx": { - "identityName":"53491Cutls.TheDesk", - "applicationId":"Cutls.TheDesk", - "publisherDisplayName":"Cutls", - "publisher":"CN=629757F5-A5EE-474F-9562-B304A89A9FD1", - "languages":["JA-JP","EN-US"] + "identityName": "53491Cutls.TheDesk", + "applicationId": "Cutls.TheDesk", + "publisherDisplayName": "Cutls", + "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1", + "languages": [ + "JA-JP", + "EN-US" + ] }, "nsis": { "oneClick": false, From cf827e7c25c452298651758b83ef3637f6c7eeb2 Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 20 Mar 2019 20:08:33 +0900 Subject: [PATCH 04/15] some fix --- app/js/ui/spotify.js | 13 ++++++++----- app/main.js | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index 408db5ff..646e6e4a 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -131,11 +131,14 @@ function nowplaying(mode){ var content="#NowPlaying {song} / {album} / {artist}\n{url}"; } var flag=localStorage.getItem("artwork"); - if(flag && arg.path){ - media(arg.path,"image/png","new"); - } - if(flag && arg.artworks[0].path){ - ipc.send('bmp-image', [arg.artworks[0].path,0]); + if(arg.win){ + if(flag && arg.path){ + media(arg.path,"image/png","new"); + } + }else{ + if(flag && arg.artworks[0].path){ + ipc.send('bmp-image', [arg.artworks[0].path,0]); + } } var regExp = new RegExp("{song}", "g"); content = content.replace(regExp, arg.name); diff --git a/app/main.js b/app/main.js index 918b5040..dc169bbc 100644 --- a/app/main.js +++ b/app/main.js @@ -492,6 +492,7 @@ ipc.on('itunes', (e, args) => { } var value={ + win:true, name:myAIMP.getTitle(), artist:myAIMP.getArtist(), album:myAIMP.getAlbum(), From 216191563e39ceab310c81e72b82b0e8e7c5b3cf Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 20 Mar 2019 20:11:03 +0900 Subject: [PATCH 05/15] readme update --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5f5bc8ee..2f52bbaf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk) -[![Server-up time](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com/) Mastodon/Misskey client for PC(Windows/Linux/macOS) オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント Download:[TheDesk](https://thedesk.top) @@ -57,7 +56,7 @@ Crowdinから翻訳に参加してみませんか？: https://translate.thedesk. * sumchecker(in package.json) * Ability to read unformated files!(install yourself) -## Contributors/コントリビューター +## Contributors/主なコントリビューター macOSビルダー @@ -67,6 +66,10 @@ Linuxビルダー * [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja) +iTunes NowPlayingにアルバムアートワークを付けてくれた人 + +* [kPherox](https://www.kr-kp.com/) + ## Build/ビルド Misskey(misskey.xyz) application token is not in cutls/TheDesk From 6e9b0b4d10041d188fb4364b852ccb945f61e85c Mon Sep 17 00:00:00 2001 From: kPherox Date: Tue, 19 Mar 2019 22:07:49 +0900 Subject: [PATCH 06/15] Fix template {hz} --- app/js/ui/spotify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index 646e6e4a..3e388659 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -151,11 +151,11 @@ function nowplaying(mode){ var regExp = new RegExp("{composer}", "g"); content = content.replace(regExp, arg.composer); var regExp = new RegExp("{hz}", "g"); + content = content.replace(regExp, arg.sampleRate/1000+"kHz"); var regExp = new RegExp("{lyricist}", "g"); content = content.replace(regExp, ""); var regExp = new RegExp("{bpm}", "g"); content = content.replace(regExp, ""); - 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"); From f35056a916723642716c2c693146e83298174ee9 Mon Sep 17 00:00:00 2001 From: kPherox Date: Wed, 20 Mar 2019 21:59:29 +0900 Subject: [PATCH 07/15] Fix duplicate "itunes-np" listener --- app/js/ui/spotify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index 646e6e4a..cb010b11 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -124,7 +124,7 @@ function nowplaying(mode){ var electron = require("electron"); var ipc = electron.ipcRenderer; ipc.send('itunes', ""); - ipc.on('itunes-np', function (event, arg) { + ipc.once('itunes-np', function (event, arg) { console.log(arg); var content=localStorage.getItem("np-temp"); if(!content || content=="" || content=="null"){ From 32a16eb2a4a781c15c0e46d74874df25ea21d1ad Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 21 Mar 2019 02:26:42 +0900 Subject: [PATCH 08/15] iTunes templete --- app/js/ui/spotify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index 646e6e4a..aa3060a0 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -124,7 +124,7 @@ function nowplaying(mode){ var electron = require("electron"); var ipc = electron.ipcRenderer; ipc.send('itunes', ""); - ipc.on('itunes-np', function (event, arg) { + ipc.once('itunes-np', function (event, arg) { console.log(arg); var content=localStorage.getItem("np-temp"); if(!content || content=="" || content=="null"){ @@ -151,11 +151,11 @@ function nowplaying(mode){ var regExp = new RegExp("{composer}", "g"); content = content.replace(regExp, arg.composer); var regExp = new RegExp("{hz}", "g"); + content = content.replace(regExp, arg.sampleRate/1000+"kHz"); var regExp = new RegExp("{lyricist}", "g"); content = content.replace(regExp, ""); var regExp = new RegExp("{bpm}", "g"); content = content.replace(regExp, ""); - 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"); From ba074dd1b02ac9180e0e113c6f107b6961425f5d Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 21 Mar 2019 04:42:47 +0900 Subject: [PATCH 09/15] Column(Stack/Dock) --- app/css/tl.css | 15 ++++++++++++--- app/js/lang/lang.en.js | 2 ++ app/js/lang/lang.ja.js | 2 ++ app/js/ui/layout.js | 43 +++++++++++++++++++++++++++++++++++------- 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index 23298bad..8b6934b9 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -108,10 +108,15 @@ iframe { .box { overflow: hidden; min-width: 300px; - height: 100vh; flex: 1; - border: thin solid gray; border-top:none; + display:flex; + flex-direction: column; +} +.boxIn{ + height:100%; + border: thin solid gray; + overflow: hidden; } .box .pin,#his-data .pin{ display:none; @@ -131,7 +136,11 @@ iframe { .faicon_FTL{ display:none; } -.tl-box{ height:calc(100% - 40px); overflow-y:scroll; overflow-x:hidden } +.tl-box{ + position:relative; + height:calc(100% - 40px); + overflow-y:scroll; + overflow-x:hidden } .additional { overflow-x: scroll; width: 100%; diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js index 3565c150..d48fc0b4 100644 --- a/app/js/lang/lang.en.js +++ b/app/js/lang/lang.en.js @@ -122,6 +122,8 @@ var lang={ "lang_layout_webviewmode":"Prefer WebView", "lang_excluded":"Excluded type of notification", "lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)", + "lang_layout_leftFold":"Stack to the left", + "lang_layout_leftUnfold":"Dock on the right", //ui/sort.js "lang_sort_gothis":"Go to this column", "lang_sort_remthis":"Delete this column", diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js index 222928c2..923a6e91 100644 --- a/app/js/lang/lang.ja.js +++ b/app/js/lang/lang.ja.js @@ -122,6 +122,8 @@ var lang={ "lang_layout_webviewmode":"WebView優先", "lang_excluded":"除外する通知", "lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)", + "lang_layout_leftFold":"左へ重ねる", + "lang_layout_leftUnfold":"右へ出す", //ui/sort.js "lang_sort_gothis":"このカラムへ", "lang_sort_remthis":"このカラムを削除", diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 64bf2a2f..10209ae3 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -72,7 +72,9 @@ function parseColumn() { if ($("#timeline-container").length) { $("#timeline-container").html(""); } - Object.keys(obj).forEach(function(key) { + var basekey=0; + for(var key=0;key'; + $("#timeline-container").append(basehtml); + var left_hold='view_agenda'+lang.lang_layout_leftFold+'
'; + }else{ + var left_hold='view_column'+lang.lang_layout_leftUnfold+'
'; + } + if(key===0){ + left_hold=''; + } + var html='
'; - $("#timeline-container").append(html); + '" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'">
'+lang.lang_layout_nodata +'
' + $('#timeline_box_' + basekey + '_parentBox').append(html); localStorage.removeItem("pool_" + key); if (acct.data) { var data = acct.data; @@ -200,7 +213,7 @@ function parseColumn() { catchCheck(key); voiceCheck(key); } - }); + } var box = localStorage.getItem("box"); if (box == "absolute") { setTimeout(show, 1000); @@ -424,4 +437,20 @@ function webview(url,key,insert,icnsert,css){ '" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;">'; return html; +} +function leftFoldSet(key){ + var multi = localStorage.getItem("column"); + var obj = JSON.parse(multi); + obj[key].left_fold=true; + var json = JSON.stringify(obj); + localStorage.setItem("column", json); + parseColumn(); +} +function leftFoldRemove(key){ + var multi = localStorage.getItem("column"); + var obj = JSON.parse(multi); + obj[key].left_fold=false; + var json = JSON.stringify(obj); + localStorage.setItem("column", json); + parseColumn(); } \ No newline at end of file From a6cb385375f60dd7df1743b7e04f36cf13859c05 Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 21 Mar 2019 04:43:01 +0900 Subject: [PATCH 10/15] THeDesk Usamin (18.1.0) --- app/package.json | 2 +- app/view/make/index.sample.html | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/package.json b/app/package.json index 56c11a78..ca14f8d4 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "18.0.3", + "version": "18.1.0", "description": "TheDesk is a Mastodon client for PC.", "main": "main.js", "scripts": { diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 78521469..d9271dc4 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -583,24 +583,14 @@ var tlid=0; HP
GitHub

-