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

update nextui > heroui, tailwind, vite, onboard, comments, fixes

Browse Source
This commit is contained in:
FTCHD
2025-08-05 05:11:29 +03:00
parent de698051db
commit 1bec1378f2
25 changed files with 4828 additions and 3326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/format.ts
-1
View File
@@ -1,5 +1,4 @@
export function formatBytes(bytes: number) {
// format bytes in to a readable format like (MB, GB, etc), depending on how big the number is
if (bytes < 1024) {
return `${bytes} B`
}
lib/license.ts
+18 -4
View File
@@ -3,16 +3,20 @@ import { fetch } from '@tauri-apps/plugin-http'
import { usePersistedStore } from './store'
export async function validateLicense(licenseKey: string) {
console.log('[validateLicense]')
let id
try {
id = await invoke('get_uid')
} catch (e) {
console.error('[validateLicense] failed to build unique identifier')
console.error(JSON.stringify(e))
throw new Error('Failed to build unique identifier. Please try again later.')
}
if (!id) {
console.error('[validateLicense] missing unique identifier')
throw new Error('Failed to build unique identifier. Please try again later.')
}
@@ -25,34 +29,41 @@ export async function validateLicense(licenseKey: string) {
})
.then((r) => r.json())
.catch((e) => {
console.error('[validateLicense] failed to validate license')
console.error(JSON.stringify(e))
throw new Error('Failed to validate license. Are you connected to the internet?')
})
// console.log(JSON.stringify(validationResponse))
if (validationResponse.error) {
console.error('[validateLicense] failed to validate license')
throw new Error(validationResponse.error)
}
if (!validationResponse.valid) {
console.error('[validateLicense] invalid license key')
throw new Error('Invalid license key. Please check your license key and try again.')
}
usePersistedStore.setState({ licenseKey, licenseValid: true })
console.log('[validateLicense] license validated')
}
export async function revokeLicense(licenseKey: string) {
console.log('[revokeLicense]')
let id
try {
id = await invoke('get_uid')
} catch (e) {
console.error('[revokeLicense] failed to build unique identifier')
console.error(JSON.stringify(e))
throw new Error('Failed to build unique identifier. Please try again later.')
}
if (!id) {
console.error('[revokeLicense] missing unique identifier')
throw new Error('Failed to build unique identifier. Please try again later.')
}
@@ -65,19 +76,22 @@ export async function revokeLicense(licenseKey: string) {
})
.then((r) => r.json())
.catch((e) => {
console.error('[revokeLicense] failed to revoke license, fetch failed')
console.error(JSON.stringify(e))
throw new Error('Failed to revoke license. Are you connected to the internet?')
})
// console.log(JSON.stringify(revocationResponse))
if (revocationResponse.error) {
console.error('[revokeLicense] failed to revoke license, has error response')
throw new Error(revocationResponse.error)
}
if (!revocationResponse.revoked) {
console.error('[revokeLicense] failed to revoke license, missing revoked response')
throw new Error('Failed to revoke license. Please check your license key and try again.')
}
usePersistedStore.setState({ licenseKey: undefined, licenseValid: false })
console.log('[revokeLicense] license revoked')
}
lib/menu.ts
-1
View File
@@ -14,7 +14,6 @@ import { usePersistedStore, useStore } from './store'
import { getLoadingTray, getMainTray, rebuildTrayMenu } from './tray'
import { lockWindows, openFullWindow, openWindow, unlockWindows } from './window'
// Function to rebuild and update the menu
export async function buildMenu() {
const storeState = useStore.getState()
lib/rclone/api.ts
+43 -18
View File
@@ -24,14 +24,17 @@ function getAuthHeader() {
/* DATA */
export async function listRemotes() {
console.log('[listRemotes] CALLED')
const r = await fetch('http://localhost:5572/config/listremotes', {
method: 'POST',
headers: getAuthHeader(),
}).then((res) => res.json() as Promise<{ remotes: string[] }>)
// .catch((e) => {
// console.log("error", e);
// throw e;
// });
})
.catch((e) => {
console.log('error', e)
throw e
})
.then((res) => res.json() as Promise<{ remotes: string[] }>)
if (typeof r?.remotes === 'undefined') {
throw new Error('Failed to fetch remotes')
@@ -41,16 +44,14 @@ export async function listRemotes() {
}
export async function getRemote(remote: string) {
console.log('[getRemote]', remote)
const r = await fetch(`http://localhost:5572/config/get?name=${remote}`, {
method: 'POST',
headers: getAuthHeader(),
}).then(
(res) => res.json() as Promise<{ type: string } & Record<string, string | number | boolean>>
)
// .catch((e) => {
// console.log("error", e);
// throw e;
// });
// console.log(JSON.stringify(r, null, 2))
@@ -61,7 +62,7 @@ export async function updateRemote(
remote: string,
parameters: Record<string, string | number | boolean>
) {
console.log('updateRemote', remote, parameters)
console.log('[updateRemote]', remote, parameters)
const options = new URLSearchParams()
options.set('name', remote)
@@ -80,7 +81,7 @@ export async function createRemote(
type: string,
parameters: Record<string, string | number | boolean>
) {
console.log('createRemote', name, type, parameters)
console.log('[createRemote]', name, type, parameters)
const options = new URLSearchParams()
options.set('name', name)
@@ -96,6 +97,8 @@ export async function createRemote(
}
export async function deleteRemote(remote: string) {
console.log('[deleteRemote]', remote)
await fetch(`http://localhost:5572/config/delete?name=${remote}`, {
method: 'POST',
headers: getAuthHeader(),
@@ -105,6 +108,8 @@ export async function deleteRemote(remote: string) {
}
export async function getMountPoints() {
console.log('[getMountPoints]')
const r = await fetch('http://localhost:5572/mount/listmounts', {
method: 'POST',
headers: getAuthHeader(),
@@ -115,8 +120,6 @@ export async function getMountPoints() {
}>
)
// console.log('Mount points:', r)
if (!Array.isArray(r?.mountPoints)) {
throw new Error('Failed to get mount points')
}
@@ -125,6 +128,8 @@ export async function getMountPoints() {
}
export async function getBackends() {
console.log('[getBackends]')
const providers = await fetch('http://localhost:5572/config/providers', {
method: 'POST',
headers: getAuthHeader(),
@@ -149,6 +154,8 @@ export interface ListOptions {
}
export async function listPath(remote: string, path: string = '', options: ListOptions = {}) {
console.log('[listPath]', remote, path, options)
const params = new URLSearchParams()
params.set('fs', `${remote}:`)
params.set('remote', path)
@@ -190,9 +197,11 @@ export async function listPath(remote: string, path: string = '', options: ListO
return response?.list || []
}
/* JOBS */
/* JOBS */
export async function listJobs() {
console.log('[listJobs]')
const allStats = await fetch('http://localhost:5572/core/stats', {
method: 'POST',
headers: getAuthHeader(),
@@ -273,6 +282,8 @@ export async function listJobs() {
}
export async function stopJob(jobId: number) {
console.log('[stopJob]', jobId)
await fetch(`http://localhost:5572/job/stopgroup?group=job/${jobId}`, {
method: 'POST',
headers: getAuthHeader(),
@@ -291,6 +302,8 @@ export async function mountRemote({
mountOptions?: Record<string, string | number | boolean>
vfsOptions?: Record<string, string | number | boolean>
}) {
console.log('[mountRemote]', remotePath, mountPoint)
const options = new URLSearchParams()
options.set('fs', remotePath)
options.set('mountPoint', mountPoint)
@@ -325,6 +338,8 @@ export async function unmountRemote({
}: {
mountPoint: string
}) {
console.log('[unmountRemote]', mountPoint)
const options = new URLSearchParams()
options.set('mountPoint', mountPoint)
@@ -338,8 +353,6 @@ export async function unmountRemote({
throw e
})
// console.log('unmountRemote', JSON.stringify(r, null, 2))
if ('error' in r) {
throw new Error(r.error)
}
@@ -348,6 +361,8 @@ export async function unmountRemote({
}
export async function unmountAllRemotes() {
console.log('[unmountAllRemotes]')
const r = await fetch('http://localhost:5572/mount/unmountall', {
method: 'POST',
headers: getAuthHeader(),
@@ -358,8 +373,6 @@ export async function unmountAllRemotes() {
throw e
})
console.log('unmountAllRemotes', r)
if ('error' in r) {
throw new Error(r.error)
}
@@ -452,6 +465,8 @@ export async function startSync({
/* FLAGS */
export async function getGlobalFlags() {
console.log('[getGlobalFlags]')
const r = await fetch('http://localhost:5572/options/get', {
method: 'POST',
headers: getAuthHeader(),
@@ -461,6 +476,8 @@ export async function getGlobalFlags() {
}
export async function getCopyFlags() {
console.log('[getCopyFlags]')
const r = await fetch('http://localhost:5572/options/info', {
method: 'POST',
headers: getAuthHeader(),
@@ -476,6 +493,8 @@ export async function getCopyFlags() {
}
export async function getSyncFlags() {
console.log('[getSyncFlags]')
const r = await fetch('http://localhost:5572/options/info', {
method: 'POST',
headers: getAuthHeader(),
@@ -494,6 +513,8 @@ export async function getSyncFlags() {
}
export async function getFilterFlags() {
console.log('[getFilterFlags]')
const r = await fetch('http://localhost:5572/options/info', {
method: 'POST',
headers: getAuthHeader(),
@@ -508,6 +529,8 @@ export async function getFilterFlags() {
}
export async function getVfsFlags() {
console.log('[getVfsFlags]')
const r = await fetch('http://localhost:5572/options/info', {
method: 'POST',
headers: getAuthHeader(),
@@ -523,6 +546,8 @@ export async function getVfsFlags() {
}
export async function getMountFlags() {
console.log('[getMountFlags]')
const r = await fetch('http://localhost:5572/options/info', {
method: 'POST',
headers: getAuthHeader(),
lib/rclone/init.ts
+39 -30
View File
@@ -39,9 +39,10 @@ export async function initRclone() {
* @returns {Promise<boolean>} True if rclone is installed and working
*/
export async function isSystemRcloneInstalled() {
console.log('[isSystemRcloneInstalled]')
try {
const output = await Command.create('rclone-system').execute()
// console.log('[isSystemRcloneInstalled] output', output)
return (
output.stdout.includes('Available commands') ||
output.stderr.includes('Available commands')
@@ -56,6 +57,8 @@ export async function isSystemRcloneInstalled() {
* @returns {Promise<boolean>} True if downloaded rclone is present and working
*/
export async function isInternalRcloneInstalled() {
console.log('[isInternalRcloneInstalled]')
try {
const output = await Command.create('rclone-internal').execute()
// console.log('[isInternalRcloneInstalled] output', output)
@@ -74,18 +77,21 @@ export async function isInternalRcloneInstalled() {
* @returns {Promise<void>}
*/
export async function provisionRclone() {
console.log('[provisionRclone]')
const currentVersionString = await fetch('https://downloads.rclone.org/version.txt').then(
(res) => res.text()
)
console.log('currentVersionString', currentVersionString)
console.log('[provisionRclone] currentVersionString', currentVersionString)
const currentVersion = currentVersionString.split('v')?.[1]?.trim()
if (!currentVersion) {
console.error('Failed to get latest version')
console.error('[provisionRclone] failed to get latest version')
await message('Failed to get latest rclone version, please try again later.')
return
}
console.log('currentVersion', currentVersion)
console.log('[provisionRclone] currentVersion', currentVersion)
const currentPlatform = platform()
console.log('currentPlatform', currentPlatform)
@@ -97,29 +103,31 @@ export async function provisionRclone() {
if (tempDirPath.endsWith('/') || tempDirPath.endsWith('\\')) {
tempDirPath = tempDirPath.slice(0, -1)
}
console.log('tempDirPath', tempDirPath)
console.log('[provisionRclone] tempDirPath', tempDirPath)
const arch = (await invoke('get_arch')) as 'arm64' | 'amd64' | '386' | 'unknown'
console.log('arch', arch)
console.log('[provisionRclone] arch', arch)
if (arch === 'unknown') {
throw new Error('Failed to get architecture, please try again later.')
console.error('[provisionRclone] failed to get architecture')
await message('Failed to get current arch, please try again later.')
return
}
const downloadUrl = `https://downloads.rclone.org/v${currentVersion}/rclone-v${currentVersion}-${currentOs}-${arch}.zip`
console.log('downloadUrl', downloadUrl)
console.log('[provisionRclone] downloadUrl', downloadUrl)
const downloadedFile = await fetch(downloadUrl).then((res) => res.arrayBuffer())
console.log('downloadedFile')
console.log('[provisionRclone] downloadedFile')
let tempDirExists
try {
tempDirExists = await exists('rclone', {
baseDir: BaseDirectory.Temp,
})
console.log('tempDirExists', tempDirExists)
console.log('[provisionRclone] tempDirExists', tempDirExists)
} catch (error) {
console.error('Failed to check if rclone temp dir exists', error)
console.error('[provisionRclone] failed to check if rclone temp dir exists', error)
}
if (tempDirExists) {
@@ -128,9 +136,9 @@ export async function provisionRclone() {
recursive: true,
baseDir: BaseDirectory.Temp,
})
console.log('removed rclone temp dir')
console.log('[provisionRclone] removed rclone temp dir')
} catch (error) {
console.error('Failed to remove rclone temp dir', error)
console.error('[provisionRclone] failed to remove rclone temp dir', error)
await message('Failed to provision rclone.')
return
}
@@ -140,21 +148,21 @@ export async function provisionRclone() {
await mkdir('rclone', {
baseDir: BaseDirectory.Temp,
})
console.log('created rclone temp dir')
console.log('[provisionRclone] created rclone temp dir')
} catch (error) {
console.error('Failed to create rclone temp dir', error)
console.error('[provisionRclone] failed to create rclone temp dir', error)
await message('Failed to provision rclone.')
return
}
const zipPath = `${tempDirPath}/rclone/rclone-v${currentVersion}-${currentOs}-${arch}.zip`
console.log('zipPath', zipPath)
console.log('[provisionRclone] zipPath', zipPath)
try {
await writeFile(zipPath, new Uint8Array(downloadedFile))
console.log('wrote zip file')
console.log('[provisionRclone] wrote zip file')
} catch (error) {
console.error('Failed to write zip file', error)
console.error('[provisionRclone] failed to write zip file', error)
await message('Failed to provision rclone.')
return
}
@@ -164,48 +172,48 @@ export async function provisionRclone() {
zipPath,
outputFolder: `${tempDirPath}/rclone/rclone-ui`,
})
console.log('Successfully unzipped file')
console.log('[provisionRclone] successfully unzipped file')
} catch (error) {
console.error('Failed to unzip file', error)
console.error('[provisionRclone] failed to unzip file', error)
await message('Failed to provision rclone.')
return
}
const unarchivedPath = `${tempDirPath}/rclone/rclone-ui/rclone-v${currentVersion}-${currentOs}-${arch}`
console.log('unarchivedPath', unarchivedPath)
console.log('[provisionRclone] unarchivedPath', unarchivedPath)
const binaryName = currentPlatform === 'windows' ? 'rclone.exe' : 'rclone'
// "/" here looks to be working on windows
const rcloneBinaryPath = unarchivedPath + '/' + binaryName
console.log('rcloneBinaryPath', rcloneBinaryPath)
console.log('[provisionRclone] rcloneBinaryPath', rcloneBinaryPath)
try {
const binaryExists = await exists(rcloneBinaryPath)
console.log('rcloneBinaryPathExists', binaryExists)
console.log('[provisionRclone] rcloneBinaryPathExists', binaryExists)
if (!binaryExists) {
throw new Error('Could not find rclone binary in zip')
}
} catch (error) {
console.error('Failed to check if rclone binary exists', error)
throw new Error('Could not find rclone binary in zip')
console.error('[provisionRclone] failed to check if rclone binary exists', error)
await message('Failed to provision rclone.')
}
const appLocalDataDirPath = await appLocalDataDir()
console.log('appLocalDataDirPath', appLocalDataDirPath)
console.log('[provisionRclone] appLocalDataDirPath', appLocalDataDirPath)
const appLocalDataDirPathExists = await exists(appLocalDataDirPath)
console.log('appLocalDataDirPathExists', appLocalDataDirPathExists)
console.log('[provisionRclone] appLocalDataDirPathExists', appLocalDataDirPathExists)
if (!appLocalDataDirPathExists) {
await mkdir(appLocalDataDirPath, {
recursive: true,
})
console.log('appLocalDataDirPath created')
console.log('[provisionRclone] appLocalDataDirPath created')
}
await copyFile(rcloneBinaryPath, `${appLocalDataDirPath}/${binaryName}`)
console.log('copied rclone binary')
console.log('[provisionRclone] copied rclone binary')
const hasInstalled = await isInternalRcloneInstalled()
@@ -213,5 +221,6 @@ export async function provisionRclone() {
throw new Error('Failed to install rclone')
}
console.log('rclone has been installed')
console.log('[provisionRclone] rclone has been installed')
}
lib/rclone/mount.ts
+11 -6
View File
@@ -8,13 +8,15 @@ import { exit } from '@tauri-apps/plugin-process'
import { Command } from '@tauri-apps/plugin-shell'
export async function needsMountPlugin() {
console.log('[needsMountPlugin]')
const currentPlatform = platform()
if (currentPlatform === 'macos') {
// check fuse-t or osxfuse
const hasFuseT = await exists('/Library/Application Support/fuse-t')
console.log('hasFuseT', hasFuseT)
console.log('[needsMountPlugin] hasFuseT', hasFuseT)
const hasOsxFuse = await exists('/Library/Filesystems/macfuse.fs')
console.log('hasOsxFuse', hasOsxFuse)
console.log('[needsMountPlugin] hasOsxFuse', hasOsxFuse)
return !hasFuseT && !hasOsxFuse
}
if (currentPlatform === 'windows') {
@@ -22,13 +24,15 @@ export async function needsMountPlugin() {
const hasWinFsp =
(await exists('C:\\Program Files\\WinFsp')) ||
(await exists('C:\\Program Files (x86)\\WinFsp'))
console.log('hasWinFsp', hasWinFsp)
console.log('[needsMountPlugin] hasWinFsp', hasWinFsp)
return !hasWinFsp
}
return false
}
export async function dialogGetMountPlugin() {
console.log('[dialogGetMountPlugin]')
const currentPlatform = platform()
if (currentPlatform === 'macos') {
// download fuse-t or osxfuse
@@ -75,13 +79,12 @@ export async function dialogGetMountPlugin() {
}
export async function unmount(mountPoint: string, force = false) {
console.log('[unmount]', mountPoint, force)
const command = Command.create('umount', [force ? '-f' : '', mountPoint])
const output = await command.execute()
// console.log('output')
// console.log(JSON.stringify(output, null, 2))
if (output.code !== 0) {
if (output.stderr.toLowerCase().includes('busy')) {
const answer = await ask('This resource is busy, do you wish to force unmount?', {
@@ -97,9 +100,11 @@ export async function unmount(mountPoint: string, force = false) {
}
if (output.stderr.toLowerCase().includes('not currently mounted')) {
console.error('[unmount] not currently mounted')
return
}
console.error('[unmount] failed to unmount', output.stderr)
throw new Error(output.stderr)
}
lib/tray.ts
+17 -8
View File
@@ -24,19 +24,23 @@ export async function triggerTrayRebuild() {
})
}
// Function to update the tray menu
export async function rebuildTrayMenu() {
console.log('[rebuildTrayMenu]')
const tray = await getMainTray()
if (!tray) {
console.error('[rebuildTrayMenu] tray not found')
return
}
const newMenu = await buildMenu()
await tray.setMenu(newMenu)
console.log('[rebuildTrayMenu] tray menu rebuilt')
}
async function onTrayAction(event: TrayIconEvent) {
if (event.type === 'Click') {
console.log('Tray clicked:', event)
console.log('[onTrayAction] tray clicked:', event)
await resetMainWindow()
}
@@ -45,12 +49,12 @@ async function onTrayAction(event: TrayIconEvent) {
// Initialize the tray
export async function initTray(): Promise<void> {
try {
console.log('initTray')
console.log('[initTray]')
const menu = await buildMenu()
console.log('built menu')
console.log('[initTray] built menu')
await TrayIcon.getById('loading-tray').then((t) => t?.setVisible(false))
console.log('set loading tray to false')
console.log('[initTray] set loading tray to false')
await TrayIcon.new({
id: 'main-tray',
@@ -61,13 +65,18 @@ export async function initTray(): Promise<void> {
action: onTrayAction,
})
} catch (error) {
console.error('Failed to create tray')
console.error('[initTray] failed to create tray')
console.error(error)
}
}
export async function initLoadingTray() {
if (platform() === 'linux') return
console.log('[initLoadingTray]')
if (platform() === 'linux') {
console.log('[initLoadingTray] platform is linux, skipping')
return
}
const globeIconPath = await resolveResource('icons/favicon/frame_00_delay-0.1s.png')
@@ -104,6 +113,6 @@ export async function initLoadingTray() {
`icons/favicon/frame_${currentIcon < 10 ? '0' : ''}${currentIcon}_delay-0.1s.png`
)
await loadingTray?.setIcon(globeIconPath)
currentIcon = currentIcon + 1
currentIcon += 1
}, 200)
}
lib/window.ts
+10 -3
View File
@@ -21,6 +21,8 @@ export async function openFullWindow({
name: string
url: string
}) {
console.log('[openFullWindow]')
const w = new WebviewWindow(name, {
height: 0,
width: 0,
@@ -36,7 +38,10 @@ export async function openFullWindow({
const size = await currentMonitor().then((m) => m?.size)
if (!size) return
if (!size) {
console.error('[openFullWindow] no monitor found')
throw new Error('No monitor found')
}
if (platform() === 'windows') {
// windows merges the space for the taskbar
@@ -55,14 +60,16 @@ export async function openFullWindow({
export async function openWindow({
name,
url,
width = 740,
height = 600,
width = 820,
height = 700,
}: {
name: string
url: string
width?: number
height?: number
}) {
console.log('[openWindow]')
const isFirstWindow = useStore.getState().firstWindow
const w = new WebviewWindow(name, {
main.ts
+22 -16
View File
@@ -86,9 +86,11 @@ async function validateInstance() {
}
async function startRclone() {
console.log('[startRclone]')
try {
const remotes = await listRemotes()
console.log('rclone rcd already running')
console.log('[startRclone] rclone rcd already running')
useStore.setState({ rcloneLoaded: true })
useStore.setState({ remotes: remotes })
return
@@ -99,7 +101,7 @@ async function startRclone() {
try {
rclone = await initRclone()
} catch (error) {
await ask(error.message || 'Failed to provision rclone, please try again later.', {
await ask(error.message || 'Failed to start rclone, please try again later.', {
title: 'Error',
kind: 'error',
okLabel: 'Exit',
@@ -149,11 +151,12 @@ async function startRclone() {
console.log('error', event)
})
console.log('running rclone')
console.log('[startRclone] starting rclone')
const childProcess = await command.spawn()
console.log('[startRclone] running rclone')
getCurrentWindow().listen('close-app', async (e) => {
console.log('(main) window close-app requested')
console.log('[startRclone] (main) window close-app requested')
if (rclone.system) {
const answer = await ask('Unmount all remotes before exiting?', {
@@ -169,13 +172,15 @@ async function startRclone() {
await childProcess.kill()
})
console.log('[startRclone] set listener for close-app')
await new Promise((resolve) => setTimeout(resolve, 200))
useStore.setState({ rcloneLoaded: true })
console.log('[startRclone] listing remotes')
const remotes = await listRemotes()
console.log('remotes', remotes)
console.log('[startRclone] got remotes')
useStore.setState({ remotes: remotes })
// console.log('childProcess', JSON.stringify(childProcess)) // prints `pid`
@@ -210,6 +215,17 @@ async function startupMounts() {
}
}
async function onboardUser() {
const firstOpen = usePersistedStore.getState().isFirstOpen
if (firstOpen) {
await message('Rclone has initialized, you can now find it in the tray menu!', {
title: 'Welcome to Rclone UI',
kind: 'info',
okLabel: 'Got it',
})
usePersistedStore.setState({ isFirstOpen: false })
}
}
getCurrentWindow().listen('tauri://close-requested', async (e) => {
console.log('(main) window close requested')
})
@@ -235,17 +251,7 @@ initLoadingTray()
.then(() => waitForHydration())
.then(() => validateInstance())
.then(() => startRclone())
.then(async () => {
const firstOpen = usePersistedStore.getState().isFirstOpen
if (firstOpen) {
await message('Rclone has initialized, you can now find it in the tray menu!', {
title: 'Welcome',
kind: 'info',
okLabel: 'Got it',
})
usePersistedStore.setState({ isFirstOpen: false })
}
})
.then(() => onboardUser())
.then(() => startupMounts())
.then(() => initTray())
.catch(console.error)
package-lock.json
Generated
+3974 -2653
View File
File diff suppressed because it is too large Load Diff
package.json
+28 -25
View File
@@ -19,42 +19,45 @@
"build:wasm": "tauri build --target wasm32-unknown-unknown"
},
"dependencies": {
"@nextui-org/react": "^2.6.11",
"@tauri-apps/api": "~2.2.0",
"@tauri-apps/plugin-autostart": "^2.2.0",
"@tauri-apps/plugin-dialog": "^2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-http": "^2.2.0",
"@tauri-apps/plugin-log": "^2.2.0",
"@tauri-apps/plugin-notification": "^2.2.1",
"@tauri-apps/plugin-opener": "^2.2.5",
"@tauri-apps/plugin-os": "^2.2.0",
"@tauri-apps/plugin-process": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-store": "^2.2.0",
"@tauri-apps/plugin-updater": "^2.4.0",
"@tauri-apps/plugin-window-state": "^2.2.0",
"framer-motion": "^11.17.0",
"lucide-react": "^0.471.0",
"@heroui/react": "^2.7.11",
"@tauri-apps/api": "~2.7.0",
"@tauri-apps/plugin-autostart": "^2.5.0",
"@tauri-apps/plugin-dialog": "^2.3.2",
"@tauri-apps/plugin-fs": "^2.4.1",
"@tauri-apps/plugin-http": "^2.5.1",
"@tauri-apps/plugin-log": "^2.6.0",
"@tauri-apps/plugin-notification": "^2.3.0",
"@tauri-apps/plugin-opener": "^2.4.0",
"@tauri-apps/plugin-os": "^2.3.0",
"@tauri-apps/plugin-process": "^2.3.0",
"@tauri-apps/plugin-shell": "^2.3.0",
"@tauri-apps/plugin-store": "^2.3.0",
"@tauri-apps/plugin-updater": "^2.9.0",
"@tauri-apps/plugin-window-state": "^2.4.0",
"cron-parser": "^5.3.0",
"cronstrue": "^3.2.0",
"date-fns": "^4.1.0",
"framer-motion": "^11.18.2",
"lucide-react": "^0.536.0",
"p-retry": "^6.2.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.1",
"use-broadcast-ts": "^2.0.0",
"zustand": "^5.0.3"
"use-broadcast-ts": "^2.0.1",
"zustand": "^5.0.7"
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@tauri-apps/cli": "~2.2.5",
"@tauri-apps/cli": "~2.7.1",
"@types/node": "^22.10.7",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"esbuild": "^0.24.2",
"postcss": "^8.4.49",
"@vitejs/plugin-react": "^4.7.0",
"autoprefixer": "^10.4.21",
"esbuild": "^0.25.8",
"postcss": "^8.5.6",
"tailwindcss": "^3.4.17",
"typescript": "~5.6.2",
"vite": "^6.0.3"
"vite": "^6.3.5"
}
}
src-tauri/Cargo.lock
Generated
+609 -421
View File
File diff suppressed because it is too large Load Diff
src-tauri/Cargo.toml
+14 -14
View File
@@ -21,25 +21,25 @@ tauri-build = { version = "2.0.4", features = [] }
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
log = "0.4"
tauri = { version = "2.2.0", features = [ "tray-icon", "image-ico",
tauri = { version = "2.7.0", features = [ "tray-icon", "image-ico",
"image-png", "config-json5" ] }
tauri-plugin-log = "2.2.0"
tauri-plugin-shell = "2.2.0"
tauri-plugin-dialog = "2.2.0"
tauri-plugin-fs = "2.2.0"
tauri-plugin-opener = "2.2.3"
tauri-plugin-http = "2.2.0"
tauri-plugin-store = "2.2.0"
tauri-plugin-process = "2"
tauri-plugin-notification = { version = "2.0.0", features = [ "windows7-compat" ] }
tauri-plugin-os = "2"
tauri-plugin-log = "2.6.0"
tauri-plugin-shell = "2.3.0"
tauri-plugin-dialog = "2.3.2"
tauri-plugin-fs = "2.4.1"
tauri-plugin-opener = "2.4.0"
tauri-plugin-http = "2.5.1"
tauri-plugin-store = "2.3.0"
tauri-plugin-process = "2.3.0"
tauri-plugin-notification = { version = "2.3.0", features = [ "windows7-compat" ] }
tauri-plugin-os = "2.3.0"
fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
zip = "0.6.6"
machine-uid = "0.5.3"
tauri-plugin-sentry = "0.4.1"
tauri-plugin-autostart = "2"
tauri-plugin-single-instance = "2.2.0"
tauri-plugin-updater = "2"
tauri-plugin-autostart = "2.5.0"
tauri-plugin-single-instance = "2.3.2"
tauri-plugin-updater = "2.9.0"
[target.'cfg(target_os = "macos")'.dependencies]
cocoa = "0.26"
src/components/OptionsSection.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import { Chip, Textarea, Tooltip } from '@nextui-org/react'
import { Chip, Textarea, Tooltip } from '@heroui/react'
import { LockKeyholeIcon, LockOpenIcon, XIcon } from 'lucide-react'
import { useCallback, useEffect, useState } from 'react'
import { replaceSmartQuotes } from '../../lib/format'
src/components/PathFinder.tsx
+3 -2
View File
@@ -1,5 +1,6 @@
import { Autocomplete } from '@nextui-org/autocomplete'
import { AutocompleteItem, Button } from '@nextui-org/react'
import { Autocomplete, Tooltip } from '@heroui/react'
import { AutocompleteItem, Button } from '@heroui/react'
import { cn } from '@heroui/react'
import { open } from '@tauri-apps/plugin-dialog'
import { readDir } from '@tauri-apps/plugin-fs'
import { platform } from '@tauri-apps/plugin-os'
src/components/RemoteCreateDrawer.tsx
+5 -50
View File
@@ -1,4 +1,4 @@
import { Drawer, DrawerBody, DrawerFooter, DrawerHeader } from '@nextui-org/drawer'
import { Drawer, DrawerBody, DrawerFooter, DrawerHeader } from '@heroui/react'
import {
Autocomplete,
AutocompleteItem,
@@ -8,7 +8,7 @@ import {
Input,
Select,
SelectItem,
} from '@nextui-org/react'
} from '@heroui/react'
import { message } from '@tauri-apps/plugin-dialog'
import { ChevronDown, ChevronUp, RefreshCcwIcon } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
@@ -73,20 +73,6 @@ export default function RemoteCreateDrawer({
</p>
)}
</div>
// <input
// type="checkbox"
// id={fieldId}
// name={option.Name}
// className="form-checkbox"
// defaultChecked={fieldValue === 'true'}
// onChange={(e) =>
// setConfig({ ...config, [option.Name]: e.target.checked })
// }
// autoComplete="off"
// autoCapitalize="off"
// autoCorrect="off"
// spellCheck={false}
// />
)
case 'string': {
if (option.Examples && option.Examples.length > 0) {
@@ -127,7 +113,7 @@ export default function RemoteCreateDrawer({
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
description={option.Help.split('\n').slice(1).join('\n')}
isRequired={option.Required}
onValueChange={(value) => {
@@ -136,37 +122,6 @@ export default function RemoteCreateDrawer({
}}
/>
)
// if (option.Examples && option.Examples.length > 0) {
// return (
// <select
// id={fieldId}
// name={option.Name}
// className="w-full p-2 border rounded dark:bg-gray-800"
// value={fieldValue}
// onChange={(e) =>
// setConfig({ ...config, [option.Name]: e.target.value })
// }
// >
// <option value="">Select {option.Name}</option>
// {option.Examples.map((example) => (
// <option key={example.Value} value={example.Value}>
// {example.Help || example.Value}
// </option>
// ))}
// </select>
// )
// }
// return (
// <input
// id={fieldId}
// name={option.Name}
// type={option.IsPassword ? 'password' : 'text'}
// value={fieldValue || ''}
// onChange={(e) =>
// setConfig({ ...config, [option.Name]: e.target.value })
// }
// />
// )
}
default:
return null
@@ -275,7 +230,7 @@ export default function RemoteCreateDrawer({
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
/>
<Select
@@ -290,7 +245,7 @@ export default function RemoteCreateDrawer({
isRequired={true}
>
{backends.map((backend) => (
<SelectItem key={backend.Name} value={backend.Name}>
<SelectItem key={backend.Name}>
{backend.Description.includes('Compliant')
? `${backend.Description.split('Compliant')[0]} Compliant`
: backend.Description || backend.Name}
src/components/RemoteDefaultsDrawer.tsx
+6 -14
View File
@@ -1,6 +1,6 @@
import { Checkbox } from '@nextui-org/checkbox'
import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from '@nextui-org/drawer'
import { Accordion, AccordionItem, Avatar, Button, Input } from '@nextui-org/react'
import { Checkbox } from '@heroui/react'
import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from '@heroui/react'
import { Accordion, AccordionItem, Avatar, Button, Input } from '@heroui/react'
import { homeDir } from '@tauri-apps/api/path'
import { message, open } from '@tauri-apps/plugin-dialog'
import {
@@ -82,7 +82,6 @@ export default function RemoteDefaultsDrawer({
const handleSubmit = useCallback(async () => {
if (!config) {
console.log('No config')
// console.log(JSON.stringify(config, null, 2))
return
}
@@ -309,7 +308,7 @@ export default function RemoteDefaultsDrawer({
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
onValueChange={(value) => {
setConfig((prev) => ({
...prev,
@@ -330,7 +329,7 @@ export default function RemoteDefaultsDrawer({
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
startContent={
<Button
onPress={async () => {
@@ -340,6 +339,7 @@ export default function RemoteDefaultsDrawer({
directory: true,
multiple: false,
defaultPath: await homeDir(),
title: 'Select a mount point',
})
await unlockWindows()
if (selected) {
@@ -511,14 +511,6 @@ export default function RemoteDefaultsDrawer({
rows={20}
/>
</AccordionItem>
{/* <SyncSection
remoteName={remoteName}
syncOptionsJson={syncOptionsJson}
setSyncOptionsJson={setSyncOptionsJson}
globalOptions={
globalOptions['main' as keyof typeof globalOptions]
}
/> */}
</Accordion>
</DrawerBody>
<DrawerFooter>
src/components/RemoteEditDrawer.tsx
+5 -16
View File
@@ -1,13 +1,6 @@
import { Checkbox } from '@nextui-org/checkbox'
import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from '@nextui-org/drawer'
import {
Autocomplete,
AutocompleteItem,
Button,
Input,
Select,
SelectItem,
} from '@nextui-org/react'
import { Checkbox } from '@heroui/react'
import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from '@heroui/react'
import { Autocomplete, AutocompleteItem, Button, Input, Select, SelectItem } from '@heroui/react'
import { message } from '@tauri-apps/plugin-dialog'
import { ChevronDown, ChevronUp } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -115,7 +108,7 @@ export default function RemoteEditDrawer({
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
description={option.Help.split('\n').slice(1).join('\n')}
/>
)
@@ -204,14 +197,10 @@ export default function RemoteEditDrawer({
selectionMode="single"
placeholder="Select Type"
selectedKeys={[config.type]}
// onChange={(e) => {
// console.log(e.target.value)
// setConfig({ ...config, type: e.target.value })
// }}
isDisabled={true}
>
{backends.map((backend) => (
<SelectItem key={backend.Name} value={backend.Name}>
<SelectItem key={backend.Name}>
{backend.Description.includes('Compliant')
? `${backend.Description.split('Compliant')[0]} Compliant`
: backend.Description || backend.Name}
src/main.tsx
+3 -3
View File
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client'
import { RouterProvider, createBrowserRouter } from 'react-router-dom'
import Home from './pages/Home'
import './global.css'
import { NextUIProvider } from '@nextui-org/react'
import { HeroUIProvider } from '@heroui/react'
import { debug, error, info, trace, warn } from '@tauri-apps/plugin-log'
import Copy from './pages/Copy'
import Jobs from './pages/Jobs'
@@ -64,9 +64,9 @@ const router = createBrowserRouter([
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<React.StrictMode>
<NextUIProvider>
<HeroUIProvider>
{/* <TauriWatcher /> */}
<RouterProvider router={router} />
</NextUIProvider>
</HeroUIProvider>
</React.StrictMode>
)
src/pages/Copy.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import { Accordion, AccordionItem, Avatar, Button } from '@nextui-org/react'
import { Accordion, AccordionItem, Avatar, Button } from '@heroui/react'
import { message } from '@tauri-apps/plugin-dialog'
import { exists } from '@tauri-apps/plugin-fs'
import { AlertOctagonIcon, CopyIcon, FilterIcon, FoldersIcon, PlayIcon } from 'lucide-react'
src/pages/Jobs.tsx
+3 -3
View File
@@ -1,5 +1,5 @@
import { Card, CardBody, CardFooter, CardHeader } from '@nextui-org/card'
import { Button, Chip, Divider, Progress, Spinner } from '@nextui-org/react'
import { Card, CardBody, CardFooter, CardHeader } from '@heroui/react'
import { Button, Chip, Divider, Progress, Spinner } from '@heroui/react'
import { listen } from '@tauri-apps/api/event'
import { ask } from '@tauri-apps/plugin-dialog'
import { Trash2Icon } from 'lucide-react'
@@ -50,7 +50,7 @@ export default function Jobs() {
await fetchJobs()
}, 2000)
//! prevents jobs being refreshed after "X" was pressed on the window
// prevents jobs being refreshed after closing the window
const unlisten = listen('tauri://close-requested', () => {
clearInterval(interval)
})
src/pages/Mount.tsx
+3 -3
View File
@@ -1,4 +1,4 @@
import { Accordion, AccordionItem, Avatar, Button } from '@nextui-org/react'
import { Accordion, AccordionItem, Avatar, Button } from '@heroui/react'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { message } from '@tauri-apps/plugin-dialog'
import { exists, mkdir, remove } from '@tauri-apps/plugin-fs'
@@ -201,7 +201,7 @@ export default function Mount() {
return (
<div className="flex flex-col h-screen gap-10 pt-10">
{/* Main Content */}
<div className="flex flex-col flex-1 w-full max-w-xl gap-6 mx-auto">
<div className="flex flex-col flex-1 w-full max-w-3xl gap-6 mx-auto">
{/* Paths Display */}
<PathFinder
sourcePath={source}
@@ -240,7 +240,7 @@ export default function Mount() {
setOptionsJson={setMountOptionsJson}
globalOptions={globalOptions['mount' as keyof typeof globalOptions]}
optionsFetcher={getMountFlags}
rows={5}
rows={7}
isLocked={mountOptionsLocked}
setIsLocked={setMountOptionsLocked}
/>
src/pages/Settings.tsx
+8 -28
View File
@@ -1,4 +1,4 @@
import { Button, Card, CardBody, Checkbox, Chip, Input, Tab, Tabs } from '@nextui-org/react'
import { Button, Card, CardBody, Checkbox, Chip, Input, Tab, Tabs } from '@heroui/react'
import { ask, message } from '@tauri-apps/plugin-dialog'
import { openUrl } from '@tauri-apps/plugin-opener'
import { relaunch } from '@tauri-apps/plugin-process'
@@ -38,7 +38,7 @@ function Settings() {
autoCapitalize="none"
autoComplete="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
type={passwordVisible ? 'text' : 'password'}
fullWidth={false}
size="lg"
@@ -75,20 +75,22 @@ function Settings() {
}
return (
<div className="flex flex-col w-screen h-screen gap-0 overflow-hidden animate-fade-in">
<div className="relative flex flex-col w-screen h-screen gap-0 overflow-hidden">
<Tabs
aria-label="Options"
isVertical={true}
variant="light"
destroyInactiveTabPanel={false}
disableAnimation={true}
className="flex-shrink-0 w-3/12 h-screen px-2 py-4 border-r border-neutral-700"
className="flex-shrink-0 w-40 h-screen px-2 py-4 border-r border-neutral-700"
classNames={{
tabList: 'w-full gap-3',
tab: 'h-14',
}}
size="lg"
defaultSelectedKey="general"
color="secondary"
radius="sm"
>
<Tab
key="general"
@@ -276,7 +278,7 @@ function GeneralSection() {
autoCapitalize="none"
autoComplete="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
type={passwordVisible ? 'text' : 'password'}
endContent={
passwordInput && (
@@ -454,7 +456,7 @@ function LicenseSection() {
autoCapitalize="none"
autoComplete="off"
autoCorrect="off"
spellCheck={false}
spellCheck="false"
endContent={
licenseValid && <CheckIcon className="w-5 h-5 text-green-500" />
}
@@ -806,25 +808,3 @@ function BaseHeader({ title, endContent }: { title: string; endContent?: React.R
}
export default Settings
// {/* <Button
// onPress={async () => {
// const enabled = await isEnabled()
// if (enabled) {
// await disable()
// } else {
// await enable()
// }
// }}
// >
// Start on boot
// </Button>
// <Button
// onPress={async () => {
// const enabled = await isEnabled()
// alert(enabled ? 'Enabled' : 'Disabled')
// }}
// >
// Get status
// </Button> */}
src/pages/Sync.tsx
+2 -2
View File
@@ -1,4 +1,4 @@
import { Accordion, AccordionItem, Avatar, Button } from '@nextui-org/react'
import { Accordion, AccordionItem, Avatar, Button } from '@heroui/react'
import { message } from '@tauri-apps/plugin-dialog'
import { exists } from '@tauri-apps/plugin-fs'
import { AlertOctagonIcon, FilterIcon, FolderSyncIcon, FoldersIcon, PlayIcon } from 'lucide-react'
@@ -188,7 +188,7 @@ export default function Sync() {
return (
<div className="flex flex-col h-screen gap-10 pt-10">
{/* Main Content */}
<div className="flex flex-col flex-1 w-full max-w-xl gap-6 mx-auto">
<div className="flex flex-col flex-1 w-full max-w-3xl gap-6 mx-auto">
{/* Paths Display */}
<PathFinder
sourcePath={source}
tailwind.config.js
+3 -3
View File
@@ -1,14 +1,14 @@
const { nextui } = require('@nextui-org/react')
const { heroui } = require('@heroui/react')
/** @type {import('tailwindcss').Config} */
export default {
content: [
'./index.html',
'./src/**/*.{js,ts,jsx,tsx}',
'./node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}',
'./node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}',
],
theme: {
extend: {},
},
plugins: [nextui()],
plugins: [heroui()],
}