Fixed process not cleared after download.

Closes #160
marcopeocchi · Jun 21, 2024 · 0daf367 · 0daf367
1 parent 38683bf
commit 0daf367
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/frontend/src/components/DownloadsGridView.tsx b/frontend/src/components/DownloadsGridView.tsx
@@ -4,6 +4,7 @@ import { activeDownloadsState } from '../atoms/downloads'
 import { useToast } from '../hooks/toast'
 import { useI18n } from '../hooks/useI18n'
 import { useRPC } from '../hooks/useRPC'
+import { ProcessStatus, RPCResult } from '../types'
 import DownloadCard from './DownloadCard'
 
 const DownloadsGridView: React.FC = () => {
@@ -13,14 +14,18 @@ const DownloadsGridView: React.FC = () => {
   const { client } = useRPC()
   const { pushMessage } = useToast()
 
+  const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.Completed
+    ? client.clear(r.id)
+    : client.kill(r.id)
+
   return (
     <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12, xl: 12 }} pt={2}>
       {
         downloads.map(download => (
           <Grid item xs={4} sm={8} md={6} xl={4} key={download.id}>
             <DownloadCard
               download={download}
-              onStop={() => client.kill(download.id)}
+              onStop={() => stop(download)}
               onCopy={() => pushMessage(i18n.t('clipboardAction'), 'info')}
             />
           </Grid>

diff --git a/frontend/src/components/DownloadsTableView.tsx b/frontend/src/components/DownloadsTableView.tsx
@@ -24,7 +24,7 @@ import { useRecoilValue } from 'recoil'
 import { activeDownloadsState } from '../atoms/downloads'
 import { serverURL } from '../atoms/settings'
 import { useRPC } from '../hooks/useRPC'
-import { RPCResult } from '../types'
+import { ProcessStatus, RPCResult } from '../types'
 import { base64URLEncode, formatSize, formatSpeedMiB } from "../utils"
 
 const columns = [
@@ -133,6 +133,11 @@ const DownloadsTableView: React.FC = () => {
     window.open(`${serverAddr}/archive/d/${encoded}?token=${localStorage.getItem('token')}`)
   }
 
+  const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.Completed
+    ? client.clear(r.id)
+    : client.kill(r.id)
+
+
   function rowContent(_index: number, download: RPCResult) {
     return (
       <>
@@ -168,7 +173,7 @@ const DownloadsTableView: React.FC = () => {
           <ButtonGroup>
             <IconButton
               size="small"
-              onClick={() => client.kill(download.id)}
+              onClick={() => stop(download)}
             >
               {download.progress.percentage === '-1' ? <DeleteIcon /> : <StopCircleIcon />}
 

diff --git a/frontend/src/lib/rpcClient.ts b/frontend/src/lib/rpcClient.ts
@@ -132,6 +132,13 @@ export class RPCClient {
     })
   }
 
+  public clear(id: string) {
+    this.sendHTTP({
+      method: 'Service.Clear',
+      params: [id],
+    })
+  }
+
   public killAll() {
     this.sendHTTP({
       method: 'Service.KillAll',

diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
@@ -34,11 +34,18 @@ type DownloadInfo = {
   created_at: string
 }
 
+export enum ProcessStatus {
+  Pending = 0,
+  Downloading,
+  Completed,
+  Errored,
+}
+
 type DownloadProgress = {
   speed: number
   eta: number
   percentage: string
-  process_status: number
+  process_status: ProcessStatus
 }
 
 export type RPCResult = Readonly<{

diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
@@ -1,5 +1,6 @@
 import { pipe } from 'fp-ts/lib/function'
 import type { RPCResponse } from "./types"
+import { ProcessStatus } from './types'
 
 export function validateIP(ipAddr: string): boolean {
   let ipRegex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/gm
@@ -53,15 +54,15 @@ export function isRPCResponse(object: any): object is RPCResponse<any> {
   return 'result' in object && 'id' in object
 }
 
-export function mapProcessStatus(status: number) {
+export function mapProcessStatus(status: ProcessStatus) {
   switch (status) {
-    case 0:
+    case ProcessStatus.Pending:
       return 'Pending'
-    case 1:
+    case ProcessStatus.Downloading:
       return 'Downloading'
-    case 2:
+    case ProcessStatus.Completed:
       return 'Completed'
-    case 3:
+    case ProcessStatus.Errored:
       return 'Error'
     default:
       return 'Pending'

diff --git a/server/rpc/service.go b/server/rpc/service.go
@@ -105,7 +105,7 @@ func (s *Service) Kill(args string, killed *string) error {
 	}
 
 	if err := proc.Kill(); err != nil {
-		s.logger.Info("failed killing process", slog.String("id", proc.Id))
+		s.logger.Info("failed killing process", slog.String("id", proc.Id), slog.Any("err", err))
 		return err
 	}