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

TheDesk Miria (17.0.1)

Browse Source
This commit is contained in:
Cutls 2019-02-27 10:17:35 +09:00
parent 4d5916b595
commit 75a397aafd
14 changed files with 101 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -86,11 +86,11 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール
### electron-packager
Windows
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=3.0.10 --icon=.\app\thedesk.ico --overwrite`
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`
Linux
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite`
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`
macOS
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=3.0.10 --icon=./app/icon.icns --overwrite`
`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`
### electron-builder

107
app/main.js
View File

@ -280,65 +280,13 @@ ipc.on('shot-img-dl', (e, args) => {
})
//アプデDL
ipc.on('download-btn', (e, args) => {
console.log(args);
var platform=process.platform;
var bit=process.arch;
var versioning=args[3];
var portable=args[2];
if(platform=="win32" || platform=="linux" || platform=="darwin" ){
var exe=false;
if(platform=="win32" && bit=="x64"){
if(portable){
var zip="TheDesk.exe";
}else{
var zip="TheDesk-setup.exe";
}
exe=true;
}else if(platform=="win32" && bit=="ia32"){
if(portable){
var zip="TheDesk-ia32.exe";
}else{
var zip="TheDesk-setup-ia32.exe";
}
exe=true;
}else if(platform=="linux" && bit=="x64"){
var zip="TheDesk-linux-x64.zip";
}else if(platform=="linux" && bit=="ia32"){
var zip="TheDesk-linux-ia32.zip";
}else if(platform=="darwin"){
var zip="TheDesk-darwin-x64.zip";
}else{
return;
}
if(versioning && !exe){
zip=zip.replace(".zip","."+args[1]+".zip");
}else if(versioning){
zip=zip.replace(".exe","."+args[1]+".exe");
}
}else{
const options = {
type: 'info',
title: 'Other OS Supporting System',
message: "thedesk.topをブラウザで開きます。",
buttons: ['OK']
}
dialog.showMessageBox(options, function(index) {
shell.openExternal("https://thedesk.top");
})
return;
if(bit=="x64"){
var zip="TheDesk-linux-x64.zip";
}else if(bit=="ia32"){
var zip="TheDesk-linux-ia32.zip";
}
}
var ver=args[1];
console.log(zip);
if(args[0]=="true"){
dialog.showSaveDialog(null, {
title: '保存',
properties: ['openFile', 'createDirectory'],
defaultPath: zip
defaultPath: args[1]
}, (savedFiles) => {
console.log(savedFiles);
if(!savedFiles){
@ -354,13 +302,8 @@ ipc.on('download-btn', (e, args) => {
fs.statSync(savedFiles);
fs.unlink(savedFiles);
}
console.log(m[1]+":"+savedFiles)
dl(portable,ver,m[1],savedFiles);
dl(args[0],args[1],savedFiles);
});
}else{
dl(portable,ver);
}
});
function isExistFile(file) {
try {
@ -370,48 +313,10 @@ function isExistFile(file) {
if(err.code === 'ENOENT') return false
}
}
function dl(portable,ver,files,fullname){
console.log(files);
var platform=process.platform;
var bit=process.arch;
if(platform=="win32"){
if(bit=="x64"){
if(portable){
var zip="TheDesk.exe";
}else{
var zip="TheDesk-setup.exe";
}
}else if(bit=="ia32"){
if(portable){
var zip="TheDesk-ia32.exe";
}else{
var zip="TheDesk-setup-ia32.exe";
}
}
}else if(platform=="linux"){
if(bit=="x64"){
var zip="TheDesk-linux-x64.zip";
}else if(bit=="ia32"){
var zip="TheDesk-linux-ia32.zip";
}
}else if(platform=="darwin"){
var zip="TheDesk-darwin-x64.zip";
}
//zip=zip+"?"+ver;
var l = 8;
// 生成する文字列に含める文字セット
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var cl = c.length;
var r = "";
for(var i=0; i<l; i++){
r += c[Math.floor(Math.random()*cl)];
}
function dl(url,file,dir){
updatewin.webContents.send('mess', "ダウンロードを開始します。");
const opts = {
directory:fullname,
directory:dir,
openFolderWhenDone: true,
onProgress: function(e) {
updatewin.webContents.send('prog', e);
@ -419,7 +324,7 @@ function dl(portable,ver,files,fullname){
saveAs: false
};
download(BrowserWindow.getFocusedWindow(),
'https://dl.thedesk.top/'+zip, opts)
url, opts)
.then(dl => {
updatewin.webContents.send('mess', "ダウンロードが完了しました。");
app.quit();

2
app/package.json
View File

@ -76,7 +76,7 @@
"electronVersion": "3.0.10"
},
"devDependencies": {
"electron": "^3.0.10",
"electron": "^4.0.5",
"electron-packager": "^13.0.1",
"electron-prebuilt": "^1.4.13",
"electron-rebuild": "^1.8.4"

5
app/view/en/index.html
View File

@ -559,7 +559,10 @@ var tlid=0;
バグ修正<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div>
<br><br>
<h3>Support TheDesk!</h3>

8
app/view/en/setting.html
View File

@ -59,12 +59,12 @@
<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
<label for="ntf_no">No</label>
<br>
<h5>Minimam width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
<h5>Minimum width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
<br>
<input type="text" style="width:50px" id="width">pxabove
<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
<br>
<h5>Width of TweetDeck browser</h5>
<h5>Minimum width of TweetDeck browser</h5>
<input type="text" style="width:50px" id="fixwidth">pxabove
<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
<br>
@ -319,7 +319,7 @@
<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
</div>
<div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
<!-->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>
@ -334,7 +334,7 @@
<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>
<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>

18
app/view/en/update.html
View File

@ -80,6 +80,7 @@ a,button,input,label,i{
<span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
<span class="linux">{{snap}}<br></span>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
<br>
@ -138,17 +139,32 @@ function update(sel){
if(sel=="installer"){
if(bit=="64"){
var url=json["winx64"];
var file="TheDesk-setup.exe";
}else if(bit=="32"){
var url=json["winia32"];
var file="TheDesk-setup-ia32.exe";
}
}else if(sel=="portable"){
if(bit=="64"){
var url=json["winx64p"];
var file="TheDesk.exe";
}else if(bit=="32"){
var url=json["winia32p"];
var file="TheDesk-ia32.exe";
}
}else if(sel=="linux"){
if(bit=="64"){
var url=json["linuxx64"];
var file="TheDesk-linux-x64.zip";
}else if(bit=="32"){
var url=json["linuxia64"];
var file="TheDesk-linux-ia32.zip";
}
ipc.send('download-btn', url);
}else if(sel=="mac"){
var url=json["mac"];
var file="TheDesk-darwin-x64.zip";
}
ipc.send('download-btn', [url,file]);
});
}

5
app/view/ja/index.html
View File

@ -559,7 +559,10 @@ var tlid=0;
バグ修正<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div>
<br><br>
<h3>ご支援ください。</h3>

6
app/view/ja/setting.html
View File

@ -64,7 +64,7 @@
<input type="text" style="width:50px" id="width">px以上
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
<h5>TweetDeckの固定幅</h5>
<h5>TweetDeckの限定の最低横幅</h5>
<input type="text" style="width:50px" id="fixwidth">px以上
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
@ -319,7 +319,7 @@
<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
</div>
<div class="collapsible-body">
<h5>NowPlayingのソース(Windows)</h5>
<!-->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>
@ -334,7 +334,7 @@
<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>
<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>

18
app/view/ja/update.html
View File

@ -80,6 +80,7 @@ a,button,input,label,i{
<span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
<span class="linux">{{snap}}<br></span>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
<br>
@ -138,17 +139,32 @@ function update(sel){
if(sel=="installer"){
if(bit=="64"){
var url=json["winx64"];
var file="TheDesk-setup.exe";
}else if(bit=="32"){
var url=json["winia32"];
var file="TheDesk-setup-ia32.exe";
}
}else if(sel=="portable"){
if(bit=="64"){
var url=json["winx64p"];
var file="TheDesk.exe";
}else if(bit=="32"){
var url=json["winia32p"];
var file="TheDesk-ia32.exe";
}
}else if(sel=="linux"){
if(bit=="64"){
var url=json["linuxx64"];
var file="TheDesk-linux-x64.zip";
}else if(bit=="32"){
var url=json["linuxia64"];
var file="TheDesk-linux-ia32.zip";
}
ipc.send('download-btn', url);
}else if(sel=="mac"){
var url=json["mac"];
var file="TheDesk-darwin-x64.zip";
}
ipc.send('download-btn', [url,file]);
});
}

4
app/view/make/setting.sample.html
View File

@ -319,7 +319,7 @@
<i class="fa fa-spotify"></i>{{spotify}}
</div>
<div class="collapsible-body">
<h5>{{npProvider}}</h5>
<!-->h5>{{npProvider}}</h5>
{{npPeoviderWarn}}<br>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<label for="aimp">AIMP</label>
@ -334,7 +334,7 @@
<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>
<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>

18
app/view/make/update.sample.html
View File

@ -80,6 +80,7 @@ a,button,input,label,i{
<span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
<span class="linux">{{snap}}<br></span>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
<br>
@ -138,17 +139,32 @@ function update(sel){
if(sel=="installer"){
if(bit=="64"){
var url=json["winx64"];
var file="TheDesk-setup.exe";
}else if(bit=="32"){
var url=json["winia32"];
var file="TheDesk-setup-ia32.exe";
}
}else if(sel=="portable"){
if(bit=="64"){
var url=json["winx64p"];
var file="TheDesk.exe";
}else if(bit=="32"){
var url=json["winia32p"];
var file="TheDesk-ia32.exe";
}
}else if(sel=="linux"){
if(bit=="64"){
var url=json["linuxx64"];
var file="TheDesk-linux-x64.zip";
}else if(bit=="32"){
var url=json["linuxia64"];
var file="TheDesk-linux-ia32.zip";
}
ipc.send('download-btn', url);
}else if(sel=="mac"){
var url=json["mac"];
var file="TheDesk-darwin-x64.zip";
}
ipc.send('download-btn', [url,file]);
});
}

5
app/view/ps/index.html
View File

@ -559,7 +559,10 @@ var tlid=0;
バグ修正<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div>
<br><br>
<h3>crwdns473:0crwdne473:0</h3>

4
app/view/ps/setting.html
View File

@ -319,7 +319,7 @@
<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
</div>
<div class="collapsible-body">
<h5>{{npProvider}}</h5>
<!-->h5>{{npProvider}}</h5>
{{npPeoviderWarn}}<br>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<label for="aimp">AIMP</label>
@ -334,7 +334,7 @@
<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>
<label for="cad">CAD</label><br><br-->
crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
<h5>crwdns627:0crwdne627:0</h5>
crwdns628:0crwdne628:0<br>

18
app/view/ps/update.html
View File

@ -80,6 +80,7 @@ a,button,input,label,i{
<span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
<span class="linux">{{snap}}<br></span>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
<br>
@ -138,17 +139,32 @@ function update(sel){
if(sel=="installer"){
if(bit=="64"){
var url=json["winx64"];
var file="TheDesk-setup.exe";
}else if(bit=="32"){
var url=json["winia32"];
var file="TheDesk-setup-ia32.exe";
}
}else if(sel=="portable"){
if(bit=="64"){
var url=json["winx64p"];
var file="TheDesk.exe";
}else if(bit=="32"){
var url=json["winia32p"];
var file="TheDesk-ia32.exe";
}
}else if(sel=="linux"){
if(bit=="64"){
var url=json["linuxx64"];
var file="TheDesk-linux-x64.zip";
}else if(bit=="32"){
var url=json["linuxia64"];
var file="TheDesk-linux-ia32.zip";
}
ipc.send('download-btn', url);
}else if(sel=="mac"){
var url=json["mac"];
var file="TheDesk-darwin-x64.zip";
}
ipc.send('download-btn', [url,file]);
});
}