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

config options & defaults

Browse Source 
Signed-off-by: FTCHD <144691102+FTCHD@users.noreply.github.com>
This commit is contained in:
FTCHD
2025-09-12 19:13:14 +02:00
parent 67be5965c4
commit 1e187c447b
8 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rclone/common.ts
+1 -14
View File
@@ -151,18 +151,5 @@ export async function isInternalRcloneInstalled() {
export function parseRcloneOptions(options: Record<string, string | number | boolean | string[]>) {
console.log('[parseRcloneOptions]', options)
const parsedOptions: Record<string, string | number | boolean | string[]> = {}
for (const [key, value] of Object.entries(options)) {
if (value === 'true') {
parsedOptions[key] = true
} else if (value === 'false') {
parsedOptions[key] = false
} else {
parsedOptions[key] = value
}
}
console.log('[parseRcloneOptions] parsedOptions', parsedOptions)
return parsedOptions
return options
}
lib/rclone/constants.ts
+6 -6
View File
@@ -1,15 +1,15 @@
export const RCLONE_CONFIG_DEFAULTS = {
'MultiThreadCutoff': '64M',
'MultiThreadStreams': '8M',
'MultiThreadStreams': 8,
'MultiThreadChunkSize': '8M',
'UseListR': 'true',
'UseServerModTime': 'true',
'UseListR': true,
'UseServerModTime': true,
'BufferSize': '32M',
'Transfers': '8',
'Checkers': '16',
'Transfers': 8,
'Checkers': 16,
}
export const RCLONE_VFS_DEFAULTS = {
'ChunkSize': '4M',
'ChunkStreams': '16',
'ChunkStreams': 16,
}
src/components/OptionsSection.tsx
+27 -7
View File
@@ -25,12 +25,9 @@ export default function OptionsSection({
const [options, setOptions] = useState<any>({})
const [isJsonValid, setIsJsonValid] = useState(true)
console.log('[OptionsSection] globalOptions', globalOptions)
useEffect(() => {
getAvailableOptions()
.then((flags) => {
console.log(JSON.stringify(flags, null, 2))
return flags
})
.then((flags) => setAvailableOptions(flags))
@@ -149,25 +146,48 @@ export default function OptionsSection({
const newOptions = {
...options,
}
delete newOptions[option.FieldName]
// delete newOptions[option.FieldName]
newOptions[option.FieldName] = undefined
setOptionsJson(JSON.stringify(newOptions, null, 2))
return
}
let value: string | number | boolean = ''
const defaultGlobalValue =
globalOptions[
option.FieldName as keyof typeof globalOptions
]
const defaultValue =
if (
defaultGlobalValue !== null &&
defaultGlobalValue !== undefined
) {
value = defaultGlobalValue
} else {
value = availableOptions.find(
(o) => o.FieldName === option.FieldName
)?.DefaultStr
}
const valueType =
availableOptions.find(
(o) => o.FieldName === option.FieldName
)?.DefaultStr || ''
)?.Type || 'string'
if (valueType === 'bool') {
value = Boolean(value || false)
} else if (
valueType.includes('int') ||
valueType.includes('float')
) {
value = Number(value || 0)
}
const newOptions = {
...options,
[option.FieldName]: defaultGlobalValue || defaultValue,
[option.FieldName]: value,
}
setOptionsJson(JSON.stringify(newOptions, null, 2))
src/pages/Copy.tsx
+19 -19
View File
@@ -89,9 +89,9 @@ export default function Copy() {
// Helper function to merge defaults from a remote
const mergeRemoteDefaults = (remote: string | null) => {
if (!remote || !(remote in storeData.remoteConfigList)) return
if (!remote) return
const remoteConfig = storeData.remoteConfigList[remote]
const remoteConfig = storeData.remoteConfigList?.[remote] || {}
if (remoteConfig.copyDefaults) {
mergedCopyDefaults = {
@@ -155,6 +155,23 @@ export default function Copy() {
}
}, [copyOptionsJson, filterOptionsJson, configOptionsJson])
const buttonText = useMemo(() => {
if (isLoading) return 'STARTING...'
if (!sources || sources.length === 0) return 'Please select a source path'
if (!dest) return 'Please select a destination path'
if (sources[0] === dest) return 'Source and destination cannot be the same'
if (jsonError) return 'Invalid JSON for ' + jsonError.toUpperCase() + ' options'
return 'START COPY'
}, [isLoading, jsonError, sources, dest])
const buttonIcon = useMemo(() => {
if (isLoading) return
if (!sources || sources.length === 0 || !dest || sources[0] === dest)
return <FoldersIcon className="w-5 h-5" />
if (jsonError) return <AlertOctagonIcon className="w-5 h-5" />
return <PlayIcon className="w-5 h-5" />
}, [isLoading, jsonError, sources, dest])
const handleStartCopy = useCallback(async () => {
setIsLoading(true)
@@ -346,23 +363,6 @@ export default function Copy() {
setIsLoading(false)
}, [sources, dest, copyOptions, filterOptions, cronExpression, configOptions])
const buttonText = useMemo(() => {
if (isLoading) return 'STARTING...'
if (!sources || sources.length === 0) return 'Please select a source path'
if (!dest) return 'Please select a destination path'
if (sources[0] === dest) return 'Source and destination cannot be the same'
if (jsonError) return 'Invalid JSON for ' + jsonError.toUpperCase() + ' options'
return 'START COPY'
}, [isLoading, jsonError, sources, dest])
const buttonIcon = useMemo(() => {
if (isLoading) return
if (!sources || sources.length === 0 || !dest || sources[0] === dest)
return <FoldersIcon className="w-5 h-5" />
if (jsonError) return <AlertOctagonIcon className="w-5 h-5" />
return <PlayIcon className="w-5 h-5" />
}, [isLoading, jsonError, sources, dest])
return (
<div className="flex flex-col h-screen gap-10 pt-10">
{/* Main Content */}
src/pages/Delete.tsx
+2 -2
View File
@@ -60,9 +60,9 @@ export default function Delete() {
// Helper function to merge defaults from a remote
const mergeRemoteDefaults = (remote: string | null) => {
if (!remote || !(remote in storeData.remoteConfigList)) return
if (!remote) return
const remoteConfig = storeData.remoteConfigList[remote]
const remoteConfig = storeData.remoteConfigList?.[remote] || {}
if (remoteConfig.filterDefaults) {
mergedFilterDefaults = {
src/pages/Mount.tsx
+17 -12
View File
@@ -1,5 +1,4 @@
import { Accordion, AccordionItem, Avatar, Button } from '@heroui/react'
import { sep } from '@tauri-apps/api/path'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { message } from '@tauri-apps/plugin-dialog'
import { exists, mkdir, remove } from '@tauri-apps/plugin-fs'
@@ -29,6 +28,7 @@ import { RCLONE_CONFIG_DEFAULTS, RCLONE_VFS_DEFAULTS } from '../../lib/rclone/co
import { dialogGetMountPlugin } from '../../lib/rclone/mount'
import { needsMountPlugin } from '../../lib/rclone/mount'
import { usePersistedStore } from '../../lib/store'
import { triggerTrayRebuild } from '../../lib/tray'
import OptionsSection from '../components/OptionsSection'
import { PathFinder } from '../components/PathFinder'
@@ -70,11 +70,9 @@ export default function Mount() {
if (!remote) return
if (!(remote in storeData.remoteConfigList)) return
if (
storeData.remoteConfigList[remote].mountDefaults &&
Object.keys(storeData.remoteConfigList[remote].mountDefaults).length > 0 &&
storeData.remoteConfigList?.[remote]?.mountDefaults &&
Object.keys(storeData.remoteConfigList?.[remote]?.mountDefaults).length > 0 &&
!mountOptionsLocked
) {
setMountOptionsJson(
@@ -84,8 +82,8 @@ export default function Mount() {
if (!vfsOptionsLocked) {
if (
storeData.remoteConfigList[remote].vfsDefaults &&
Object.keys(storeData.remoteConfigList[remote].vfsDefaults).length > 0
storeData.remoteConfigList?.[remote]?.vfsDefaults &&
Object.keys(storeData.remoteConfigList?.[remote]?.vfsDefaults).length > 0
) {
setVfsOptionsJson(
JSON.stringify(storeData.remoteConfigList[remote].vfsDefaults, null, 2)
@@ -96,8 +94,8 @@ export default function Mount() {
}
if (
storeData.remoteConfigList[remote].filterDefaults &&
Object.keys(storeData.remoteConfigList[remote].filterDefaults).length > 0 &&
storeData.remoteConfigList?.[remote]?.filterDefaults &&
Object.keys(storeData.remoteConfigList?.[remote]?.filterDefaults).length > 0 &&
!filterOptionsLocked
) {
setFilterOptionsJson(
@@ -107,8 +105,8 @@ export default function Mount() {
if (!configOptionsLocked) {
if (
storeData.remoteConfigList[remote].configDefaults &&
Object.keys(storeData.remoteConfigList[remote].configDefaults).length > 0
storeData.remoteConfigList?.[remote]?.configDefaults &&
Object.keys(storeData.remoteConfigList?.[remote]?.configDefaults).length > 0
) {
setConfigOptionsJson(
JSON.stringify(storeData.remoteConfigList[remote].configDefaults, null, 2)
@@ -164,7 +162,14 @@ export default function Mount() {
(!('VolumeName' in _mountOptions) || !_mountOptions.VolumeName) &&
['windows', 'macos'].includes(platform())
) {
_mountOptions.VolumeName = `${source.split(sep()).pop()}-${Math.random().toString(36).substring(2, 3).toUpperCase()}`
const segments = source.split('/').filter(Boolean)
console.log('[Mount] segments', segments)
const sourcePath =
segments.length === 1 ? segments[0].replace(/:/g, '') : segments.pop()
console.log('[Mount] sourcePath', sourcePath)
_mountOptions.VolumeName = `${sourcePath}-${Math.random().toString(36).substring(2, 3).toUpperCase()}`
}
let directoryExists: boolean | undefined
src/pages/Move.tsx
+2 -2
View File
@@ -77,9 +77,9 @@ export default function Move() {
// Helper function to merge defaults from a remote
const mergeRemoteDefaults = (remote: string | null) => {
if (!remote || !(remote in storeData.remoteConfigList)) return
if (!remote) return
const remoteConfig = storeData.remoteConfigList[remote]
const remoteConfig = storeData.remoteConfigList?.[remote] || {}
if (remoteConfig.moveDefaults) {
mergedMoveDefaults = {
src/pages/Sync.tsx
+2 -2
View File
@@ -82,9 +82,9 @@ export default function Sync() {
// Helper function to merge defaults from a remote
const mergeRemoteDefaults = (remote: string | null) => {
if (!remote || !(remote in storeData.remoteConfigList)) return
if (!remote) return
const remoteConfig = storeData.remoteConfigList[remote]
const remoteConfig = storeData.remoteConfigList?.[remote] || {}
if (remoteConfig.syncDefaults) {
mergedSyncDefaults = {