Pre-release, windows and linux support
Missing error handling, uninstall and advanced options
This commit is contained in:
Jiiks
parent
e5d91a8564
commit
51cf6e531c
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"name": "betterdiscordinstaller",
|
||||
"description": "Better Discord installer.",
|
||||
"version": "0.1.1",
|
||||
"homepage": "https://github.com/Jiiks/BetterDiscordApp",
|
||||
"license": "MIT",
|
||||
"main": "index.js",
|
||||
"dependencies": {
|
||||
"fs-extra": "^0.30.0",
|
||||
"readline": "^1.3.0",
|
||||
"open": "^0.0.5",
|
||||
"request": "^2.72.0",
|
||||
"path": "^0.12.7",
|
||||
"walk": "^2.3.9",
|
||||
"unzip": "^0.1.11"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron-prebuilt": "~1.2.8"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
'use strict';
|
||||
|
||||
const
|
||||
fs = require('fs'),
|
||||
path = require('path'),
|
||||
walk = require('walk'),
|
||||
p = require('path');
|
||||
|
||||
fs.mkdirPSync = function(dirPath) {
|
||||
try {
|
||||
fs.mkdirSync(dirPath);
|
||||
} catch(err) {
|
||||
if(err.errno === -4058 || err.errno === -2) {
|
||||
fs.mkdirPSync(path.dirname(dirPath));
|
||||
fs.mkdirPSync(dirPath);
|
||||
} else if(err.errno === -4075) {
|
||||
return "EXIST";
|
||||
} else {
|
||||
return "NOT OK";
|
||||
}
|
||||
}
|
||||
return "OK";
|
||||
}
|
||||
|
||||
class Asar {
|
||||
|
||||
constructor(filePath) {
|
||||
this.path = filePath;
|
||||
this.files = [];
|
||||
}
|
||||
|
||||
extract(statusCb, progressCb, cb) {
|
||||
this.walker = walk.walk(this.path, { followLinks: false });
|
||||
statusCb("Creating Directories");
|
||||
this.walker.on('file', (root, stat, next) => {
|
||||
this.files.push(`${root}/${stat.name}`);
|
||||
try {
|
||||
fs.statSync(root.replace("app.asar", "app"));
|
||||
} catch(err) {
|
||||
fs.mkdirPSync(root.replace("app.asar", "app"));
|
||||
}
|
||||
next();
|
||||
});
|
||||
|
||||
this.walker.on('end', () => {
|
||||
var self = this;
|
||||
statusCb("Copying files");
|
||||
var p = 1;
|
||||
var filecount = this.files.length;
|
||||
|
||||
function copy(files, index) {
|
||||
if(index >= filecount) {
|
||||
statusCb("Finished extracting app package");
|
||||
cb(null);
|
||||
return;
|
||||
}
|
||||
setTimeout(() => { self.copyfile(files, index, copy) }, 1);
|
||||
progressCb(index, filecount);
|
||||
}
|
||||
|
||||
copy(this.files, 0);
|
||||
});
|
||||
}
|
||||
|
||||
copyfile(files, index, cb) {
|
||||
fs.writeFileSync(files[index].replace("app.asar", "app"), fs.readFileSync(files[index]));
|
||||
cb(files, index+1);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Asar;
|
||||
|
|
@ -0,0 +1,650 @@
|
|||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src:local('Open Sans'), local('OpenSans'), url('../font/OpenSans-Regular.ttf') format('TrueType');
|
||||
}
|
||||
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Inconsolata';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Inconsolata'), url('../font/Inconsolata.woff2') format('woff2');
|
||||
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Inconsolata';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Inconsolata'), url('../font/Inconsolata.woff2') format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
|
||||
}
|
||||
|
||||
html, body {
|
||||
margin:0;
|
||||
padding:0;
|
||||
background: rgba(34, 35, 42, 1);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
html, body {
|
||||
width:800px;
|
||||
height:400px;
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: "Open Sans";
|
||||
color:#E8E8E8;
|
||||
outline:none;
|
||||
user-select: none;
|
||||
-webkit-user-select: none;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
a {
|
||||
cursor: pointer;
|
||||
color: dodgerblue;
|
||||
}
|
||||
|
||||
#titleBar {
|
||||
display:flex;
|
||||
-webkit-app-region: drag;
|
||||
pointer-events: none;
|
||||
width:100%;
|
||||
height:40px;
|
||||
background:rgba(34, 35, 42, 0.6);
|
||||
border-bottom:1px solid #000;
|
||||
box-shadow:0 1px 0 0 #303030;
|
||||
background: rgba(23, 23, 23, 0.6);
|
||||
border:none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#titleBar h3 {
|
||||
color:#FFF;
|
||||
}
|
||||
|
||||
.icon {
|
||||
display:inline-block;
|
||||
width:40px;
|
||||
height:40px;
|
||||
padding:5px;
|
||||
}
|
||||
|
||||
.icon-image {
|
||||
background:blue;
|
||||
height:30px;
|
||||
width:30px;
|
||||
}
|
||||
|
||||
.title {
|
||||
display:inline-block;
|
||||
height:40px;
|
||||
line-height:40px;
|
||||
color:#FFF;
|
||||
}
|
||||
|
||||
.main-container {
|
||||
display:flex;
|
||||
width:100%;
|
||||
height:calc(100% - 40px);
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
width:200px;
|
||||
height:358px;
|
||||
border-right:1px solid #000;
|
||||
box-shadow:1px 0 0 0 #303030;
|
||||
background:rgba(44, 45, 56, 0.6);
|
||||
z-index:90001;
|
||||
margin-top: 1px;
|
||||
border:none;
|
||||
margin:0;
|
||||
box-shadow: none;
|
||||
margin-left:1px;
|
||||
}
|
||||
|
||||
.sidebar-inner {
|
||||
width:100%;
|
||||
height:100%;
|
||||
padding:5px;
|
||||
}
|
||||
|
||||
.main {
|
||||
flex-grow:1;
|
||||
padding:5px;
|
||||
transform:translateX(0);
|
||||
}
|
||||
|
||||
.panel-container {
|
||||
position:absolute;
|
||||
left:10px;
|
||||
transition: all 0.5s ease-in-out;
|
||||
}
|
||||
|
||||
.panel {
|
||||
display:inline-block;
|
||||
width:580px;
|
||||
position:absolute;
|
||||
transition: all 0.5s ease-in-out;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-0 #uninstall {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-0 #back {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-0 #next {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-0 #cancel {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-1 #uninstall {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-1 #back {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-1 #next {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-1 #cancel {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-2 #uninstall {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-2 #back {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-2 #next {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-2 #cancel {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-3 #uninstall {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-3 #back {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-3 #next {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-3 #cancel {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.main-container.panel-0 #li-0:before {
|
||||
background:dodgerblue;
|
||||
}
|
||||
.main-container.panel-0 #li-1:before {
|
||||
background:gray;
|
||||
}
|
||||
.main-container.panel-0 #li-2:before {
|
||||
background:gray;
|
||||
}
|
||||
.main-container.panel-0 #li-3:before {
|
||||
background:gray;
|
||||
}
|
||||
|
||||
.main-container.panel-1 #li-0:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-1 #li-1:before {
|
||||
background:dodgerblue;
|
||||
}
|
||||
.main-container.panel-1 #li-2:before {
|
||||
background:gray;
|
||||
}
|
||||
.main-container.panel-1 #li-3:before {
|
||||
background:gray;
|
||||
}
|
||||
|
||||
.main-container.panel-2 #li-0:before,
|
||||
.main-container.panel-advanced #li-0:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-2 #li-1:before,
|
||||
.main-container.panel-advanced #li-1:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-2 #li-2:before,
|
||||
.main-container.panel-advanced #li-2:before {
|
||||
background:dodgerblue;
|
||||
}
|
||||
.main-container.panel-2 #li-3:before,
|
||||
.main-container.panel-advanced #li-3:before {
|
||||
background:gray;
|
||||
}
|
||||
.main-container.panel-2 #panel-advanced {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.main-container.panel-3 #li-0:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-3 #li-1:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-3 #li-2:before {
|
||||
background:#00D443;
|
||||
}
|
||||
.main-container.panel-3 #li-3:before {
|
||||
background:dodgerblue;
|
||||
}
|
||||
|
||||
|
||||
.main-container.panel-0 .panel-container {
|
||||
left: 10px;
|
||||
}
|
||||
.main-container.panel-1 .panel-container {
|
||||
left: -590px;
|
||||
}
|
||||
.main-container.panel-2 .panel-container,
|
||||
.main-container.panel-advanced .panel-container {
|
||||
left: -1180px;
|
||||
}
|
||||
.main-container.panel-3 .panel-container {
|
||||
left: -1770px;
|
||||
}
|
||||
|
||||
.main-container.panel-0 .panel-container #panel-0 {
|
||||
opacity: 1;
|
||||
}
|
||||
.main-container.panel-0 .panel-container #panel-1 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-0 .panel-container #panel-2 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-0 .panel-container #panel-3 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-1 .panel-container #panel-0 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-1 .panel-container #panel-1 {
|
||||
opacity: 1;
|
||||
}
|
||||
.main-container.panel-1 .panel-container #panel-2 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-1 .panel-container #panel-3 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-2 .panel-container #panel-0 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-2 .panel-container #panel-1 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-2 .panel-container #panel-2 {
|
||||
opacity: 1;
|
||||
}
|
||||
.main-container.panel-2 .panel-container #panel-3 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-3 .panel-container #panel-0 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-3 .panel-container #panel-1 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-3 .panel-container #panel-2 {
|
||||
opacity: 0;
|
||||
}
|
||||
.main-container.panel-3 .panel-container #panel-3 {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .controls button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced #panel-advanced {
|
||||
pointer-events: initial;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .panel-container #panel-0 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .panel-container #panel-1 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .panel-container #panel-2 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .panel-container #panel-3 {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.main-container.panel-advanced .panel-container #panel-advanced {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.main-container .panel-container #panel-advanced textarea {
|
||||
background: rgba(33, 34, 41, 0.98);
|
||||
width: 570px;
|
||||
height: 140px;
|
||||
resize: none;
|
||||
border: 1px solid #000;
|
||||
outline: 1px solid #303030;
|
||||
}
|
||||
|
||||
.main-container .panel-container #panel-advanced button {
|
||||
float: right;
|
||||
margin-right: 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.visible {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#panel-1 {
|
||||
left:600px;
|
||||
}
|
||||
|
||||
#panel-2 {
|
||||
left:1200px;
|
||||
}
|
||||
|
||||
#panel-advanced {
|
||||
left:1200px;
|
||||
}
|
||||
|
||||
#panel-3 {
|
||||
left:1775px;
|
||||
}
|
||||
|
||||
#licensetext {
|
||||
width: 100%;
|
||||
overflow-y: scroll;
|
||||
white-space: pre-line;
|
||||
height:280px;
|
||||
}
|
||||
|
||||
#licenseform {
|
||||
float:right;
|
||||
margin-top:5px;
|
||||
margin-right:10px;
|
||||
}
|
||||
|
||||
input[type='radio'] {
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
label {
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
label, input[type='radio']{
|
||||
font-size: 16px;
|
||||
display: inline-block;
|
||||
margin: 0;
|
||||
margin-left: 3px;
|
||||
line-height: 25px;
|
||||
height: 28px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
|
||||
ul {
|
||||
margin:0;
|
||||
padding:0;
|
||||
list-style:none;
|
||||
}
|
||||
|
||||
li {
|
||||
list-style:none;
|
||||
color:gray;
|
||||
}
|
||||
|
||||
li.active {
|
||||
color:#FFF;
|
||||
}
|
||||
|
||||
li.visited {
|
||||
color:#EBEBEB;
|
||||
}
|
||||
|
||||
.sidebar-inner li:before {
|
||||
content: "";
|
||||
display:inline-block;
|
||||
background:gray;
|
||||
border-radius: 50%;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
margin-right:3px;
|
||||
}
|
||||
|
||||
.sidebar-inner li.active:before {
|
||||
background:dodgerblue;
|
||||
}
|
||||
|
||||
.sidebar-inner li.visited:before {
|
||||
background:#00D443;
|
||||
}
|
||||
|
||||
.controls {
|
||||
position:absolute;
|
||||
bottom:5px;
|
||||
right:5px;
|
||||
}
|
||||
|
||||
button {
|
||||
color:gray;
|
||||
width:60px;
|
||||
background:#1b1c23;
|
||||
border-style:solid;
|
||||
border-color:#000;
|
||||
border-width:0 1px 1px 0;
|
||||
padding:5px;
|
||||
box-shadow:1px 1px 0 0 #303030 inset;
|
||||
cursor:pointer;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
color:#FFF;
|
||||
background:#24262f;
|
||||
}
|
||||
|
||||
button:disabled {
|
||||
background:#292929;
|
||||
border-color:#191919;
|
||||
color:gray;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
button:active {
|
||||
background: #232b2e;
|
||||
}
|
||||
button#advanced-settings {
|
||||
width: 100px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background:#282828 !important;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar, ::-webkit-scrollbar-track-piece {
|
||||
background:#383838 !important;
|
||||
}
|
||||
|
||||
input.path {
|
||||
width: 450px;
|
||||
height: 23px;
|
||||
background: rgb(27, 28, 35) none repeat scroll 0% 0%;
|
||||
border: 1px solid rgb(17, 17, 17);
|
||||
box-shadow: -1px -1px 0px 0px rgb(50, 49, 49) inset;
|
||||
border-width: 1px 0px 0px 1px;
|
||||
border-style: solid;
|
||||
border-color: #111;
|
||||
}
|
||||
|
||||
.modal {
|
||||
position: absolute;
|
||||
background: rgba(29, 29, 29, 0.71);
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 900000;
|
||||
}
|
||||
|
||||
.modal-container {
|
||||
background: #212229;
|
||||
width: 600px;
|
||||
height: 200px;
|
||||
position: relative;
|
||||
margin: auto;
|
||||
top: 100px;
|
||||
box-shadow: 0px 0px 5px 5px rgba(0, 0, 0, 0.39);
|
||||
}
|
||||
|
||||
.modal-header {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
background: #212229;
|
||||
padding-left: 10px;
|
||||
border-bottom: 1px solid #000;
|
||||
box-shadow: 0 1px 0 0 #303030;
|
||||
}
|
||||
|
||||
.modal-body {
|
||||
padding:30px;
|
||||
}
|
||||
|
||||
.modal-footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left:0;
|
||||
right: 0;
|
||||
height: 35px;
|
||||
padding-top:10px;
|
||||
background:#212229;
|
||||
box-shadow: 0 1px 0 0 #303030 inset;
|
||||
border-top: 1px solid #000;
|
||||
}
|
||||
|
||||
.modal-footer button {
|
||||
margin-right:5px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.splash {
|
||||
width:300px !important;
|
||||
height:100px !important;
|
||||
}
|
||||
.splash .wrapper {
|
||||
top:20px;
|
||||
width:40px;
|
||||
margin:auto;
|
||||
position:relative;
|
||||
}
|
||||
.splash .wrapper .spinner {
|
||||
width:30px;
|
||||
height:30px;
|
||||
border-radius:30px;
|
||||
border-width:5px;
|
||||
border-color:#121212 #404040 #404040 #404040;
|
||||
border-style:solid;
|
||||
animation: spin 0.7s linear infinite;
|
||||
}
|
||||
.splash .spinnertext {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
display: block;
|
||||
text-align: center;
|
||||
bottom: 10px;
|
||||
color: rgb(171, 171, 171);
|
||||
-webkit-animation: spinnertext-opacity 2s linear 0s infinite;
|
||||
}
|
||||
|
||||
@-webkit-keyframes spin {
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-webkit-keyframes spinnertext-opacity {
|
||||
0% {opacity: 0}
|
||||
20% {opacity: 0}
|
||||
50% {opacity: 1}
|
||||
100%{opacity: 0}
|
||||
}
|
||||
|
||||
#log {
|
||||
padding: 10px;
|
||||
height:294px;
|
||||
resize: none;
|
||||
width: 570px;
|
||||
background: rgba(42, 44, 55, 0.6);
|
||||
border: none;
|
||||
-webkit-user-select: text;
|
||||
word-wrap: break-word;
|
||||
white-space: pre-line;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
progress {
|
||||
position: absolute;
|
||||
bottom: -36px;
|
||||
left:0;
|
||||
width:525px;
|
||||
height: 27px;
|
||||
-webkit-appearance:none;
|
||||
}
|
||||
|
||||
progress::-webkit-progress-bar {
|
||||
background:rgba(42, 44, 55, 0.6);
|
||||
}
|
||||
|
||||
progress[value]::-webkit-progress-value {
|
||||
background-image: -webkit-linear-gradient(left, rgba(73,155,234,1) 0%, rgba(32,124,229,1) 100%);
|
||||
}
|
||||
|
||||
.border {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
border:1px solid #55BBF7;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.warning {
|
||||
color: red;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<html>
|
||||
<head>
|
||||
<head>
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
|
||||
</head>
|
||||
</head>
|
||||
<body>
|
||||
<div class="border"></div>
|
||||
<div id="titleBar">
|
||||
<div class="icon">
|
||||
<div class="icon-image"></div>
|
||||
</div>
|
||||
<div class="title">
|
||||
Error!
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div id="log" style="width:680px"></div>
|
||||
</div>
|
||||
<div>
|
||||
<button style="position: absolute;right: 10px;bottom: 6px;">OK</button>
|
||||
</div>
|
||||
</body>
|
||||
<script>
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
$(function() {
|
||||
ipcRenderer.send('async', '{ "arg": "geterror" }');
|
||||
});
|
||||
ipcRenderer.on('async-reply', (event, arg) => {
|
||||
console.log(event);
|
||||
console.log(arg);
|
||||
$("#log").text(arg);
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,153 @@
|
|||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="border"></div>
|
||||
<div id="titleBar">
|
||||
<div class="icon">
|
||||
<div class="icon-image"></div>
|
||||
</div>
|
||||
<div class="title">
|
||||
BetterDiscord Installer - v0.1.1
|
||||
</div>
|
||||
</div>
|
||||
<div class="main-container panel-0">
|
||||
<div class="sidebar">
|
||||
<div class="sidebar-inner">
|
||||
<ul>
|
||||
<li id="li-0" class="navli">Introduction</li>
|
||||
<li id="li-1" class="navli">License</li>
|
||||
<li id="li-2" class="navli">Destination</li>
|
||||
<li id="li-3" class="navli">Installation</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main">
|
||||
<div class="panel-container">
|
||||
<div class="panel" id="panel-0">
|
||||
<h2>Welcome to the BetterDiscord setup</h2>
|
||||
<p style="white-space:pre-line">
|
||||
The setup will install BetterDiscord on your computer.
|
||||
Click "Next" to continue or "Cancel" to exit the setup.
|
||||
BetterDiscord is not in any way affiliated with Discord
|
||||
For support join the <a href="https://betterdiscord.net/discord" target="_blank">official BetterDiscord support channel</a> in Discord
|
||||
</p>
|
||||
<p>
|
||||
<strong class="warning" style="font-size:12px">
|
||||
Do not contact Discord support about BetterDiscord issues!
|
||||
<br>
|
||||
If Discord breaks, ask in the BetterDiscord support channel!
|
||||
</strong>
|
||||
</p>
|
||||
<input name="cd" id="cd" type="checkbox">
|
||||
<label style="margin:0; line-height: 18px;" for="cd">I will not contact Discord support about BetterDiscord issues</label>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-1">
|
||||
<div id="licensetext">
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015-2016 Jiiks | Jiiks.net
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
</div>
|
||||
<form action="" id="licenseform">
|
||||
<input type="radio" name="licensegroup" value="Accept" id="accept" disabled="true"><label for="accept">Accept</label>
|
||||
<input type="radio" name="licensegroup" value="Decline" id="decline" checked="true"><label for="decline">Decline</label>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-2">
|
||||
<p style="font-size: 12px;">Setup will install BetterDiscord to the following location:</p>
|
||||
<input class="path" id="libpath" type="text" style="height:26px;" disabled="true" />
|
||||
<button id="libpathbtn" style="height:26px;">Browse</button>
|
||||
<p style="font-size:12px">
|
||||
*If you wish to install somewhere else then click "Browse" and select your path
|
||||
</p>
|
||||
<label for="discordPath" style="display:block; margin-top: 10px; font-size: 12px;">Discord Path:</label>
|
||||
<input class="path" id="discordPath" type="text" style="height:26px;" disabled="true" />
|
||||
<button id="path" style="height:26px;">Browse</button>
|
||||
<p style="font-size:12px">
|
||||
*If the path is not pointing to the latest version of Discord then click "Browse" and select it
|
||||
<br>
|
||||
*If you want to install to ptb/canary then click "Browse" and select it
|
||||
<br>
|
||||
*Installer will kill Discord process
|
||||
</p>
|
||||
<div class="checkboxGroup">
|
||||
<input type="checkbox" name="demotes" id="demotes">
|
||||
<label for="demotes" style="margin:0; line-height: 18px;">Disable emotes completely</label>
|
||||
</div>
|
||||
<div class="checkboxGroup">
|
||||
<input type="checkbox" name="restart" id="restart" checked="true">
|
||||
<label for="restart" style="margin:0; line-height: 18px;">Restart Discord after installation</label>
|
||||
</div>
|
||||
<button id="advanced-settings">Advanced</button>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-advanced">
|
||||
<span>Advanced settings</span> - <span class="warning">For advanced users only!</span>
|
||||
<ul>
|
||||
<li><input type="checkbox" name="aaot" id="aaot"><label for="aaot">Discord window always on top</label></li>
|
||||
<li><input type="checkbox" name="aframeless" id="aframeless" checked><label for="aframeless">Frameless Discord window</label></li>
|
||||
<li><input type="checkbox" name="atransparent" id="atransparent"><label for="atransparent">Transparent Discord window</label></li>
|
||||
<li><input type="checkbox" name="athickframe" id="athickframe"><label for="athickframe">Thick Frame</label></li>
|
||||
<li><input type="checkbox" name="aprefs" id="aprefs"><label for="aprefs">Use custom Web Preferences:</label></li>
|
||||
</ul>
|
||||
<textarea name="" id="" cols="30" rows="10"></textarea>
|
||||
<button id="advanced-close">Save</button>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-3">
|
||||
<div name="log" id="log"></div>
|
||||
<progress id="logpbar" value="0" max="100"></progress>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="controls">
|
||||
<button id="uninstall">Uninstall</button>
|
||||
<button id="back">Back</button>
|
||||
<button id="next" >Next</button>
|
||||
<button id="cancel">Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal" id="quit" style="display: none;">
|
||||
<div class="modal-container">
|
||||
<div class="modal-header">
|
||||
<span>Exit Setup?</span>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
Setup is not complete. If you exit now, BetterDiscord will not be installed.
|
||||
<br>
|
||||
Exit Setup?
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button id="modal-exit">
|
||||
Yes
|
||||
</button>
|
||||
<button id="modal-cancel">
|
||||
No
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
|
||||
<script type="text/javascript" src="js/main.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(window).blur(function(){
|
||||
$(".border").css("border-color", "#F76455");
|
||||
});
|
||||
$(window).focus(function(){
|
||||
$(".border").css("border-color", "#55BBF7");
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,202 @@
|
|||
'use strict';
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
|
||||
var config = {
|
||||
urls: {
|
||||
package: "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip",
|
||||
finish: "https://betterdiscord.net/installed"
|
||||
},
|
||||
discord: {
|
||||
lastKnownVersion: "0.0.291"
|
||||
},
|
||||
import: "BetterDiscordApp-stable16",
|
||||
cache: [
|
||||
"emotes_bttv.json",
|
||||
"emotes_bttv_2.json",
|
||||
"emotes_ffz.json",
|
||||
"emotes_twitch_global.json",
|
||||
"emotes_twitch_subscriber.json",
|
||||
"user.json"
|
||||
]
|
||||
};
|
||||
|
||||
(function() {
|
||||
//Pass latest config to core application
|
||||
ipcSendAsync("config", config);
|
||||
//Get Discord installation path
|
||||
ipcSendAsync("get", "discordpath" );
|
||||
//Get BetterDiscord installation path
|
||||
ipcSendAsync("get", "libpath");
|
||||
})();
|
||||
|
||||
|
||||
//Listeners
|
||||
(function() {
|
||||
|
||||
$("#cd").on("change", () => {
|
||||
$("#next").prop("disabled", !$("#cd").prop("checked"));
|
||||
});
|
||||
|
||||
var currentPanel = 0;
|
||||
|
||||
function switchPanel() {
|
||||
var container = $(".panel-container");
|
||||
var main = $(".main-container");
|
||||
main.removeClass();
|
||||
main.addClass(`main-container panel-${currentPanel}`)
|
||||
switch(currentPanel) {
|
||||
case 0:
|
||||
$("#next").text("Next");
|
||||
//$("#next").prop("disabled", !$("#cd").prop("checked"));
|
||||
break;
|
||||
case 1:
|
||||
$("#next").text("Next");
|
||||
//$("#next").prop("disabled", !$("#accept").prop("checked"));
|
||||
break;
|
||||
case 2:
|
||||
$("#next").text("Install");
|
||||
$("#cancel").text("Cancel");
|
||||
break;
|
||||
case 3:
|
||||
$("#cancel").text("Abort");
|
||||
ipcSendAsync("install");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$("#next").on("click", function() {
|
||||
currentPanel++;
|
||||
switchPanel();
|
||||
});
|
||||
|
||||
$("#back").on("click", function() {
|
||||
currentPanel--;
|
||||
switchPanel();
|
||||
});
|
||||
|
||||
$("#cancel").on("click", function() {
|
||||
$("#quit").show();
|
||||
});
|
||||
|
||||
$("#uninstall").on("click", function() {
|
||||
|
||||
});
|
||||
|
||||
$("#accept").on("change", function() {
|
||||
// $("#next").prop("disabled", !$(this).prop("checked"));
|
||||
});
|
||||
|
||||
$("#decline").on("change", function() {
|
||||
// $("#next").prop("disabled", $(this).prop("checked"));
|
||||
});
|
||||
|
||||
$("#licensetext").on("scroll", function() {
|
||||
var e = $(this);
|
||||
if(e.height() + e.scrollTop() >= e[0].scrollHeight) {
|
||||
$("#accept").prop("disabled", false);
|
||||
} else {
|
||||
$("#accept").prop("disabled", true);
|
||||
$("#decline").prop("checked", true)
|
||||
// $("#next").prop("disabled", true);
|
||||
}
|
||||
});
|
||||
|
||||
$(".modal").on("click", function(e) {
|
||||
if(e.target.className !== "modal") return;
|
||||
$(this).hide();
|
||||
});
|
||||
|
||||
$("#modal-cancel").on("click", function() {
|
||||
$(".modal").hide();
|
||||
});
|
||||
|
||||
$("#modal-exit").on("click", function() {
|
||||
ipcRenderer.send("async", {arg: "quit", data: []});
|
||||
});
|
||||
|
||||
$("#path").on("click", () => {
|
||||
ipcRenderer.send("async", { arg: "browsedialog", data: "discordpath" });
|
||||
});
|
||||
|
||||
$("#libpathbtn").on("click", () => {
|
||||
ipcRenderer.send("async", { arg: "browsedialog", data: "libpath" });
|
||||
});
|
||||
|
||||
$("#advanced-settings").on("click", function() {
|
||||
currentPanel = "advanced";
|
||||
switchPanel();
|
||||
});
|
||||
|
||||
$("#advanced-close").on("click", function() {
|
||||
var main = $(".main-container");
|
||||
currentPanel = 2;
|
||||
switchPanel();
|
||||
});
|
||||
|
||||
})();
|
||||
|
||||
ipcRenderer.on("async-reply", (event, arg) => {
|
||||
|
||||
var data = arg.data;
|
||||
arg = arg.arg;
|
||||
|
||||
switch(arg) {
|
||||
case "discordpath":
|
||||
$("#discordPath").val(data);
|
||||
break;
|
||||
case "libpath":
|
||||
$("#libpath").val(data);
|
||||
break;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
/*ipcRenderer.on('async-reply', (event, arg) => {
|
||||
switch(arg.arg) {
|
||||
case "exists":
|
||||
switch(arg.file) {
|
||||
case "install":
|
||||
if(arg.exists) {
|
||||
appendLog("Located app package");
|
||||
appendLog("Downloading latest BetterDiscord package");
|
||||
ipcRenderer.send('async', '{"arg": "download", "package": "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip" }');
|
||||
} else {
|
||||
appendLog("Unable to locate app.asar. Check your install path.");
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "discordpath":
|
||||
$("#discordPath").val(arg.path);
|
||||
break;
|
||||
case "locate-app.asar":
|
||||
appendLog(arg.data);
|
||||
break;
|
||||
}
|
||||
});*/
|
||||
|
||||
function ipcSendAsync(arg, data) {
|
||||
ipcRenderer.send("async", { arg: arg, data: data });
|
||||
}
|
||||
|
||||
function install() {
|
||||
appendLog("Initiating installation");
|
||||
appendLog("Locating Discord package");
|
||||
ipcRenderer.send('async', { "arg": "install" });
|
||||
}
|
||||
|
||||
function appendLog(text) {
|
||||
var log = $("#log");
|
||||
log.append(text+"\n");
|
||||
var sh = log[0].scrollHeight - 40;
|
||||
if(log.height() + log.scrollTop() >= sh) {
|
||||
log.scrollTop(sh);
|
||||
}
|
||||
}
|
||||
|
||||
function updatePbar(cur, max) {
|
||||
var pbar = $("#logpbar");
|
||||
pbar.val(cur);
|
||||
pbar.prop("max", max);
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
|
||||
ipcRenderer.on('async-reply', (event, arg) => {
|
||||
switch(arg) {
|
||||
case "update":
|
||||
$(".spinnertext").text("Downloading Update");
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
$(function() {
|
||||
ipcRenderer.send('async', '{ "arg": "update" }');
|
||||
});
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
<html>
|
||||
<head>
|
||||
<head>
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
|
||||
<script type="text/javascript" src="js/splash.js"></script>
|
||||
</head>
|
||||
</head>
|
||||
<body class="splash">
|
||||
<div class="border"></div>
|
||||
<div class="wrapper">
|
||||
<div class="spinner"></div>
|
||||
</div>
|
||||
<span class="spinnertext">Checking for updates...</span>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"windows": {
|
||||
"version": "0.1.0"
|
||||
},
|
||||
"osx": {
|
||||
"version": "0.1.1"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
'use strict';
|
||||
|
||||
var devMode = false;
|
||||
|
||||
const
|
||||
electron = require('electron'),
|
||||
app = electron.app,
|
||||
BrowserWindow = electron.BrowserWindow,
|
||||
ipcMain = electron.ipcMain,
|
||||
utils = require('./utils'),
|
||||
_utils = new utils();
|
||||
|
||||
var
|
||||
mainWindow,
|
||||
windowOptions = {
|
||||
width: 300,
|
||||
height: 100,
|
||||
fullscreenable: false,
|
||||
maximizable: false,
|
||||
frame: false,
|
||||
resizable: devMode ? true : false,
|
||||
alwaysOnTop: devMode ? true : false,
|
||||
transparent: false
|
||||
};
|
||||
|
||||
|
||||
class Index {
|
||||
|
||||
constructor() {
|
||||
app.on("ready", () => this.appReady());
|
||||
}
|
||||
|
||||
appReady() {
|
||||
mainWindow = new BrowserWindow(windowOptions);
|
||||
this.loadInstaller();
|
||||
}
|
||||
|
||||
loadInstaller() {
|
||||
this.installer = require('./installer_index');
|
||||
this.installerInstance = new this.installer(app, mainWindow, ipcMain, _utils);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = new Index();
|
||||
|
|
@ -0,0 +1,269 @@
|
|||
'use strict';
|
||||
|
||||
//Imports
|
||||
const
|
||||
path = require('path'),
|
||||
dialog = require('electron').dialog,
|
||||
fs = require("fs"),
|
||||
fse = require("fs-extra"),
|
||||
request = require('request'),
|
||||
unzip = require('unzip'),
|
||||
readline = require('readline'),
|
||||
asar = require('./asar');
|
||||
|
||||
const platform = (process.platform !== "win32" && process.platform !== "darwin") ? "linux" : process.platform;
|
||||
|
||||
|
||||
var
|
||||
config = {
|
||||
urls: {
|
||||
package: "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip",
|
||||
finish: "https://betterdiscord.net/installed"
|
||||
},
|
||||
discord: {
|
||||
lastKnownVersion: "0.0.292"
|
||||
},
|
||||
import: "BetterDiscordApp-stable16",
|
||||
cache: [
|
||||
"emotes_bttv.json",
|
||||
"emotes_bttv_2.json",
|
||||
"emotes_ffz.json",
|
||||
"emotes_twitch_global.json",
|
||||
"emotes_twitch_subscriber.json",
|
||||
"user.json"
|
||||
],
|
||||
paths: {
|
||||
installPath: "",
|
||||
libPath: ""
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class Installer {
|
||||
|
||||
constructor(app, mainWindow, ipc, utils) {
|
||||
this.app = app;
|
||||
this.utils = utils;
|
||||
this.initConfig();
|
||||
mainWindow.setSize(800, 400);
|
||||
mainWindow.center();
|
||||
mainWindow.loadURL(`file://${__dirname}/data/index.html`);
|
||||
this.webContents = mainWindow.webContents;
|
||||
ipc.on('async', (event, arg) => this.receiveAsync(event, arg));
|
||||
}
|
||||
|
||||
initConfig() {
|
||||
config.paths.installPath = path.normalize(this.utils.installPath(config.discord.lastKnownVersion));
|
||||
config.paths.libPath = path.normalize(this.utils.libPath());
|
||||
}
|
||||
|
||||
install() {
|
||||
this.utils.log("Config: " + JSON.stringify(config));
|
||||
this.appendLog("Initializing");
|
||||
this.locateAppPackage();
|
||||
}
|
||||
|
||||
locateAppPackage() {
|
||||
var p = path.normalize(`${config.paths.installPath}/resources`);
|
||||
var pkg = fs.readdirSync(p).filter(file => {
|
||||
if(file === "app.asar") {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
if(pkg.length <= 0) {
|
||||
//App package not found
|
||||
this.appendLog("Unable to locate app package, check the logs for errors");
|
||||
return;
|
||||
}
|
||||
|
||||
this.appendLog("Located app package");
|
||||
this.downloadBd();
|
||||
//this.extractAppPackage();
|
||||
}
|
||||
|
||||
downloadBd() {
|
||||
|
||||
var self = this;
|
||||
this.appendLog("Downloading BetterDiscord");
|
||||
|
||||
var error = false;
|
||||
var size = 0;
|
||||
var downloaded = 0;
|
||||
|
||||
var req = request({
|
||||
method: 'GET',
|
||||
uri: config.urls.package
|
||||
});
|
||||
|
||||
req.pipe(unzip.Extract({ path: path.normalize(config.paths.libPath) }));
|
||||
|
||||
req.on('data', chunk => {
|
||||
downloaded += chunk.length;
|
||||
this.updatePb(downloaded, size);
|
||||
});
|
||||
|
||||
req.on('response', data => {
|
||||
size = data.headers['content-length'];
|
||||
});
|
||||
|
||||
req.on('error', err => {
|
||||
error = true;
|
||||
self.utils.log(err);
|
||||
self.appendLog("Failed to download BetterDiscord package, check the logs for errors");
|
||||
});
|
||||
|
||||
req.on('end', () => {
|
||||
console.log("got here?");
|
||||
if(error) {
|
||||
self.appendLog("Failed to download BetterDiscord package, check the logs for errors");
|
||||
} else {
|
||||
self.extractAppPackage();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
extractAppPackage() {
|
||||
var self = this;
|
||||
|
||||
try {
|
||||
if(fs.existsSync(`${config.paths.installPath}/resources/app`)) {
|
||||
self.appendLog("Deleting old app directory");
|
||||
setTimeout(() => {
|
||||
fse.removeSync(`${config.paths.installPath}/resources/app`);
|
||||
extract();
|
||||
}, 500);
|
||||
} else {
|
||||
extract();
|
||||
}
|
||||
} catch(err) {
|
||||
self.appendLog("Could not delete old app directory, check the logs for errors");
|
||||
return;
|
||||
}
|
||||
|
||||
function extract() {
|
||||
try {
|
||||
self.appendLog("Extracting app package");
|
||||
var a = new asar(`${config.paths.installPath}/resources/app.asar`);
|
||||
a.extract(msg => {
|
||||
self.appendLog(msg);
|
||||
}, (curIndex, total) => {
|
||||
self.updatePb(curIndex, total);
|
||||
}, err => {
|
||||
if(err === null) {
|
||||
self.inject();
|
||||
} else {
|
||||
self.log(err);
|
||||
self.appendLog("Failed to extract app package, check the logs for errors");
|
||||
self.clean();
|
||||
}
|
||||
});
|
||||
}catch(err) {
|
||||
console.log(err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inject() {
|
||||
var self = this;
|
||||
this.updatePb(0, 5);
|
||||
this.appendLog("Injecting loader");
|
||||
|
||||
var lines = [];
|
||||
var lr = readline.createInterface({
|
||||
input: fs.createReadStream(`${config.paths.installPath}/resources/app/app/index.js`)
|
||||
});
|
||||
|
||||
lr.on('line', line => {
|
||||
lines.push(line);
|
||||
|
||||
if(line.indexOf("'use strict';") > -1) {
|
||||
lines.push(path.normalize(`var _betterDiscord = require('${config.paths.libPath}/${config.import}');`).replace(/\\/g,"/"));
|
||||
lines.push("var _betterDiscord2;");
|
||||
}
|
||||
|
||||
if(line.indexOf("mainWindow = new BrowserWindow(mainWindowOptions);") > -1) {
|
||||
lines.push(` _betterDiscord2 = new _betterDiscord.BetterDiscord(mainWindow, false);`);
|
||||
}
|
||||
});
|
||||
|
||||
lr.on('close', () => {
|
||||
fs.writeFileSync(`${config.paths.installPath}/resources/app/app/index.js`, lines.join('\n'));
|
||||
self.appendLog("Finished installing BetterDiscord");
|
||||
self.updatePb(5, 5);
|
||||
});
|
||||
}
|
||||
|
||||
clean() {
|
||||
this.appendLog("Cleaning installation");
|
||||
try {
|
||||
if(fs.existsSync(`${config.paths.installPath}/resources/app`)) {
|
||||
self.appendLog("Deleting app directory");
|
||||
setTimeout(() => {
|
||||
fse.removeSync(`${config.paths.installPath}/resources/app`);
|
||||
}, 500);
|
||||
}
|
||||
} catch(err) {
|
||||
self.appendLog("Could not delete old app directory, check the logs for errors");
|
||||
}
|
||||
}
|
||||
|
||||
appendLog(msg) {
|
||||
this.utils.log(msg);
|
||||
this.webContents.executeJavaScript(`appendLog("${msg}");`);
|
||||
}
|
||||
|
||||
updatePb(cur, max) {
|
||||
this.webContents.executeJavaScript(`updatePbar(${cur}, ${max});`);
|
||||
}
|
||||
|
||||
getData(e) {
|
||||
switch(e) {
|
||||
case "discordpath":
|
||||
return config.paths.installPath;
|
||||
case "libpath":
|
||||
return config.paths.libPath;
|
||||
}
|
||||
}
|
||||
|
||||
receiveAsync(event, arg) {
|
||||
|
||||
var data = arg.data || '';
|
||||
arg = arg.arg;
|
||||
|
||||
switch(arg) {
|
||||
case "get":
|
||||
this.replyAsync(event, data, this.getData(data));
|
||||
break;
|
||||
case "browsedialog":
|
||||
var path = dialog.showOpenDialog({ properties: ['openDirectory'] });
|
||||
|
||||
switch(data) {
|
||||
case "discordpath":
|
||||
path = path === undefined ? config.paths.installPath : path[0];
|
||||
config.paths.installPath = path;
|
||||
break;
|
||||
case "libpath":
|
||||
path = path === undefined ? config.paths.libPath : path[0];
|
||||
config.paths.libPath = path;
|
||||
break;
|
||||
}
|
||||
|
||||
this.replyAsync(event, data, path);
|
||||
break;
|
||||
case "install":
|
||||
this.install();
|
||||
break;
|
||||
case "quit":
|
||||
this.app.quit();
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
replyAsync(event, arg, data) {
|
||||
event.sender.send('async-reply', { "arg": arg, "data": data });
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Installer;
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"name": "Install",
|
||||
"description": "Better Discord enhances Discord.",
|
||||
"version": "0.1.1",
|
||||
"homepage": "https://github.com/Jiiks/BetterDiscordApp",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"electron-prebuilt": "^1.0.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
'use strict';
|
||||
|
||||
class Updater {
|
||||
|
||||
constructor(utils) {
|
||||
this.utils = utils;
|
||||
}
|
||||
|
||||
update() {
|
||||
var self = this;
|
||||
var promises = [
|
||||
new Promise((resolve, reject) => {
|
||||
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/index.html", (error, data)
|
||||
if(error) {
|
||||
error(data, true);
|
||||
reject();
|
||||
return;
|
||||
}
|
||||
self.utils.log("Succesfully loaded index.html");
|
||||
resolve();
|
||||
});
|
||||
}),
|
||||
new Promise((resolve, reject) => {
|
||||
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/js/main.js", (error, data)
|
||||
if(error) {
|
||||
error(data, true);
|
||||
reject();
|
||||
return;
|
||||
}
|
||||
self.utils.log("Succesfully loaded main.js");
|
||||
resolve();
|
||||
});
|
||||
}),
|
||||
new Promise((resolve, reject) => {
|
||||
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/css/main.css", (error, dat
|
||||
if(error) {
|
||||
error(data, true);
|
||||
reject();
|
||||
return;
|
||||
}
|
||||
self.utils.log("Succesfully loaded main.css");
|
||||
resolve();
|
||||
});
|
||||
})
|
||||
];
|
||||
return Promise.all(promises);
|
||||
}
|
||||
|
||||
checkForUpdates(okCb, errorCb) {
|
||||
_utils.downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/vi.json", (error, data) => {
|
||||
if(error) {
|
||||
errorCb(data);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
data = JSON.parse(data);
|
||||
}catch(err) {
|
||||
errorCb(err);
|
||||
return;
|
||||
}
|
||||
|
||||
switch(platform) {
|
||||
case "win32":
|
||||
okCb(data.windows.version > vi.windows.version);
|
||||
break;
|
||||
case "darwin":
|
||||
okCb(data.osx.version > vi.osx.version);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Updater;
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
'use strict';
|
||||
|
||||
const
|
||||
https = require('https'),
|
||||
fs = require('fs'),
|
||||
eol = require('os').EOL,
|
||||
platform = (process.platform !== "win32" && process.platform !== "darwin") ? "linux" : process.platform;
|
||||
|
||||
class Utils {
|
||||
|
||||
constructor() {
|
||||
this.logs = "";
|
||||
}
|
||||
|
||||
log(message) {
|
||||
var d = new Date();
|
||||
var ds = ("00" + (d.getDate() + 1)).slice(-2) + "/" +
|
||||
("00" + d.getMonth()).slice(-2) + "/" +
|
||||
d.getFullYear() + " " +
|
||||
("00" + d.getHours()).slice(-2) + ":" +
|
||||
("00" + d.getMinutes()).slice(-2) + ":" +
|
||||
("00" + d.getSeconds()).slice(-2);
|
||||
console.log(`[${ds}] ${message}`);
|
||||
this.logs += `[${ds}] ${message}${eol}`;
|
||||
this.saveLogs();
|
||||
}
|
||||
|
||||
printLogs() {
|
||||
console.log(this.logs);
|
||||
}
|
||||
|
||||
saveLogs() {
|
||||
fs.writeFileSync("logs.log", this.logs);
|
||||
}
|
||||
|
||||
downloadResource(resource, callback, host) {
|
||||
https.get({
|
||||
host: host || "raw.githubusercontent.com",
|
||||
path: resource,
|
||||
headers: { 'user-agent': 'Mozilla/5.0' }
|
||||
},
|
||||
(response) => {
|
||||
var data = "";
|
||||
response.on("data", (chunk) => {
|
||||
data += chunk;
|
||||
});
|
||||
response.on("end", () => {
|
||||
callback(false, data);
|
||||
});
|
||||
response.on("error", (e) => {
|
||||
callback(true, e);
|
||||
});
|
||||
}).on('error', (e) => {
|
||||
callback(true, e);
|
||||
});
|
||||
}
|
||||
|
||||
installPath(lastKnownVersion) {
|
||||
|
||||
return {
|
||||
"win32": () => {
|
||||
var hver = lastKnownVersion;
|
||||
var path = `${process.env.LOCALAPPDATA}/Discord/app-${lastKnownVersion}\\`;
|
||||
fs.readdirSync(`${process.env.LOCALAPPDATA}/Discord/`).filter(function(file) {
|
||||
var tpath = `${process.env.LOCALAPPDATA}/Discord/${file}`;
|
||||
if(!fs.statSync(tpath).isDirectory()) return;
|
||||
|
||||
if(!file.startsWith("app-")) return;
|
||||
var ver = file.replace("app-", "");
|
||||
if(ver < hver) return;
|
||||
hver = ver;
|
||||
path = tpath;
|
||||
});
|
||||
return path;
|
||||
},
|
||||
"darwin": () => "/Applications/Discord.app",
|
||||
"linux": () => "" // TODO
|
||||
}[platform]();
|
||||
|
||||
}
|
||||
|
||||
libPath() {
|
||||
return {
|
||||
"win32": () => {
|
||||
return `${process.env.APPDATA}/BetterDiscord/lib`;
|
||||
},
|
||||
"linux": () => {
|
||||
return ""; // TODO
|
||||
}
|
||||
}[platform]();
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Utils;
|
||||
Loading…
Reference in New Issue