Skip to content

Commit

Permalink
v2.0.5
Browse files Browse the repository at this point in the history
-possible proxy loading fix
-rename from dir_legacy if given
  • Loading branch information
Kaibu committed Apr 24, 2024
1 parent d85c7ce commit de6e2e1
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 9 deletions.
3 changes: 3 additions & 0 deletions electron/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ if (!app.requestSingleInstanceLock()) {
process.exit(0);
}

app.commandLine.appendSwitch('--no-proxy-server')
app.commandLine.appendSwitch('--disable-renderer-backgrounding')

// Remove electron security warnings
// This warning only shows in development mode
// Read more on https://www.electronjs.org/docs/latest/tutorial/security
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "panthor",
"version": "2.0.4",
"version": "2.0.5",
"main": "dist-electron/main/index.js",
"description": "Panthor Launcher",
"author": "Kaibu",
Expand Down
32 changes: 24 additions & 8 deletions src/components/ModCard.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<template>
<v-card flat>
<v-img :height="single ? 500:230" :src="mod.img" cover>
<v-img :height="single ? 500 : 230" :src="mod.img" cover>
<v-btn color="white" flat icon="mdi-folder-open" rounded="sm" class="float-right mt-2 mr-2" size="small"
@click="requestFolderOpen">
<v-icon icon="mdi-folder-open"></v-icon>
<v-tooltip activator="parent" location="bottom">Ordner öffnen</v-tooltip>
</v-btn>
<v-chip label variant="flat" :color="mod.worker_status.color" size="large" :prepend-icon="mod.worker_status.icon" class="float-left mt-2 ms-2" v-if="mod.worker_status">{{ mod.worker_status.message }}</v-chip>
<v-chip label variant="flat" :color="mod.worker_status.color" size="large" :prepend-icon="mod.worker_status.icon"
class="float-left mt-2 ms-2" v-if="mod.worker_status">{{ mod.worker_status.message }}</v-chip>
</v-img>
<v-card-title class="text-center mt-2 mb-2 text-h5">
{{ mod.name }}
</v-card-title>
</v-card-title>
<v-row justify="center" class="mb-3">
<v-card-subtitle class="text-center">{{ mod.desc }}</v-card-subtitle>
</v-row>
Expand All @@ -26,18 +27,25 @@
</v-row>
<v-row justify="center" class="my-3" v-if="arma_path !== '' && mod.worker_status">
<v-btn-group density="comfortable" divided>
<v-btn color="success" prepend-icon="mdi-launch" @click="$emit('launch-game', mod)" v-if="mod.worker_status.status == UpdateStatus.INTACT">Starten</v-btn>
<v-btn color="success" prepend-icon="mdi-download" @click="updateMod" v-if="(mod.worker_status.status == UpdateStatus.HASHED_UPDATE_REQUIRED || mod.worker_status.status == UpdateStatus.DOWNLOADED_UPDATE_REQUIRED || mod.worker_status.status == UpdateStatus.NOT_FOUND)"><span v-if="mod.worker_status.status == UpdateStatus.NOT_FOUND">Download</span><span v-else>Update</span></v-btn>
<v-btn color="warning" prepend-icon="mdi-server" @click="$emit('open-server')" v-if="mod.worker_status.status == UpdateStatus.INTACT">Server</v-btn>
<v-btn color="secondary" prepend-icon="mdi-file-cog" @click="verifyMod" v-if="(mod.worker_status.status != UpdateStatus.DOWNLOADING && mod.worker_status.status != UpdateStatus.HASHING && mod.worker_status.status != UpdateStatus.QUICK_HASHING)">Prüfen</v-btn>
<v-btn color="primary" prepend-icon="mdi-stop" @click="stopMod" v-if="mod.worker_status.status == UpdateStatus.DOWNLOADING || mod.worker_status.status == UpdateStatus.HASHING || mod.worker_status.status == UpdateStatus.QUICK_HASHING">Abbruch</v-btn>
<v-btn color="success" prepend-icon="mdi-launch" @click="$emit('launch-game', mod)"
v-if="mod.worker_status.status == UpdateStatus.INTACT">Starten</v-btn>
<v-btn color="success" prepend-icon="mdi-download" @click="updateMod"
v-if="(mod.worker_status.status == UpdateStatus.HASHED_UPDATE_REQUIRED || mod.worker_status.status == UpdateStatus.DOWNLOADED_UPDATE_REQUIRED || mod.worker_status.status == UpdateStatus.NOT_FOUND)"><span
v-if="mod.worker_status.status == UpdateStatus.NOT_FOUND">Download</span><span v-else>Update</span></v-btn>
<v-btn color="warning" prepend-icon="mdi-server" @click="$emit('open-server')"
v-if="mod.worker_status.status == UpdateStatus.INTACT">Server</v-btn>
<v-btn color="secondary" prepend-icon="mdi-file-cog" @click="verifyMod"
v-if="(mod.worker_status.status != UpdateStatus.DOWNLOADING && mod.worker_status.status != UpdateStatus.HASHING && mod.worker_status.status != UpdateStatus.QUICK_HASHING)">Prüfen</v-btn>
<v-btn color="primary" prepend-icon="mdi-stop" @click="stopMod"
v-if="mod.worker_status.status == UpdateStatus.DOWNLOADING || mod.worker_status.status == UpdateStatus.HASHING || mod.worker_status.status == UpdateStatus.QUICK_HASHING">Abbruch</v-btn>
</v-btn-group>
</v-row>
</v-card>
</template>

<script lang="ts">
import { ipcRenderer } from 'electron';
import * as fs from 'fs';
import Mod from '@/interfaces/ModInterface';
import { PropType } from 'vue';
Expand All @@ -62,6 +70,14 @@ export default {
ipcRenderer.send('mod:verify', this.mod.id, true);
},
updateMod() {
if (this.mod.worker_status.status == UpdateStatus.NOT_FOUND) {
if (this.mod.dir_legacy) {
if (fs.existsSync(join(this.arma_path, this.mod.dir_legacy))) {
fs.renameSync(join(this.arma_path, this.mod.dir_legacy), join(this.arma_path, this.mod.dir));
}
}
}
ipcRenderer.send('mod:update', this.mod.id);
},
stopMod() {
Expand Down
1 change: 1 addition & 0 deletions src/interfaces/ModInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default interface Mod {
img: string;
has_files: boolean;
dir: string;
dir_legacy: string;
worker_status: WorkerStatus;
version_hash: string;
}

0 comments on commit de6e2e1

Please sign in to comment.