whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: Extract file drop handling logic to separate utility function

Browse Source
This commit is contained in:
kangfenmao 2025-02-25 19:53:04 +08:00
parent aec14567ee
commit a047048f69
2 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/renderer/src/pages/home/Inputbar/Inputbar.tsx
View File

@ -27,11 +27,12 @@ import { setGenerating, setSearching } from '@renderer/store/runtime'
import { Assistant, FileType, KnowledgeBase, Message, Model, Topic } from '@renderer/types'
import { classNames, delay, getFileExtension, uuid } from '@renderer/utils'
import { abortCompletion } from '@renderer/utils/abortController'
import { getFilesFromDropEvent } from '@renderer/utils/input'
import { documentExts, imageExts, textExts } from '@shared/config/constant'
import { Button, Popconfirm, Tooltip } from 'antd'
import TextArea, { TextAreaRef } from 'antd/es/input/TextArea'
import dayjs from 'dayjs'
import Logger from 'electron-log'
import Logger from 'electron-log/renderer'
import { debounce, isEmpty } from 'lodash'
import React, { CSSProperties, FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@ -391,56 +392,11 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic }) => {
e.stopPropagation()
}
const filesFromDropEvent = async (e: React.DragEvent<HTMLDivElement>): Promise<FileType[]> => {
if (e.dataTransfer.files.length > 0) {
const results = await Promise.allSettled([...e.dataTransfer.files].map((file) => window.api.file.get(file.path)))
const list: FileType[] = []
for (const result of results) {
if (result.status === 'fulfilled') {
if (result.value !== null) {
list.push(result.value)
}
} else {
Logger.error('[src/renderer/src/pages/home/Inputbar/Inputbar.tsx] filesFromDropEvent:', result.reason)
}
}
return list
} else {
return new Promise((resolve) => {
let existCodefilesFormat = false
for (const item of e.dataTransfer.items) {
const { type } = item
if (type === 'codefiles') {
item.getAsString(async (filePathListString) => {
const filePathList: string[] = JSON.parse(filePathListString)
const filePathListPromises = filePathList.map((filePath) => window.api.file.get(filePath))
resolve(
await Promise.allSettled(filePathListPromises).then((results) =>
results
.filter((result) => result.status === 'fulfilled')
.filter((result) => result.value !== null)
.map((result) => result.value!)
)
)
})
existCodefilesFormat = true
break
}
}
if (!existCodefilesFormat) {
resolve([])
}
})
}
}
const handleDrop = async (e: React.DragEvent<HTMLDivElement>) => {
e.preventDefault()
e.stopPropagation()
const files = await filesFromDropEvent(e).catch((err) => {
const files = await getFilesFromDropEvent(e).catch((err) => {
Logger.error('[src/renderer/src/pages/home/Inputbar/Inputbar.tsx] handleDrop:', err)
return null
})

47
src/renderer/src/utils/input.ts Normal file
View File

@ -0,0 +1,47 @@
import { FileType } from '@renderer/types'
import Logger from 'electron-log/renderer'
export const getFilesFromDropEvent = async (e: React.DragEvent<HTMLDivElement>): Promise<FileType[]> => {
if (e.dataTransfer.files.length > 0) {
const results = await Promise.allSettled([...e.dataTransfer.files].map((file) => window.api.file.get(file.path)))
const list: FileType[] = []
for (const result of results) {
if (result.status === 'fulfilled') {
if (result.value !== null) {
list.push(result.value)
}
} else {
Logger.error('[src/renderer/src/utils/input.ts] getFilesFromDropEvent:', result.reason)
}
}
return list
} else {
return new Promise((resolve) => {
let existCodefilesFormat = false
for (const item of e.dataTransfer.items) {
const { type } = item
if (type === 'codefiles') {
item.getAsString(async (filePathListString) => {
const filePathList: string[] = JSON.parse(filePathListString)
const filePathListPromises = filePathList.map((filePath) => window.api.file.get(filePath))
resolve(
await Promise.allSettled(filePathListPromises).then((results) =>
results
.filter((result) => result.status === 'fulfilled')
.filter((result) => result.value !== null)
.map((result) => result.value!)
)
)
})
existCodefilesFormat = true
break
}
}
if (!existCodefilesFormat) {
resolve([])
}
})
}
}