f-denkena/rclone-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provision & startup complete

Browse Source
This commit is contained in:
FTCHD
2025-01-28 09:56:10 +02:00
parent 9eed7f5647
commit 900a933951
2 changed files with 75 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rclone/init.ts
+49 -53
View File
@@ -1,19 +1,18 @@
import { invoke } from '@tauri-apps/api/core'
import { BaseDirectory, appLocalDataDir } from '@tauri-apps/api/path'
import { tempDir } from '@tauri-apps/api/path'
import { copyFile, mkdir, remove } from '@tauri-apps/plugin-fs'
import { copyFile, exists, mkdir, remove } from '@tauri-apps/plugin-fs'
import { writeFile } from '@tauri-apps/plugin-fs'
import { fetch } from '@tauri-apps/plugin-http'
import { platform } from '@tauri-apps/plugin-os'
import { Command } from '@tauri-apps/plugin-shell'
export async function init() {
export async function initRclone() {
const system = await isSystemRcloneInstalled()
let internal = await isInternalRcloneInstalled()
const sidecar = await isSidecarRcloneInstalled()
// rclone not available, let's download it
if (!(system || internal || sidecar)) {
if (!system && !internal) {
await provisionRclone()
internal = true
}
@@ -21,25 +20,17 @@ export async function init() {
return {
system: system
? async (args: string[]) => {
console.log('running system rclone')
return Command.create("rclone-system", args)
}
console.log('running system rclone')
return Command.create('rclone-system', args)
}
: null,
internal: internal
? async (args: string[]) => {
console.log('running internal rclone')
return Command.create("rclone-internal", args, {
cwd: `${await appLocalDataDir()}`,
})
}
console.log('running internal rclone')
return Command.create('rclone-internal', args)
}
: null,
sidecar: sidecar
? async (args: string[]) => {
console.log('running sidecar rclone')
return Command.sidecar("binaries/rclone", args)
}
: null,
};
}
}
/**
@@ -49,9 +40,10 @@ export async function init() {
export async function isSystemRcloneInstalled() {
try {
const output = await Command.create('rclone-system').execute()
// console.log('[checkRcloneInstalled] output', output)
// console.log('[isSystemRcloneInstalled] output', output)
return (
output.stdout.includes('Available commands') || output.stderr.includes('Available commands')
output.stdout.includes('Available commands') ||
output.stderr.includes('Available commands')
)
} catch (_) {
return false
@@ -64,28 +56,11 @@ export async function isSystemRcloneInstalled() {
*/
export async function isInternalRcloneInstalled() {
try {
const output = await Command.create('rclone-internal', [], {
cwd: `${await appLocalDataDir()}`,
}).execute()
// console.log('[checkRcloneBundled] output', output)
const output = await Command.create('rclone-internal').execute()
// console.log('[isInternalRcloneInstalled] output', output)
return (
output.stdout.includes('Available commands') || output.stderr.includes('Available commands')
)
} catch (_) {
return false
}
}
/**
* Checks if rclone is available as a sidecar
* @returns {Promise<boolean>} True if sidecar rclone is present and working
*/
export async function isSidecarRcloneInstalled() {
try {
const output = await Command.sidecar('binaries/rclone').execute()
// console.log('[checkRcloneBundled] output', output)
return (
output.stdout.includes('Available commands') || output.stderr.includes('Available commands')
output.stdout.includes('Available commands') ||
output.stderr.includes('Available commands')
)
} catch (_) {
return false
@@ -135,46 +110,67 @@ export async function provisionRclone() {
console.log('downloadUrl', downloadUrl)
const downloadedFile = await fetch(downloadUrl).then((res) => res.arrayBuffer())
console.log('downloadedFile')
await remove('rclone', {
recursive: true,
baseDir: BaseDirectory.Temp,
})
const tempDirExists = await exists(`${tempDirPath}/rclone`)
console.log('tempDirExists', tempDirExists)
if (tempDirExists) {
await remove('rclone', {
recursive: true,
baseDir: BaseDirectory.Temp,
})
console.log('removed rclone temp dir')
}
await mkdir('rclone', {
baseDir: BaseDirectory.Temp,
})
console.log('created rclone temp dir')
const zipPath = `${tempDirPath}/rclone/rclone-v${currentVersion}-${currentOs}-${arch}.zip`
console.log('zipPath', zipPath)
await writeFile(zipPath, new Uint8Array(downloadedFile))
console.log('wrote zip file')
await invoke('unzip_file', {
zipPath,
outputFolder: `${tempDirPath}/rclone/rclone-ui`,
})
console.log('Successfully unzipped file')
const unarchivedPath = `${tempDirPath}/rclone/rclone-ui/rclone-v${currentVersion}-${currentOs}-${arch}`
console.log('unarchivedPath', unarchivedPath)
// const unarchivedFolder = await readDir(unarchivedPath)
// console.log('unarchivedFolder', unarchivedFolder)
const rcloneBinaryPath = unarchivedPath + '/' + 'rclone'
console.log('rcloneBinaryPath', rcloneBinaryPath)
if (!rcloneBinaryPath) {
if (!(await exists(rcloneBinaryPath))) {
throw new Error('Could not find rclone binary in zip')
}
await copyFile(rcloneBinaryPath, `${await appLocalDataDir()}/rclone`)
const appLocalDataDirPath = await appLocalDataDir()
console.log('appLocalDataDirPath', appLocalDataDirPath)
const hasInstalled = await isInternalRcloneInstalled();
const appLocalDataDirPathExists = await exists(appLocalDataDirPath)
console.log('appLocalDataDirPathExists', appLocalDataDirPathExists)
if (!appLocalDataDirPathExists) {
await mkdir(appLocalDataDirPath, {
recursive: true,
})
console.log('appLocalDataDirPath created')
}
await copyFile(rcloneBinaryPath, `${appLocalDataDirPath}/rclone`)
console.log('copied rclone binary')
const hasInstalled = await isInternalRcloneInstalled()
if (!hasInstalled) {
throw new Error('Failed to install rclone')
}
console.log('rclone has been installed')
}
main.ts
+26 -31
View File
@@ -1,12 +1,10 @@
import { appLocalDataDir } from '@tauri-apps/api/path'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { confirm, message } from '@tauri-apps/plugin-dialog'
import {} from '@tauri-apps/plugin-fs'
import { debug, error, info, trace, warn } from '@tauri-apps/plugin-log'
import { exit } from '@tauri-apps/plugin-process'
import { Command } from '@tauri-apps/plugin-shell'
import { listRemotes } from './lib/rclone/api'
import { init as initRclone } from "./lib/rclone/init";
import { initRclone } from './lib/rclone/init'
import { useStore } from './lib/store'
import { initLoadingTray, initTray, rebuildTrayMenu } from './lib/tray'
@@ -34,21 +32,6 @@ console.log('main')
console.error('main')
async function startRclone() {
let rclone;
try {
rclone = await initRclone();
} catch (error) {
await confirm(
error.message || "Failed to provision rclone, please try again later.",
{
title: "Error",
kind: "error",
}
);
return await exit(0);
}
try {
const remotes = await listRemotes()
console.log('rclone rcd already running')
@@ -57,22 +40,34 @@ async function startRclone() {
return
} catch {}
const rcloneCommandFn = rclone.system || rclone.internal || rclone.sidecar;
let rclone
try {
rclone = await initRclone()
} catch (error) {
await confirm(error.message || 'Failed to provision rclone, please try again later.', {
title: 'Error',
kind: 'error',
})
return await exit(0)
}
const rcloneCommandFn = rclone.system || rclone.internal
const command = await rcloneCommandFn([
"rcd",
"--rc-no-auth",
"--rc-serve",
'rcd',
'--rc-no-auth',
'--rc-serve',
// '-rc-addr',
// ':5572',
]);
])
command.stdout.on("data", (line) => {
console.log("[rclone] " + line);
});
command.stderr.on("data", (line) => {
console.log("[[rclone]] " + line);
});
// command.stdout.on('data', (line) => {
// console.log('stdout ' + line)
// })
// command.stderr.on('data', (line) => {
// console.log('stderr ' + line)
// })
command.addListener('close', async (event) => {
console.log('close', event)
@@ -107,11 +102,11 @@ async function startRclone() {
}
getCurrentWindow().listen('tauri://close-requested', async (e) => {
console.log('MAIN window close requested')
console.log('(main) window close requested')
})
getCurrentWindow().listen('rebuild-tray', async (e) => {
console.log('MAIN window rebuild-tray requested')
console.log('(main) window rebuild-tray requested')
await rebuildTrayMenu()
})