TeaSpeak/TeaSpeak-Client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.did.science/WolverinDEV/TeaSpeak-Client

Browse Source
This commit is contained in:
WolverinDEV 2019-09-01 14:15:05 +02:00
commit 7ec9e7b79e
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
github

@ -1 +1 @@
Subproject commit 2dd1f60e8d034a68bbca9afe294070c8a83caa9e
Subproject commit 06391c6cdd772c2f83c1387960f7224f7cd9f514

10
installer/build.ts
View File

@ -28,6 +28,16 @@ if(!pkg.dependencies['electron']) {
process.exit(1);
}
options["version-string"] = {
'CompanyName': 'TeaSpeak',
'LegalCopyright': '© 2018-2019 Markus Hadenfeldt All Rights Reserved',
'FileDescription' : 'The TeaSpeak-Client Application',
'OriginalFilename' : 'TeaClient.exe',
'FileVersion' : pkg.version,
'ProductVersion' : pkg.version,
'ProductName' : 'TeaSpeak-Client',
'InternalName' : 'TeaClient.exe'
}
options.electronVersion = pkg.dependencies['electron'];
options.protocols = [{name: "TeaSpeak - Connect", schemes: ["teaserver"]}];
options.overwrite = true;

6
modules/core/ui-loader/loader.ts
View File

@ -106,7 +106,9 @@ function get_raw_app_files() : Promise<VersionedFile[]> {
function download_raw_app_files() : Promise<VersionedFile[]> {
return get_raw_app_files().then(response => {
for(let file of response) {
file.local_url = () => fs.mkdirs(local_path + file.path + "/").then(() => new Promise<String>((resolve, reject) => {
const full_path = path.join(local_path, file.path, file.name);
file.local_url = () => fs.mkdirs(path.dirname(full_path)).then(() => new Promise<String>((resolve, reject) => {
const write_stream = fs.createWriteStream(full_path);
request.get(remote_url() + "api.php?" + querystring.stringify({
type: "file",
path: file.path,
@ -121,7 +123,7 @@ function download_raw_app_files() : Promise<VersionedFile[]> {
}).on('complete', event => {
}).on('error', error => {
setImmediate(reject, error);
}).pipe(fs.createWriteStream(local_path + file.path + "/" + file.name))
}).pipe(write_stream)
.on('finish', event => {
setImmediate(resolve, file.path + "/" + file.name);
});

9
package.json
View File

@ -1,6 +1,6 @@
{
"name": "TeaClient",
"version": "1.3.6",
"version": "1.3.6-2",
"description": "",
"main": "main.js",
"scripts": {
@ -8,6 +8,7 @@
"test": "echo \"Error: no test specified\" && exit 1",
"start": "electron --js-flags='--expose-gc' --debug --dev-tools --disable-hardware-acceleration .",
"start-d": "electron . --disable-hardware-acceleration --debug -t -su http://dev.clientapi.teaspeak.de/",
"start-wd": "electron . --disable-hardware-acceleration --debug -t -su http://localhost/TeaWeb/client-api/environment/",
"start-d1": "electron . --disable-hardware-acceleration --debug -t --gdb -su http://clientapi.teaspeak.de/ --updater-ui-loader_type=0",
"start-n": "electron . -t --disable-hardware-acceleration --no-single-instance -u=https://clientapi.teaspeak.de/ -d --updater-ui-loader_type=0",
"start-01": "electron . --updater-channel=test -u=http://dev.clientapi.teaspeak.de/ -d --updater-ui-loader_type=0 --updater-local-version=1.0.1",
@ -26,7 +27,7 @@
"@types/electron-packager": "8.7.2",
"@types/fs-extra": "^8.0.0",
"@types/jquery": "^3.3.30",
"@types/request": "^2.48.1",
"@types/request": "^2.48.2",
"@types/request-promise": "^4.1.44",
"@types/tar-stream": "^1.6.1",
"asar": "^2.0.1",
@ -35,8 +36,8 @@
"electron-packager": "8.7.2",
"nodemon": "^1.19.1",
"platform-dependent-modules": "0.0.14",
"sass": "^1.22.3",
"typescript": "^3.5.2"
"sass": "^1.22.7",
"typescript": "^3.5.3"
},
"dependencies": {
"@types/minimist": "^1.2.0",