Compare commits

..

1 Commits

Author SHA1 Message Date
6f15f82122 wip: file list 2024-10-14 18:08:49 +08:00
15 changed files with 651 additions and 920 deletions

View File

@ -1,39 +0,0 @@
name: Auto Build Windows
on:
push:
tags:
- 'v*'
jobs:
build-job:
runs-on: windows-latest
permissions:
id-token: write
contents: write
pull-requests: write
repository-projects: write
steps:
- name: install node
uses: actions/checkout@v4
with:
node-version: '20'
- name: install golang
uses: actions/setup-go@v4
with:
go-version: '1.22'
- name: install wails
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
- name: build
run: wails build -ldflags='-s -w'
- name: create release
id: create_release
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
title: "Release_Windows_${{ github.ref_name }}"
files: |
build/bin/nf-disk.exe

View File

@ -2,26 +2,26 @@ import {
Button, Button,
Input, Input,
makeStyles, makeStyles,
MenuItem, MenuItem,
MenuList, MenuList,
mergeClasses, mergeClasses,
tokens, tokens,
Tooltip, Tooltip
} from "@fluentui/react-components"; } from "@fluentui/react-components"
import { import {
DatabaseLinkRegular, DatabaseLinkRegular,
DeleteRegular, DeleteRegular,
DismissRegular, DismissRegular,
PlugConnectedRegular, PlugConnectedRegular, PlugDisconnectedRegular,
PlugDisconnectedRegular, SettingsRegular
SettingsRegular,
} from "@fluentui/react-icons"; } from "@fluentui/react-icons";
import React, { useEffect, useState } from "react"; import React, {useEffect, useState} from "react";
import { Connection } from "../../interfaces/connection"; import {Connection} from "../../interfaces/connection";
import { useToast } from "../../message"; import {useToast} from "../../message";
import { Dial } from "../../api"; import {Dial} from "../../api";
import { useStoreConnection } from "../../store/connection"; import {useStoreConnection} from "../../store/connection";
import { useStoreBucket } from "../../store/bucket"; import {useStoreBucket} from "../../store/bucket";
const useStyles = makeStyles({ const useStyles = makeStyles({
list: { list: {
@ -77,96 +77,90 @@ const useStyles = makeStyles({
marginLeft: "auto", marginLeft: "auto",
}, },
slider: { slider: {
height: "100%", height: '100%', width: '1px',
width: "1px",
// todo: resize // todo: resize
// cursor: 'ew-resize', // cursor: 'ew-resize',
"& > div": { '& > div': {
height: "100%", height: '100%', width: '1px',
width: "1px", backgroundColor: 'lightgray',
backgroundColor: "lightgray",
}, },
}, },
}); })
export function ConnectionList() { export function ConnectionList() {
const styles = useStyles(); const styles = useStyles()
const { dispatchMessage } = useToast(); const {dispatchMessage} = useToast();
const { conn_get, conn_list, conn_set } = useStoreConnection(); const {conn_get, conn_list, conn_set} = useStoreConnection();
const [conn_filter, set_conn_filter] = useState<string>(""); const [conn_filter, set_conn_filter] = useState<string>('');
const { bucket_get, bucket_set } = useStoreBucket(); const {bucket_get, bucket_set} = useStoreBucket()
const [ctx_menu, set_ctx_menu] = useState<{ const [ctx_menu, set_ctx_menu] = useState<{
x: number; x: number,
y: number; y: number,
display: "none" | "block"; display: 'none' | 'block'
}>({ x: 0, y: 0, display: "none" }); }>({x: 0, y: 0, display: 'none'});
const [menu_conn, set_menu_conn] = useState<Connection | null>(null); const [menu_conn, set_menu_conn] = useState<Connection | null>(null);
useEffect(() => { useEffect(() => {
document.addEventListener("click", (e) => { document.addEventListener("click", (e) => {
set_ctx_menu({ x: 0, y: 0, display: "none" }); set_ctx_menu({x: 0, y: 0, display: 'none'});
}); })
setTimeout(() => { setTimeout(() => {
conn_get().then(); conn_get().then()
}, 1000); }, 1000)
return () => { return () => {
document.removeEventListener("click", (e) => {}); document.removeEventListener("click", (e) => {
}; })
}, []); }
}, [])
async function handleSelect(item: Connection) { async function handleSelect(item: Connection) {
conn_list.map((one: Connection) => { conn_list.map((one: Connection) => {
if (item.id === one.id && one.active) { if (item.id === one.id && one.active) {
conn_set(one); conn_set(one)
bucket_get(one, false); bucket_get(one, false)
bucket_set(null); bucket_set(null)
} }
}); })
} }
async function handleConnect(item: Connection | null) { async function handleConnect(item: Connection | null) {
if (!item) return; if (!item) return;
let res = await Dial("/api/connection/connect", { id: item.id }); let res = await Dial('/api/connection/connect', {id: item.id});
if (res.status !== 200) { if (res.status !== 200) {
dispatchMessage(res.msg, "error"); dispatchMessage(res.msg, "error")
return; return
} }
await conn_set({ ...item, active: true }); await conn_set({...item, active: true})
bucket_get(item, true); bucket_get(item, true)
await bucket_set(null); await bucket_set(null)
} }
async function handleDisconnect(item: Connection | null) { async function handleDisconnect(item: Connection | null) {
if (!item) return; if (!item) return;
let res = await Dial("/api/connection/disconnect", { id: item.id }); let res = await Dial('/api/connection/disconnect', {id: item.id})
if (res.status !== 200) { if (res.status !== 200) {
dispatchMessage(res.msg, "error"); dispatchMessage(res.msg, "error")
return; return
} }
await conn_set({ ...item, active: false }); await conn_set({...item, active: false})
} }
async function handleRightClick( async function handleRightClick(e: React.MouseEvent<HTMLDivElement>, item: Connection) {
e: React.MouseEvent<HTMLDivElement>, e.preventDefault()
item: Connection set_menu_conn(item)
) {
e.preventDefault();
set_menu_conn(item);
const ele = document.querySelector("#list-connection-container"); const ele = document.querySelector('#list-connection-container')
const eleX = ele ? ele.clientWidth : 0; const eleX = ele ? ele.clientWidth : 0;
const eleY = ele ? ele.clientHeight : 0; const eleY = ele ? ele.clientHeight : 0;
const positionX = const positionX = (e.pageX + eleX > window.innerWidth) ? e.pageX - eleX : e.pageX
e.pageX + eleX > window.innerWidth ? e.pageX - eleX : e.pageX; const positionY = (e.pageY + eleY > window.innerHeight) ? e.pageY - eleY : e.pageY
const positionY =
e.pageY + eleY > window.innerHeight ? e.pageY - eleY : e.pageY;
set_ctx_menu({ set_ctx_menu({
x: positionX, x: positionX,
y: positionY, y: positionY,
display: "block", display: 'block',
}); })
} }
return ( return (
@ -177,90 +171,52 @@ export function ConnectionList() {
value={conn_filter} value={conn_filter}
className={styles.filter_input} className={styles.filter_input}
contentAfter={ contentAfter={
<Button <Button appearance={'transparent'} onClick={async () => {
appearance={"transparent"} set_conn_filter('')
onClick={async () => { }} size="small" icon={<DismissRegular/>}/>
set_conn_filter("");
}}
size="small"
icon={<DismissRegular />}
/>
} }
placeholder="搜索连接" placeholder="搜索连接"
onChange={(e) => set_conn_filter(e.target.value)} onChange={(e) => set_conn_filter(e.target.value)}
/> />
</div> </div>
<div <div
id={"list-connection-container"} id={'list-connection-container'}
className={styles.ctx_menu} className={styles.ctx_menu}
style={{ style={{left: ctx_menu.x, top: ctx_menu.y, display: ctx_menu.display}}
left: ctx_menu.x,
top: ctx_menu.y,
display: ctx_menu.display,
}}
> >
<MenuList> <MenuList>
<MenuItem <MenuItem
onClick={async () => { onClick={async () => {
await handleConnect(menu_conn); await handleConnect(menu_conn)
}} }}
icon={<PlugConnectedRegular />} icon={<PlugConnectedRegular/>}></MenuItem>
>
</MenuItem>
<MenuItem <MenuItem
onClick={async () => { onClick={async () => {
await handleDisconnect(menu_conn); await handleDisconnect(menu_conn)
}} }}
icon={<PlugDisconnectedRegular />} icon={<PlugDisconnectedRegular/>}></MenuItem>
> <MenuItem icon={<SettingsRegular/>}></MenuItem>
<MenuItem icon={<DeleteRegular/>}></MenuItem>
</MenuItem>
<MenuItem
onClick={() => {
dispatchMessage("暂未实现", "warning");
}}
icon={<SettingsRegular />}
>
</MenuItem>
<MenuItem
onClick={() => {
dispatchMessage("暂未实现", "warning");
}}
icon={<DeleteRegular />}
>
</MenuItem>
</MenuList> </MenuList>
</div> </div>
<div className={styles.items}> <div className={styles.items}>
<MenuList> <MenuList>
{conn_list {conn_list.filter(item => item.name.includes(conn_filter)).map(item => {
.filter((item) => item.name.includes(conn_filter)) return <MenuItem
.map((item) => { className={item.active ? mergeClasses(styles.items_one, "active") : styles.items_one}
return (
<MenuItem
className={
item.active
? mergeClasses(styles.items_one, "active")
: styles.items_one
}
onClick={async () => { onClick={async () => {
await handleSelect(item); await handleSelect(item)
}} }}
onDoubleClick={async () => { onDoubleClick={async () => {
await handleConnect(item); await handleConnect(item)
}} }}
onContextMenu={async (e) => { onContextMenu={async (e) => {
await handleRightClick(e, item); await handleRightClick(e, item)
}} }}
icon={<DatabaseLinkRegular />} icon={<DatabaseLinkRegular/>}
key={item.id} key={item.id}>
>
{item.name} {item.name}
</MenuItem> </MenuItem>
);
})} })}
</MenuList> </MenuList>
</div> </div>
@ -269,5 +225,5 @@ export function ConnectionList() {
<div></div> <div></div>
</div> </div>
</div> </div>
); )
} }

View File

@ -5,18 +5,13 @@ import {
DialogBody, DialogBody,
DialogActions, DialogActions,
DialogContent, DialogContent,
Button, Button, Spinner, Field, Input, makeStyles, tokens,
Spinner,
Field,
Input,
makeStyles,
tokens,
} from "@fluentui/react-components"; } from "@fluentui/react-components";
import { useState } from "react"; import {useState} from "react";
import { CheckmarkFilled, DismissRegular } from "@fluentui/react-icons"; import {CheckmarkFilled, DismissRegular} from "@fluentui/react-icons";
import { useToast } from "../../message"; import {useToast} from "../../message";
import { Dial } from "../../api"; import {Dial} from "../../api";
import { useStoreConnection } from "../../store/connection"; import {useStoreConnection} from "../../store/connection";
const useActionStyle = makeStyles({ const useActionStyle = makeStyles({
container: { container: {
@ -27,7 +22,7 @@ const useActionStyle = makeStyles({
width: "100%", width: "100%",
gridColumnStart: 0, gridColumnStart: 0,
}, },
test: {}, test: {}
}); });
export interface ConnectionCreateProps { export interface ConnectionCreateProps {
@ -36,130 +31,117 @@ export interface ConnectionCreateProps {
export function ConnectionCreate(props: ConnectionCreateProps) { export function ConnectionCreate(props: ConnectionCreateProps) {
const actionStyle = useActionStyle(); const actionStyle = useActionStyle();
const { dispatchMessage } = useToast(); const {dispatchMessage} = useToast();
const [testLoading, setTestLoading] = useState< const [testLoading, setTestLoading] = useState<"initial" | "loading" | "success" | "error">("initial");
"initial" | "loading" | "success" | "error" const {conn_get} = useStoreConnection();
>("initial");
const { conn_get } = useStoreConnection();
const buttonIcon = const buttonIcon =
testLoading === "loading" ? ( testLoading === "loading" ? (
<Spinner size="tiny" /> <Spinner size="tiny"/>
) : testLoading === "success" ? ( ) : testLoading === "success" ? (
<CheckmarkFilled /> <CheckmarkFilled/>
) : testLoading === "error" ? ( ) : testLoading === "error" ? (
<DismissRegular /> <DismissRegular/>
) : null; ) : null;
const [value, setValue] = useState<{ const [value, setValue] = useState<{ name: string, endpoint: string, access: string, key: string }>({
name: string; name: '',
endpoint: string; endpoint: '',
access: string; access: '',
key: string; key: ''
}>({ })
name: "",
endpoint: "",
access: "",
key: "",
});
async function test() { async function test() {
setTestLoading("loading"); setTestLoading("loading")
let res = await Dial<string>("/api/connection/test", value); let res = await Dial<string>("/api/connection/test", value)
const status = res.status === 200 ? "success" : "error"; const status = res.status === 200 ? "success" : "error"
setTestLoading(status); setTestLoading(status);
dispatchMessage(res.msg, status); dispatchMessage(res.msg, status)
} }
async function create() { async function create() {
let res = await Dial("/api/connection/create", value); // self
// qUvfW8xpOTc23O96
// eTcuc8BebHPVpZZwIaNmzfwxRxPYGfTj
// 48-dev
// OSIsqPrl0TkAUj3R
// FYF4BBzL2j2ObbVYH0FrvOZqJf1EACRy
let res = await Dial("/api/connection/create", value)
dispatchMessage(res.msg, res.status === 200 ? "success" : "error"); dispatchMessage(res.msg, res.status === 200 ? "success" : "error");
if (res.status === 200) { if (res.status === 200) {
dispatchMessage("新建连接成功", "success"); dispatchMessage("新建连接成功", "success");
await conn_get(); await conn_get()
props.openFn(false); props.openFn(false)
} }
} }
return ( return <>
<>
<DialogSurface> <DialogSurface>
<DialogBody> <DialogBody>
<DialogTitle>S3连接</DialogTitle> <DialogTitle>S3连接</DialogTitle>
<DialogContent> <DialogContent>
<div className="connection-container"> <div className='connection-container'>
<div className="connection-form"> <div className='connection-form'>
<div className="connection-form-field"> <div className='connection-form-field'>
<Field label="name"> <Field
<Input label="name"
placeholder="名称 (example: 测试S3-minio)" >
value={value.name} <Input placeholder='名称 (example: 测试S3-minio)' value={value.name}
onChange={(e) => { onChange={(e) => {
setValue({ ...value, name: e.target.value }); setValue({...value, name: e.target.value});
}} }}/>
/>
</Field> </Field>
</div> </div>
<div className="connection-form-field"> <div className='connection-form-field'>
<Field label="endpoint" required> <Field
<Input label="endpoint"
placeholder="地址 (example: https://ip_or_server-name:port)" required
>
<Input placeholder='地址 (example: https://ip_or_server-name:port)'
value={value.endpoint} value={value.endpoint}
required required
onChange={(e) => { onChange={(e) => {
setValue({ ...value, endpoint: e.target.value }); setValue({...value, endpoint: e.target.value});
}} }}/>
/>
</Field> </Field>
</div> </div>
<div className="connection-form-field"> <div className='connection-form-field'>
<Field label="secret access" required> <Field
<Input label="secret access"
placeholder=""
required required
value={value.access} >
onChange={(e) => { <Input placeholder=''
setValue({ ...value, access: e.target.value }); required
}} value={value.access} onChange={(e) => {
/> setValue({...value, access: e.target.value});
}}/>
</Field> </Field>
</div> </div>
<div className="connection-form-field"> <div className='connection-form-field'>
<Field label="secret key" required> <Field
<Input label="secret key"
placeholder=""
required required
value={value.key} >
onChange={(e) => { <Input placeholder=''
setValue({ ...value, key: e.target.value }); required
}} value={value.key} onChange={(e) => {
/> setValue({...value, key: e.target.value});
}}/>
</Field> </Field>
</div> </div>
</div> </div>
</div> </div>
</DialogContent> </DialogContent>
<DialogActions className={actionStyle.container}> <DialogActions className={actionStyle.container}>
<Button <Button className={actionStyle.test} appearance='transparent' icon={buttonIcon}
className={actionStyle.test} onClick={async () => await test()}></Button>
appearance="transparent"
icon={buttonIcon}
onClick={async () => await test()}
>
</Button>
<DialogTrigger disableButtonEnhancement> <DialogTrigger disableButtonEnhancement>
<Button appearance="secondary"></Button> <Button appearance="secondary"></Button>
</DialogTrigger> </DialogTrigger>
<Button <Button onClick={async () => {
onClick={async () => { await create()
await create(); }} appearance="primary"></Button>
}}
appearance="primary"
>
</Button>
</DialogActions> </DialogActions>
</DialogBody> </DialogBody>
</DialogSurface> </DialogSurface>
</> </>
);
} }

View File

@ -4,7 +4,6 @@ import {makeStyles} from "@fluentui/react-components";
import {useStoreBucket} from "../../store/bucket"; import {useStoreBucket} from "../../store/bucket";
import {ListFileComponent} from "./list_file"; import {ListFileComponent} from "./list_file";
import {useState} from "react"; import {useState} from "react";
import {PreviewFile} from "../preview/preview";
const useStyles = makeStyles({ const useStyles = makeStyles({
content: { content: {
@ -19,21 +18,14 @@ const useStyles = makeStyles({
export function Content() { export function Content() {
const styles = useStyles() const styles = useStyles()
const [preview, set_preview] = useState<{ url: string, content_type: string }>({url: '', content_type: ''}) const {bucket_active } = useStoreBucket()
const {bucket_active} = useStoreBucket()
const closeFn = () => {
set_preview({url: '', content_type: ''})
}
return <div className={styles.content}> return <div className={styles.content}>
<Path/> <Path />
{ {
preview.url ? <PreviewFile url={preview.url} content_type={preview.content_type} close={closeFn}/> :
(
bucket_active ? bucket_active ?
<ListFileComponent set_preview_fn={set_preview}/> : <ListBucketComponent/> <ListFileComponent/> :
) <ListBucketComponent/>
} }
</div> </div>
} }

View File

@ -1,11 +1,4 @@
import { import {makeStyles, MenuItem, MenuList, Spinner, Text, tokens} from "@fluentui/react-components";
makeStyles,
MenuItem,
MenuList,
Spinner,
Text,
tokens,
} from "@fluentui/react-components";
import { import {
ArrowDownloadFilled, ArrowDownloadFilled,
DeleteRegular, DeleteRegular,
@ -19,68 +12,67 @@ import {
DocumentPdfRegular, DocumentPdfRegular,
DocumentYmlRegular, DocumentYmlRegular,
FolderRegular, FolderRegular,
PreviewLinkRegular, PreviewLinkRegular
} from "@fluentui/react-icons"; } from "@fluentui/react-icons";
import { VirtualizerScrollView } from "@fluentui/react-components/unstable"; import {VirtualizerScrollView} from "@fluentui/react-components/unstable";
import React, { useEffect, useState } from "react"; import React, {useEffect, useState} from "react";
import { useStoreBucket } from "../../store/bucket"; import {useStoreBucket} from "../../store/bucket";
import { S3File } from "../../interfaces/connection"; import {S3File} from "../../interfaces/connection";
import { useStoreFile, useStoreFileFilter } from "../../store/file"; import {useStoreFile, useStoreFileFilter} from "../../store/file";
import { useStoreConnection } from "../../store/connection"; import {useStoreConnection} from "../../store/connection";
import { TrimSuffix } from "../../hook/strings"; import {TrimSuffix} from "../../hook/strings";
import { Dial } from "../../api"; import {Dial} from "../../api";
import { useToast } from "../../message"; import {useToast} from "../../message";
import { CanPreview } from "../../hook/preview"; import {CanPreview} from "../../hook/preview";
const useStyles = makeStyles({ const useStyles = makeStyles({
container: { container: {
marginTop: "0.5rem", marginTop: '0.5rem',
maxWidth: "calc(100vw - 25.2rem)", maxWidth: 'calc(100vw - 25.2rem)',
width: "calc(100vw - 25.2rem)", width: 'calc(100vw - 25.2rem)',
maxHeight: "calc(100vh - 10rem)", maxHeight: 'calc(100vh - 10rem)',
height: "calc(100vh - 10rem)", height: 'calc(100vh - 10rem)',
}, },
loading: { loading: {
flex: "1", flex: "1",
width: "100%", width: '100%',
height: "100%", height: '100%',
display: "flex", display: 'flex',
justifyContent: "center", justifyContent: 'center',
alignItems: "center", alignItems: 'center',
flexDirection: "column", flexDirection: 'column',
}, },
no_data: { no_data: {
flex: "1", flex: "1",
height: "100%", height: '100%',
width: "100%", width: '100%',
display: "flex", display: 'flex',
justifyContent: "center", justifyContent: 'center',
alignItems: "center", alignItems: 'center',
fontSize: "8rem", fontSize: '8rem',
flexDirection: "column", flexDirection: 'column',
}, },
list: { list: {
flex: "1", flex: "1",
height: "100%", height: '100%',
width: "100%", width: '100%',
}, },
row: { row: {
height: "32px", height: '32px',
lineHeight: "32px", display: 'flex',
display: "flex", marginLeft: '0.5rem',
marginLeft: "0.5rem", marginRight: '0.5rem',
marginRight: "0.5rem",
}, },
item: { item: {
width: "100%", width: '100%',
maxWidth: "100%", maxWidth: '100%',
"&:hover": { "&:hover": {
color: tokens.colorNeutralForeground2BrandPressed, color: tokens.colorNeutralForeground2BrandPressed,
}, }
}, },
text: { text: {
overflow: "hidden", overflow: 'hidden',
width: "calc(100vw - 32rem)", width: 'calc(100vw - 32rem)',
display: "block", display: "block",
}, },
ctx_menu: { ctx_menu: {
@ -92,249 +84,199 @@ const useStyles = makeStyles({
paddingTop: "4px", paddingTop: "4px",
paddingBottom: "4px", paddingBottom: "4px",
}, },
}); })
export interface ListFileComponentProps {
set_preview_fn: React.Dispatch<
React.SetStateAction<{ url: string; content_type: string }>
>;
}
export function ListFileComponent(props: ListFileComponentProps) { export function ListFileComponent() {
const styles = useStyles(); const styles = useStyles();
const { dispatchMessage } = useToast(); const {dispatchMessage} = useToast();
const { conn_active } = useStoreConnection(); const {conn_active} = useStoreConnection();
const { bucket_active } = useStoreBucket(); const {bucket_active} = useStoreBucket()
const { file_active, files_get, file_set, files_list } = useStoreFile(); const {file_active, files_get, file_set, files_list} = useStoreFile()
const { prefix, filter, prefix_set } = useStoreFileFilter(); const {prefix, filter, prefix_set} = useStoreFileFilter()
const [preview_content_type, set_preview_content_type] = useState("");
const [ctx_menu, set_ctx_menu] = useState<{ const [ctx_menu, set_ctx_menu] = useState<{
x: number; x: number,
y: number; y: number,
display: "none" | "block"; display: 'none' | 'block'
}>({ x: 0, y: 0, display: "none" }); }>({x: 0, y: 0, display: 'none'});
const [loading, set_loading] = useState(true); const [loading, set_loading] = useState(true)
useEffect(() => { useEffect(() => {
document.addEventListener("click", (e) => { document.addEventListener("click", (e) => {
set_ctx_menu({ x: 0, y: 0, display: "none" }); set_ctx_menu({x: 0, y: 0, display: 'none'});
}); })
return () => { return () => {
document.removeEventListener("click", (e) => {}); document.removeEventListener("click", (e) => {
}; })
}, []); }
}, [])
useEffect(() => { useEffect(() => {
set_loading(true); set_loading(true)
files_get(conn_active!, bucket_active!, prefix, filter).then(() => { files_get(conn_active!, bucket_active!, prefix, filter).then(() => {
set_loading(false); // set_loading(false)
}); })
}, [conn_active, bucket_active, prefix, filter]); }, [conn_active, bucket_active, prefix, filter]);
const filename = (key: string) => { const filename = (key: string) => {
let strs = TrimSuffix(key, "/").split("/"); let strs = TrimSuffix(key, "/").split("/")
return strs[strs.length - 1]; return strs[strs.length - 1]
}; }
async function handleClick(item: S3File) { async function handleClick(item: S3File) {
if (item.type === 1) { if (item.type === 1) {
await prefix_set(item.key); await prefix_set(item.key)
return; return
} }
} }
async function handleRightClick( async function handleRightClick(e: React.MouseEvent<HTMLDivElement>, item: S3File) {
e: React.MouseEvent<HTMLDivElement>, e.preventDefault()
item: S3File await file_set(item.key)
) { const ele = document.querySelector('#list-file-container')
e.preventDefault(); let eleX = ele ? ele.clientWidth : 0
await file_set(item.key); let eleY = ele ? ele.clientHeight : 0
set_preview_content_type(CanPreview(item.name)); const positionX = (e.pageX + eleX > window.innerWidth) ? e.pageX - eleX : e.pageX
const ele = document.querySelector("#list-file-container"); const positionY = (e.pageY + eleY > window.innerHeight) ? e.pageY - eleY : e.pageY
let eleX = ele ? ele.clientWidth : 0;
let eleY = ele ? ele.clientHeight : 0;
const positionX =
e.pageX + eleX > window.innerWidth ? e.pageX - eleX : e.pageX;
const positionY =
e.pageY + eleY > window.innerHeight ? e.pageY - eleY : e.pageY;
set_ctx_menu({ set_ctx_menu({
x: positionX, x: positionX,
y: positionY, y: positionY,
display: "block", display: 'block',
}); })
} }
async function handleDownload(file: string | null) { async function handleDownload(file: string | null) {
if (!file) return; if (!file) return
const res1 = await Dial<{ result: string }>("/runtime/dialog/save", { const res1 = await Dial<{ result: string }>("/runtime/dialog/save", {
default_filename: file, default_filename: file,
}); })
if (res1.status !== 200) { if (res1.status !== 200) {
return; return
} }
if (!res1.data) return; if (!res1.data) return
const res2 = await Dial("/api/file/download", { const res2 = await Dial('/api/file/download', {
conn_id: conn_active?.id, conn_id: conn_active?.id,
bucket: bucket_active?.name, bucket: bucket_active?.name,
key: file, key: file,
location: res1.data.result, location: res1.data.result,
}); })
if (res2.status === 200) { if (res2.status === 200) {
dispatchMessage("保存文件成功", "success"); dispatchMessage('保存文件成功', 'success')
} }
} }
async function handlePreview() { async function handlePreview() {
const res = await Dial<{ url: string; method: string }>("/api/file/get", { dispatchMessage('todo', 'warning')
conn_id: conn_active?.id,
bucket: bucket_active?.name,
key: file_active ?? "",
});
if (res.status !== 200) {
dispatchMessage("预览失败", "warning");
return;
}
props.set_preview_fn({
url: res.data.url,
content_type: preview_content_type,
});
} }
return ( return <div className={styles.container}>
<div className={styles.container}>
<div <div
id={"list-file-container"} id={'list-file-container'}
className={styles.ctx_menu} className={styles.ctx_menu}
style={{ left: ctx_menu.x, top: ctx_menu.y, display: ctx_menu.display }} style={{left: ctx_menu.x, top: ctx_menu.y, display: ctx_menu.display}}
> >
<MenuList> <MenuList>
<MenuItem <MenuItem
onClick={async () => { onClick={async () => {
await handleDownload(file_active); await handleDownload(file_active)
}} }}
icon={<ArrowDownloadFilled />} icon={<ArrowDownloadFilled/>}></MenuItem>
>
</MenuItem>
<MenuItem <MenuItem
disabled={!preview_content_type} disabled={!CanPreview(file_active ?? '')}
onClick={async () => { onClick={async () => {
await handlePreview(); await handlePreview()
}} }}
icon={<PreviewLinkRegular />} icon={<PreviewLinkRegular/>}></MenuItem>
> <MenuItem icon={<DeleteRegular/>}></MenuItem>
</MenuItem>
<MenuItem
onClick={() => {
dispatchMessage("敬请期待...", "warning");
}}
icon={<DeleteRegular />}
>
</MenuItem>
</MenuList> </MenuList>
</div> </div>
<div <div className={styles.loading} style={{display: loading ? 'flex' : 'none'}}>
className={styles.loading} <Spinner appearance="primary" label="加载中..."/>
style={{ display: loading ? "flex" : "none" }}
>
<Spinner appearance="primary" label="加载中..." />
</div> </div>
<div {
className={styles.no_data} // (!loading) && (files_list.length === 0) ?
style={{ display: !loading && !files_list.length ? "flex" : "none" }} // <div className={styles.no_data}>
> // <div>
<div> // <DocumentDismissRegular/>
<DocumentDismissRegular /> // </div>
</div> // <Text size={900}>
<Text size={900}></Text> // 没有文件
</div> // </Text>
<div // </div>
style={{ display: !loading && files_list.length ? "block" : "none" }} // : <></>
>
<VirtualizerScrollView
numItems={files_list.length}
itemSize={32}
container={{
role: "list",
style: { maxHeight: "calc(100vh - 10rem)" },
}}
>
{(idx) => {
return (
<div
className={styles.row}
key={idx}
onClick={async () => {
await handleClick(files_list[idx]);
}}
onContextMenu={async (e) => {
await handleRightClick(e, files_list[idx]);
}}
>
<MenuItem
className={styles.item}
icon={
files_list[idx].type ? (
<FolderRegular />
) : (
<FileIcon name={files_list[idx].name} />
)
} }
> {
<Text truncate wrap={false} className={styles.text}> // (!loading && files_list) ?
{filename(files_list[idx].key)} // <VirtualizerScrollView
</Text> // numItems={files_list.length}
</MenuItem> // itemSize={32}
// container={{role: 'list', style: {maxHeight: 'calc(100vh - 9rem)'}}}
// >
// {(idx) => {
// return <div
// className={styles.row} key={idx}
// onClick={async () => {
// await handleClick(files_list[idx])
// }}
// onContextMenu={async (e) => {
// await handleRightClick(e, files_list[idx])
// }}>
// <MenuItem className={styles.item}
// icon={files_list[idx].type ? <FolderRegular/> :
// <FileIcon name={files_list[idx].name}/>}>
// <Text truncate wrap={false} className={styles.text}>
// {filename(files_list[idx].key)}
// </Text>
// </MenuItem>
// </div>
// }}
// </VirtualizerScrollView> : <></>
}
<MenuList className={styles.list}>
</MenuList>
</div> </div>
);
}}
</VirtualizerScrollView>
</div>
</div>
);
} }
type FileIconProps = { type FileIconProps = {
name: string; name: string
}; }
function FileIcon(props: FileIconProps) { function FileIcon(props: FileIconProps) {
const strings = props.name.split("."); const strings = props.name.split(".")
const suffix = strings[strings.length - 1]; const suffix = strings[strings.length - 1]
switch (suffix.toLowerCase()) { switch (suffix) {
case "png": case "png":
return <DocumentImageRegular />; return <DocumentImageRegular/>
case "jpg": case "jpg":
return <DocumentImageRegular />; return <DocumentImageRegular/>
case "jpeg": case "jpeg":
return <DocumentImageRegular />; return <DocumentImageRegular/>
case "gif": case "gif":
return <DocumentImageRegular />; return <DocumentImageRegular/>
case "db": case "db":
return <DocumentDatabaseRegular />; return <DocumentDatabaseRegular/>
case "sqlite": case "sqlite":
return <DocumentDatabaseRegular />; return <DocumentDatabaseRegular/>
case "sqlite3": case "sqlite3":
return <DocumentDatabaseRegular />; return <DocumentDatabaseRegular/>
case "pdf": case "pdf":
return <DocumentPdfRegular />; return <DocumentPdfRegular/>
case "css": case "css":
return <DocumentCssRegular />; return <DocumentCssRegular/>
case "js": case "js":
return <DocumentJavascriptRegular />; return <DocumentJavascriptRegular/>
case "yaml": case "yaml":
return <DocumentYmlRegular />; return <DocumentYmlRegular/>
case "yml": case "yml":
return <DocumentYmlRegular />; return <DocumentYmlRegular/>
case "html": case "html":
return <DocumentChevronDoubleRegular />; return <DocumentChevronDoubleRegular/>
case "json": case "json":
return <DocumentChevronDoubleRegular />; return <DocumentChevronDoubleRegular/>
case "go": case "go":
return <DocumentChevronDoubleRegular />; return <DocumentChevronDoubleRegular/>
default: default:
return <DocumentBulletListRegular />; return <DocumentBulletListRegular/>
} }
} }

View File

@ -12,7 +12,7 @@ import {useToast} from "../../message";
import {Dial} from "../../api"; import {Dial} from "../../api";
import {useStoreConnection} from "../../store/connection"; import {useStoreConnection} from "../../store/connection";
import {useStoreBucket} from "../../store/bucket"; import {useStoreBucket} from "../../store/bucket";
import {useStoreFile, useStoreFileFilter} from "../../store/file"; import {useStoreFile} from "../../store/file";
import {MoreHorizontalRegular} from "@fluentui/react-icons"; import {MoreHorizontalRegular} from "@fluentui/react-icons";
const useStyle = makeStyles({ const useStyle = makeStyles({
@ -43,8 +43,7 @@ export function UploadFiles(props: UploadFilesProps) {
const { conn_active} = useStoreConnection(); const { conn_active} = useStoreConnection();
const {bucket_active} = useStoreBucket(); const {bucket_active} = useStoreBucket();
const {files_get} = useStoreFile() const {prefix, files_get} = useStoreFile()
const {prefix } = useStoreFileFilter()
const [selected, set_selected] = useState<string[]>([]); const [selected, set_selected] = useState<string[]>([]);

View File

@ -1,81 +1,3 @@
import {Button, makeStyles,tokens, Text } from "@fluentui/react-components"; export function PreviewFile() {
import { DismissRegular } from "@fluentui/react-icons";
import { useEffect } from "react";
const useStyle = makeStyles({
container: {
position: 'absolute',
left: 0,
top: 0,
width: '100vw',
maxWidth: '100vw',
height: '100vh',
maxHeight: '100vh',
zIndex: 100,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
background: tokens.colorNeutralBackground1,
},
header: {
height: '4rem',
width: '100%',
display: 'flex',
alignItems: 'center',
},
header_close_button: {
marginLeft: 'auto',
},
body: {
width: '100%',
maxWidth: '100%',
height: '100%',
maxHeight: '100%',
flex: 1,
display: 'flex',
justifyContent: 'center',
alignItems:'center',
},
})
export function PreviewFile(props: { url: string, content_type: string, close: () => void }) {
const styles = useStyle()
const category = props.content_type.split('/')[0]
useEffect(() => {
window.addEventListener('keyup', (e) => {
if (e.key === 'Escape') {
props.close()
}
})
return () => {
window.removeEventListener('keyup', () => { })
}
}, [])
switch (category) {
case "image":
return <div className={styles.container}>
<div className={styles.header}>
<Button
size="large"
appearance="transparent"
className={styles.header_close_button}
onClick={() => { props.close() }}>
<DismissRegular />
</Button>
</div>
<div className={styles.body}>
<img src={props.url}/>
</div>
</div>
default:
return <div className={styles.container}>
<Text></Text>
</div>
}
} }

View File

@ -1,6 +1,6 @@
export function CanPreview(filename: string) { export function CanPreview(filename: string) {
const fs = filename.split(".") const fs = filename.split(".")
switch (fs[fs.length - 1].toLowerCase()) { switch (fs[fs.length - 1]) {
case "jpg": case "jpg":
return "image/jpg" return "image/jpg"
case "jpeg": case "jpeg":

View File

@ -1,33 +1,18 @@
import {create} from 'zustand' import {create} from 'zustand'
import {Dial} from "../api";
import {Bucket, Connection} from "../interfaces/connection"; import {Bucket, Connection} from "../interfaces/connection";
interface StorePreview { interface StorePreview {
preview_key: string;
preview_url: string; preview_url: string;
preview_content_type: string; preview_content_type: string;
preview_get: (conn:Connection,bucket: Bucket,key: string) => Promise<void>; preview_set: (key: string) => void;
} }
export const useStorePreview = create<StorePreview>()((set) => ({ export const useStorePreview = create<StorePreview>()((set) => ({
preview_key: '',
preview_url: '', preview_url: '',
preview_content_type: '', preview_content_type: '',
preview_get: async (conn: Connection, bucket: Bucket,key: string) => { preview_set: async (key: string) => set(state => {
if (key === '') { return {preview_key: key}
return set(()=>{return {preview_url: ''}}) }),
}
let res = await Dial<{url:string,method:string}>('/api/file/get', {
conn_id: conn.id,
bucket: bucket.name,
key: key
})
if(res.status!=200) {
return set(()=>{return {preview_url: ''}})
}
set(()=>{
return {preview_url:res.data.url}
})
},
})) }))

View File

@ -2,12 +2,10 @@ package controller
import ( import (
"context" "context"
"fmt"
"github.com/loveuer/nf-disk/internal/api" "github.com/loveuer/nf-disk/internal/api"
"github.com/loveuer/nf-disk/internal/db" "github.com/loveuer/nf-disk/internal/db"
"github.com/loveuer/nf-disk/internal/manager" "github.com/loveuer/nf-disk/internal/manager"
"github.com/loveuer/nf-disk/internal/model" "github.com/loveuer/nf-disk/internal/model"
"github.com/loveuer/nf-disk/internal/opt"
"github.com/loveuer/nf-disk/internal/tool" "github.com/loveuer/nf-disk/internal/tool"
"github.com/loveuer/nf-disk/ndh" "github.com/loveuer/nf-disk/ndh"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
@ -39,8 +37,7 @@ func NewApp(gctx context.Context) *App {
func (a *App) Startup(ctx context.Context) { func (a *App) Startup(ctx context.Context) {
log.Info("app startup!!!") log.Info("app startup!!!")
a.ctx = ctx a.ctx = ctx
tool.Must(opt.Init()) tool.Must(db.Init(ctx, "sqlite::memory", db.OptSqliteByMem(nil)))
tool.Must(db.Init(ctx, fmt.Sprintf("sqlite::%s", opt.ConfigFile)))
tool.Must(model.Init(db.Default.Session())) tool.Must(model.Init(db.Default.Session()))
tool.Must(manager.Init(ctx)) tool.Must(manager.Init(ctx))
tool.Must(api.Init(ctx)) tool.Must(api.Init(ctx))

View File

@ -1,7 +1,9 @@
package model package model
import ( import (
"github.com/loveuer/nf-disk/internal/opt"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause"
) )
func Init(tx *gorm.DB) (err error) { func Init(tx *gorm.DB) (err error) {
@ -9,5 +11,24 @@ func Init(tx *gorm.DB) (err error) {
&Connection{}, &Connection{},
) )
if opt.Debug {
err = tx.Create([]*Connection{
{
Name: "dev-minio",
Endpoint: "http://10.220.10.15:9000",
Access: "8ALV3DUZI31YG4BDRJ0Z",
Key: "CRqwS1MsiUj27TbRK+3T2n+LpKWd07VvaDKuzU0H",
},
{
Name: "test",
Endpoint: "http://10.220.10.14:19000",
Access: "5VCR05L4BSGNCTCD8DXP",
Key: "FPTMYBEiHhWLJ05C3aGXW8bjFXXNmghc8Za3Fo2u",
},
}).Clauses(clause.OnConflict{
DoNothing: true,
}).Error
}
return return
} }

View File

@ -1,24 +0,0 @@
package opt
import (
"os"
"path/filepath"
)
func Init() error {
var (
err error
)
if ConfigDir, err = os.UserConfigDir(); err != nil {
return err
}
if os.MkdirAll(filepath.Join(ConfigDir, "nf-disk"), 0755); err != nil {
return err
}
ConfigFile = filepath.Join(ConfigDir, "nf-disk", "config.db")
return nil
}

View File

@ -8,6 +8,4 @@ const (
var ( var (
Debug bool = false Debug bool = false
ConfigDir string
ConfigFile string
) )

View File

@ -12,10 +12,10 @@ import (
) )
type ObjectInfo struct { type ObjectInfo struct {
Bucket string `json:"bucket"` Bucket string
Key string `json:"key"` Key string
ContentType string `json:"content_type"` ContentType string
Expire int64 `json:"expire"` Expire int64
} }
func (c *Client) GetObjectInfo(ctx context.Context, bucket string, key string) (*ObjectInfo, error) { func (c *Client) GetObjectInfo(ctx context.Context, bucket string, key string) (*ObjectInfo, error) {
@ -62,9 +62,9 @@ func (presigner *Presigner) GetObject(ctx context.Context, bucketName string, ob
} }
type ObjectEntry struct { type ObjectEntry struct {
URL string `json:"url"` URL string
Method string `json:"method"` Method string
Header http.Header `json:"header"` Header http.Header
} }
func (c *Client) GetObjectEntry(ctx context.Context, bucket string, key string, lifetimes ...int64) (*ObjectEntry, error) { func (c *Client) GetObjectEntry(ctx context.Context, bucket string, key string, lifetimes ...int64) (*ObjectEntry, error) {
@ -92,7 +92,7 @@ func (c *Client) GetObjectEntry(ctx context.Context, bucket string, key string,
type ObjectEntity struct { type ObjectEntity struct {
ObjectInfo ObjectInfo
Body io.ReadCloser `json:"body"` Body io.ReadCloser
} }
func (c *Client) GetObject(ctx context.Context, bucket string, key string) (*ObjectEntity, error) { func (c *Client) GetObject(ctx context.Context, bucket string, key string) (*ObjectEntity, error) {

View File

@ -22,7 +22,7 @@ func main() {
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
defer cancel() defer cancel()
flag.BoolVar(&opt.Debug, "debug", false, "debug mode") flag.BoolVar(&opt.Debug, "debug", true, "debug mode")
flag.Parse() flag.Parse()
if opt.Debug { if opt.Debug {