feat: add more manage features

samuelncui · Oct 4, 2023 · 973cbb9 · 973cbb9
1 parent c105763
commit 973cbb9
Show file tree

Hide file tree

Showing 20 changed files with 423 additions and 110 deletions.
diff --git a/apis/file_get.go b/apis/file_get.go
@@ -24,7 +24,7 @@ func (api *API) FileGet(ctx context.Context, req *entity.FileGetRequest) (*entit
 		return nil, err
 	}
 
-	children, err := api.lib.List(ctx, req.Id)
+	children, err := api.lib.ListWithSize(ctx, req.Id)
 	if err != nil {
 		return nil, err
 	}

diff --git a/entity/utils.go b/entity/utils.go
@@ -3,30 +3,14 @@ package entity
 import (
 	"database/sql/driver"
 	"fmt"
-	reflect "reflect"
-	sync "sync"
 
 	"github.com/modern-go/reflect2"
 	"google.golang.org/protobuf/proto"
 )
 
-var (
-	typeMap sync.Map
-)
-
 // Scan implement database/sql.Scanner
 func Scan(dst proto.Message, src interface{}) error {
-	cacheKey := reflect2.RTypeOf(dst)
-	typ, has := loadType(cacheKey)
-	if !has {
-		ptrType := reflect.TypeOf(dst)
-		if ptrType.Kind() != reflect.Ptr {
-			return fmt.Errorf("scan dst is not an ptr, has= %T", dst)
-		}
-
-		typ = reflect2.Type2(ptrType.Elem())
-		storeType(cacheKey, typ)
-	}
+	typ := reflect2.TypeOf(dst).(reflect2.PtrType).Elem()
 	typ.Set(dst, typ.New())
 
 	var buf []byte
@@ -59,15 +43,3 @@ func Value(src proto.Message) (driver.Value, error) {
 	}
 	return buf, nil
 }
