Ecosystem/monerod-gui
1
0
Fork 0
mirror of https://github.com/everoddandeven/monerod-gui.git synced 2025-01-03 09:29:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix upgrade

Browse source
This commit is contained in:
everoddandeven 2024-10-09 21:44:37 +02:00
parent f9d878906f
commit 65a22236ce
5 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/main.ts
View file

@ -1,5 +1,5 @@
import {app, BrowserWindow, ipcMain, screen, dialog } from 'electron';
import { ChildProcess, ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
import * as path from 'path';
import * as fs from 'fs';
@ -10,16 +10,11 @@ import * as tar from 'tar';
//import bz2 from 'unbzip2-stream';
//import * as bz2 from 'unbzip2-stream';
const bz2 = require('unbzip2-stream');
const monerodFilePath: string = "/home/sidney/Documenti/monero-x86_64-linux-gnu-v0.18.3.4/monerod";
let win: BrowserWindow | null = null;
const args = process.argv.slice(1),
serve = args.some(val => val === '--serve');
function getMonerodPath(): string {
return path.resolve(__dirname, monerodFilePath);
}
function createWindow(): BrowserWindow {
const size = screen.getPrimaryDisplay().workAreaSize;
@ -74,7 +69,7 @@ function createWindow(): BrowserWindow {
}
function getMonerodVersion(monerodFilePath: string): void {
const monerodProcess = spawn(getMonerodPath(), [ '--version' ]);
const monerodProcess = spawn(monerodFilePath, [ '--version' ]);
monerodProcess.stdout.on('data', (data) => {
win?.webContents.send('monero-version', `${data}`);
@ -86,7 +81,6 @@ function getMonerodVersion(monerodFilePath: string): void {
}
function startMoneroDaemon(commandOptions: string[]): ChildProcessWithoutNullStreams {
//const monerodPath = getMonerodPath();
const monerodPath = commandOptions.shift();
if (!monerodPath) {
@ -228,7 +222,7 @@ const verifyFileHash = (filePath: string): Promise<string> => {
});
};
const extractTarBz2 = (filePath: string, destination: string): Promise<void> => {
const extractTarBz2 = (filePath: string, destination: string): Promise<string> => {
return new Promise((resolve, reject) => {
// Crea il file decomprimendo il .bz2 in uno .tar temporaneo
const tarPath = path.join(destination, 'temp.tar');
@ -239,14 +233,22 @@ const extractTarBz2 = (filePath: string, destination: string): Promise<void> =>
decompressedStream.pipe(writeStream);
let extractedDir: string = '';
writeStream.on('finish', () => {
// Una volta che il file .tar è stato creato, estrailo
tar.extract({ cwd: destination, file: tarPath })
tar.extract({ cwd: destination, file: tarPath, onReadEntry: (entry: tar.ReadEntry) => {
if (extractedDir == '') {
const topLevelDir = entry.path.split('/')[0];
extractedDir = topLevelDir; // Salva la prima directory
}
} })
.then(() => {
// Elimina il file .tar temporaneo dopo l'estrazione
fs.unlink(tarPath, (err) => {
if (err) reject(err);
else resolve();
else if (extractedDir == '') reject('Extraction failed')
else resolve(extractedDir);
});
})
.catch(reject);
@ -310,10 +312,10 @@ try {
// Estrai il file
const fPath = `${destination}/${fileName}`;
event.sender.send('download-progress', { progress: 100, status: 'Extracting' });
await extractTarBz2(fPath, destination);
const extractedDir = await extractTarBz2(fPath, destination);
event.sender.send('download-progress', { progress: 100, status: 'Download and extraction completed successfully' });
event.sender.send('download-progress', { progress: 200, status: fPath.replace('.tar.bz2', '') });
event.sender.send('download-progress', { progress: 200, status: `${destination}/${extractedDir}` });
} catch (error) {
event.sender.send('download-progress', { progress: 0, status: `Error: ${error}` });
//throw new Error(`Error: ${error}`);

4
app/preload.js
View file

@ -11,8 +11,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
onMoneroClose: (callback) => {
ipcRenderer.on('monero-close', callback);
},
getMoneroVersion: () => {
ipcRenderer.invoke('get-monero-version');
getMoneroVersion: (monerodPath) => {
ipcRenderer.invoke('get-monero-version', monerodPath);
},
onMoneroVersion: (callback) => {
ipcRenderer.on('monero-version', callback);

8
src/app/core/services/daemon/daemon.service.ts
View file

@ -607,9 +607,13 @@ export class DaemonService {
return DaemonVersion.parse(response.result);
}
else if (dontUseRpc) {
const monerodPath: string = ''; // TO DO get local monerod path
const monerodPath: string = (await this.getSettings()).monerodPath;
const wdw = (window as any);
if (monerodPath == '') {
throw new Error("Daemon not configured");
}
return new Promise<DaemonVersion>((resolve, reject) => {
if (this.electronService.isElectron) {
this.electronService.ipcRenderer.on('on-monerod-version', (event, version: string) => {
@ -629,7 +633,7 @@ export class DaemonService {
wdw.electronAPI.onMoneroVersionError((event: any, error: string) => {
reject(error);
});
wdw.electronAPI.getMoneroVersion();
wdw.electronAPI.getMoneroVersion(monerodPath);
}
});
}

2
src/app/pages/version/version.component.ts
View file

@ -17,8 +17,6 @@ export class VersionComponent implements AfterViewInit {
public currentVersion?: DaemonVersion;
public latestVersion?: DaemonVersion;
public downloadPath: string = '/home/sidney/monerod/';
public get buttonDisabled(): boolean {
const title = this.buttonTitle;

3
src/app/shared/components/daemon-not-running/daemon-not-running.component.html
View file

@ -36,5 +36,6 @@
&nbsp;
<button *ngIf="!startingDaemon && !stoppingDaemon && !restartingDaemon && !upgrading" routerLink="/settings" class="btn btn-outline-light" type="button"><i class="bi bi-gear"></i> Configure</button>
<button *ngIf="!startingDaemon && !stoppingDaemon && !restartingDaemon && !upgrading" routerLink="/version" class="btn btn-outline-light" type="button"><i class="bi bi-arrow-down-circle"></i> Install</button>
&nbsp;
<button *ngIf="!startingDaemon && !stoppingDaemon && !restartingDaemon && !upgrading && !daemonConfigured" routerLink="/version" class="btn btn-outline-light" type="button"><i class="bi bi-arrow-down-circle"></i> Install</button>
</div>