-
-func loadType(key uintptr) (reflect2.Type, bool) {
-	i, has := typeMap.Load(key)
-	if !has {
-		return nil, false
-	}
-	return i.(reflect2.Type), true
-}
-
-func storeType(key uintptr, typ reflect2.Type) {
-	typeMap.Store(key, typ)
-}
diff --git a/frontend/package.json b/frontend/package.json
@@ -10,8 +10,8 @@
     "gen-proto": "protoc --ts_out ./src/entity --proto_path ../entity/ `ls ../entity/*.proto` && ./src/entity/gen_index.sh"
   },
   "dependencies": {
-    "@aperturerobotics/chonky": "^0.2.6",
-    "@aperturerobotics/chonky-icon-fontawesome": "^0.2.2",
+    "@samuelncui/chonky": "^0.2.7",
+    "@samuelncui/chonky-icon-fontawesome": "^0.2.7",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",

diff --git a/frontend/src/actions.ts b/frontend/src/actions.ts
@@ -1,6 +1,6 @@
-import { FileData, FileArray, FileAction } from "@aperturerobotics/chonky";
-import { defineFileAction } from "@aperturerobotics/chonky";
-import { ChonkyActions } from "@aperturerobotics/chonky";
+import { FileData, FileArray, FileAction } from "@samuelncui/chonky";
+import { defineFileAction } from "@samuelncui/chonky";
+import { ChonkyActions } from "@samuelncui/chonky";
 
 type RenameFileState = {
   contextMenuTriggerFile: FileData;
@@ -46,3 +46,11 @@ export const CreateRestoreJobAction = defineFileAction({
     toolbar: true,
   },
 } as FileAction);
+
+export const TrimLibraryAction = defineFileAction({
+  id: "trim_library",
+  button: {
+    name: "Trim Library",
+    toolbar: true,
+  },
+} as FileAction);
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
@@ -1,4 +1,4 @@
-import { FileData } from "@aperturerobotics/chonky";
+import { FileData } from "@samuelncui/chonky";
 import { GrpcWebFetchTransport } from "@protobuf-ts/grpcweb-transport";
 import { ServiceClient, File, SourceFile, Tape, Position } from "./entity";
 
@@ -90,7 +90,7 @@ export function convertTapes(tapes: Array<Tape>): FileData[] {
       selectable: true,
       draggable: false,
       droppable: false,
-      size: 0,
+      size: Number(tape.writenBytes),
       modDate: moment.unix(Number(tape.createTime)).toDate(),
       isTape: true,
     };

diff --git a/frontend/src/components/toolbarInfo.tsx b/frontend/src/components/toolbarInfo.tsx
@@ -0,0 +1,19 @@
+import { memo } from "react";
+import Typography from "@mui/material/Typography";
+import { FileArray } from "@samuelncui/chonky";
+
+import { formatFilesize } from "../tools";
+
+export interface ToobarInfoProps {
+  files?: FileArray;
+}
+
+export const ToobarInfo: React.FC<ToobarInfoProps> = memo((props) => {
+  return (
+    <div className="chonky-infoContainer">
+      <Typography variant="body1" className="chonky-infoText">
+        {formatFilesize((props.files || []).reduce((total, file) => total + (file?.size ? file.size : 0), 0))}
+      </Typography>
+    </div>
+  );
+});
diff --git a/frontend/src/init.tsx b/frontend/src/init.tsx
@@ -1,5 +1,5 @@
-import { setChonkyDefaults } from "@aperturerobotics/chonky";
-import { ChonkyIconFA } from "@aperturerobotics/chonky-icon-fontawesome";
+import { setChonkyDefaults } from "@samuelncui/chonky";
+import { ChonkyIconFA } from "@samuelncui/chonky-icon-fontawesome";
 
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons/faPencilAlt";

diff --git a/frontend/src/pages/backup.tsx b/frontend/src/pages/backup.tsx
@@ -2,8 +2,8 @@ import { useState, useEffect, useMemo, useCallback, FC, useRef, RefObject } from
 
 import Grid from "@mui/material/Grid";
 import Box from "@mui/material/Box";
-import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@aperturerobotics/chonky";
-import { ChonkyActions, ChonkyFileActionData, FileData } from "@aperturerobotics/chonky";
+import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@samuelncui/chonky";
+import { ChonkyActions, ChonkyFileActionData, FileData } from "@samuelncui/chonky";
 
 import { cli, convertSourceFiles } from "../api";
 import { Root } from "../api";
@@ -26,7 +26,6 @@ const useBackupSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
 
   const onFileAction = useCallback(
     (data: ChonkyFileActionData) => {
-      console.log("source", data);
       switch (data.id) {
         case ChonkyActions.OpenFiles.id:
           (async () => {
@@ -72,7 +71,7 @@ const useBackupTargetBrowser = () => {
   const [files, setFiles] = useState<FileArray>(Array(0));
   const [folderChain, setFolderChan] = useState<FileArray>([
     {
-      id: "0",
+      id: "backup_waitlist",
       name: "Backup Waitlist",
       isDir: true,
       openable: true,
@@ -84,7 +83,6 @@ const useBackupTargetBrowser = () => {
 
   const onFileAction = useCallback(
     (data: ChonkyFileActionData) => {
-      console.log("target", data);
       switch (data.id) {
         case ChonkyActions.DeleteFiles.id:
           (() => {

diff --git a/frontend/src/pages/file.tsx b/frontend/src/pages/file.tsx
@@ -2,12 +2,13 @@ import { useState, useRef, useEffect, useMemo, useCallback } from "react";
 
 import Grid from "@mui/material/Grid";
 import Box from "@mui/material/Box";
-import { FullFileBrowser, FileBrowserProps, FileBrowserHandle, FileArray } from "@aperturerobotics/chonky";
-import { ChonkyActions, ChonkyFileActionData } from "@aperturerobotics/chonky";
+import { FileBrowser as ChonckFileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@samuelncui/chonky";
+import { ChonkyActions, ChonkyFileActionData } from "@samuelncui/chonky";
 
 import { cli, convertFiles } from "../api";
 import { Root } from "../api";
 import { RenameFileAction, RefreshListAction } from "../actions";
+import { ToobarInfo } from "../components/toolbarInfo";
 
 import { useDetailModal, DetailModal } from "./file-detail";
 import { FileGetReply } from "../entity";
@@ -152,6 +153,9 @@ const useFileBrowser = (storageKey: string, refreshAll: () => Promise<void>, ope
   );
 
   const fileActions = useMemo(() => [ChonkyActions.CreateFolder, ChonkyActions.DeleteFiles, ChonkyActions.MoveFiles, RenameFileAction, RefreshListAction], []);
+  const totalSize = useMemo(() => {
+    return files.reduce((total, file) => total + (file?.size ? file.size : 0), 0);
+  }, [files]);
 
   return {
     files,
@@ -160,6 +164,7 @@ const useFileBrowser = (storageKey: string, refreshAll: () => Promise<void>, ope
     fileActions,
     defaultFileViewActionId: ChonkyActions.EnableListView.id,
     doubleClickDelay: 300,
+    totalSize,
   };
 };
 
@@ -185,10 +190,24 @@ export const FileBrowser = () => {
     <Box className="browser-box">
       <Grid className="browser-container" container>
         <Grid className="browser" item xs={6}>
-          <FullFileBrowser instanceId="left" ref={instances.left} {...leftProps} />
+          <ChonckFileBrowser instanceId="left" ref={instances.left} {...leftProps}>
+            <FileNavbar />
+            <FileToolbar>
+              <ToobarInfo {...leftProps} />
+            </FileToolbar>
+            <FileList />
+            <FileContextMenu />
+          </ChonckFileBrowser>
         </Grid>
         <Grid className="browser" item xs={6}>
-          <FullFileBrowser instanceId="right" ref={instances.right} {...rightProps} />
+          <ChonckFileBrowser instanceId="right" ref={instances.right} {...rightProps}>
+            <FileNavbar />
+            <FileToolbar>
+              <ToobarInfo {...rightProps} />
+            </FileToolbar>
+            <FileList />
+            <FileContextMenu />
+          </ChonckFileBrowser>
         </Grid>
       </Grid>
       <DetailModal detail={detail} onClose={closeDetailModel} />

diff --git a/frontend/src/pages/restore.tsx b/frontend/src/pages/restore.tsx
@@ -2,22 +2,24 @@ import { useState, useEffect, useMemo, useCallback, FC, useRef, RefObject } from
 
 import Grid from "@mui/material/Grid";
 import Box from "@mui/material/Box";
-import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@aperturerobotics/chonky";
-import { ChonkyActions, ChonkyFileActionData, FileData } from "@aperturerobotics/chonky";
+import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@samuelncui/chonky";
+import { ChonkyActions, ChonkyFileActionData, FileData } from "@samuelncui/chonky";
+
+import { ToobarInfo } from "../components/toolbarInfo";
 
 import { cli, convertFiles } from "../api";
 import { Root } from "../api";
 import { AddFileAction, RefreshListAction, CreateRestoreJobAction } from "../actions";
 import { JobCreateRequest, JobRestoreParam, Source } from "../entity";
 
-const useRestoreSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
+const useRestoreSourceBrowser = (target: RefObject<FileBrowserHandle>) => {
   const [files, setFiles] = useState<FileArray>(Array(1).fill(null));
   const [folderChain, setFolderChan] = useState<FileArray>([Root]);
 
   const openFolder = useCallback(async (id: string) => {
     const [file, folderChain] = await Promise.all([cli.fileGet({ id: BigInt(id) }).response, cli.fileListParents({ id: BigInt(id) }).response]);
 
-    setFiles(convertFiles(file.children));
+    setFiles(convertFiles(file.children).map((file) => ({ ...file, droppable: false })));
     setFolderChan([Root, ...convertFiles(folderChain.parents)]);
   }, []);
   useEffect(() => {
@@ -26,7 +28,6 @@ const useRestoreSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
 
   const onFileAction = useCallback(
     (data: ChonkyFileActionData) => {
-      console.log("source", data);
       switch (data.id) {
         case ChonkyActions.OpenFiles.id:
           (async () => {
@@ -45,24 +46,31 @@ const useRestoreSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
 
           return;
         case ChonkyActions.EndDragNDrop.id:
-          (() => {
-            if (!source.current) {
+          (async () => {
+            if (!target.current) {
               return;
             }
 
             const base = folderChain
               .filter((file): file is FileData => !!file && file.id !== "0")
               .map((file) => file.name)
               .join("/");
-            source.current.requestFileAction(AddFileAction, {
-              ...data.payload,
-              selectedFiles: data.payload.selectedFiles.map((file) => ({ ...file, name: base + "/" + file.name })),
-            });
+
+            const selectedFiles = data.payload.selectedFiles.map((file) => ({
+              ...file,
+              name: base ? base + "/" + file.name : file.name,
+              openable: false,
+              draggable: false,
+            }));
+            await target.current.requestFileAction(AddFileAction, { ...data.payload, selectedFiles });
           })();
+
           return;
       }
+
+      console.log("source done", data);
     },
-    [openFolder, source, folderChain],
+    [openFolder, target, folderChain],
   );
 
   const fileActions = useMemo(() => [ChonkyActions.StartDragNDrop, RefreshListAction], []);
@@ -81,7 +89,7 @@ const useRestoreTargetBrowser = () => {
   const [files, setFiles] = useState<FileArray>(Array(0));
   const [folderChain, setFolderChan] = useState<FileArray>([
     {
-      id: "0",
+      id: "restore_waitlist",
       name: "Restore Waitlist",
       isDir: true,
       openable: true,
@@ -93,7 +101,6 @@ const useRestoreTargetBrowser = () => {
 
   const onFileAction = useCallback(
     (data: ChonkyFileActionData) => {
-      console.log("target", data);
       switch (data.id) {
         case ChonkyActions.DeleteFiles.id:
           (() => {
@@ -141,15 +148,19 @@ export const RestoreBrowser = () => {
         <Grid className="browser" item xs={6}>
           <FileBrowser {...sourceProps}>
             <FileNavbar />
-            <FileToolbar />
+            <FileToolbar>
+              <ToobarInfo {...sourceProps} />
+            </FileToolbar>
             <FileList />
             <FileContextMenu />
           </FileBrowser>
         </Grid>
         <Grid className="browser" item xs={6}>
           <FileBrowser {...targetProps} ref={target}>
             <FileNavbar />
-            <FileToolbar />
+            <FileToolbar>
+              <ToobarInfo {...targetProps} />
+            </FileToolbar>
             <FileList />
             <FileContextMenu />
           </FileBrowser>

diff --git a/frontend/src/pages/tapes.tsx b/frontend/src/pages/tapes.tsx
@@ -1,13 +1,12 @@
 import { useState, useEffect, useMemo, useCallback, FC, useRef, RefObject } from "react";
-import moment from "moment";
 
 import Grid from "@mui/material/Grid";
 import Box from "@mui/material/Box";
-import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@aperturerobotics/chonky";
-import { ChonkyActions, ChonkyFileActionData, FileData } from "@aperturerobotics/chonky";
+import { FileBrowser, FileNavbar, FileToolbar, FileList, FileContextMenu, FileArray, FileBrowserHandle } from "@samuelncui/chonky";
+import { ChonkyActions, ChonkyFileActionData, FileData } from "@samuelncui/chonky";
 
 import { cli, Root, convertTapes, convertPositions } from "../api";
-import { TapeListRequest, Source, Tape, Position } from "../entity";
+import { TrimLibraryAction } from "../actions";
 
 export const TapesType = "tapes";
 
@@ -49,7 +48,6 @@ const useTapesSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
 
       const reply = await cli.tapeGetPositions({ id: BigInt(tapeIDStr), directory: dir }).response;
       const files = convertPositions(reply.positions);
-      console.log("refresh jobs list, target= ", target, "tape_id= ", tapeIDStr, "dir= ", dir, "reply= ", reply, "files= ", files);
       setFiles(files);
 
       const targetFolderChain = [];
@@ -105,12 +103,22 @@ const useTapesSourceBrowser = (source: RefObject<FileBrowserHandle>) => {
             await openFolder(current);
           })();
           return;
+        case TrimLibraryAction.id:
+          (async () => {
+            if (!confirm(`Empty pointer in library will be trimed, may cause data loss. Are you sure?`)) {
+              return;
+            }
+
+            console.log(await cli.libraryTrim({ trimFile: true, trimPosition: true }).response);
+            alert("Trim Library Success!");
+          })();
+          return;
       }
     },
     [openFolder, source, folderChain],
   );
 
-  const fileActions = useMemo(() => [ChonkyActions.DeleteFiles], []);
+  const fileActions = useMemo(() => [ChonkyActions.DeleteFiles, TrimLibraryAction], []);
 
   return {
     files,