feat: Add download progress to sidebar (#1490)

* feat: Add download progress to sidebar

* Removing console log

* Lint fixes

* Updating UI

* Fixing lint error

* Fixing lint error

* Fixing lint error

* PR comments

* Reverting change

---------

Co-authored-by: Oto Ciulis <oto.ciulis@gmail.com>
This commit is contained in:
oto-ciulis-tt
2024-11-12 13:28:55 -08:00
committed by GitHub
parent 1a8900de1f
commit e3d2c3a814
6 changed files with 226 additions and 51 deletions

View File

@@ -28,6 +28,16 @@
/>
</template>
<template #body>
<div class="mx-6 mb-4" v-if="downloads.length > 0">
<div class="text-lg my-4">
{{ t('electronFileDownload.inProgress') }}
</div>
<template v-for="download in downloads" :key="download.url">
<DownloadItem :download="download" />
</template>
</div>
<TreeExplorer
class="model-lib-tree-explorer py-0"
:roots="renderedRoot.children"
@@ -48,6 +58,7 @@ import SearchBox from '@/components/common/SearchBox.vue'
import TreeExplorer from '@/components/common/TreeExplorer.vue'
import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
import DownloadItem from '@/components/sidebar/tabs/modelLibrary/DownloadItem.vue'
import {
ComfyModelDef,
ModelFolder,
@@ -65,12 +76,19 @@ import { computed, ref, watch, toRef, onMounted, nextTick } from 'vue'
import type { TreeNode } from 'primevue/treenode'
import { app } from '@/scripts/app'
import { buildTree } from '@/utils/treeUtil'
import { useI18n } from 'vue-i18n'
import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
import { storeToRefs } from 'pinia'
const modelStore = useModelStore()
const modelToNodeStore = useModelToNodeStore()
const settingStore = useSettingStore()
const searchQuery = ref<string>('')
const expandedKeys = ref<Record<string, boolean>>({})
const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
const { t } = useI18n()
const electronDownloadStore = useElectronDownloadStore()
const { downloads } = storeToRefs(electronDownloadStore)
const filteredModels = ref<ComfyModelDef[]>([])
const handleSearch = async (query: string) => {
@@ -164,6 +182,7 @@ const renderedRoot = computed<TreeExplorerNode<ModelOrFolder>>(() => {
}
}
}
return fillNodeInfo(root.value)
})

View File

@@ -0,0 +1,97 @@
<template>
<div class="flex flex-col">
<div>
{{ getDownloadLabel(download.savePath) }}
</div>
<div v-if="['cancelled', 'error'].includes(download.status)">
<Chip
class="h-6 text-sm font-light bg-red-700 mt-2"
removable
@remove="handleRemoveDownload"
>
{{ t('electronFileDownload.cancelled') }}
</Chip>
</div>
<div
class="mt-2 flex flex-row items-center gap-2"
v-if="['in_progress', 'paused', 'completed'].includes(download.status)"
>
<ProgressBar
class="flex-1"
:value="Number((download.progress * 100).toFixed(1))"
/>
<Button
class="file-action-button w-[22px] h-[22px]"
size="small"
rounded
@click="triggerPauseDownload"
v-if="download.status === 'in_progress'"
icon="pi pi-pause"
v-tooltip.top="t('electronFileDownload.pause')"
/>
<Button
class="file-action-button w-[22px] h-[22px]"
size="small"
rounded
@click="triggerResumeDownload"
v-if="download.status === 'paused'"
icon="pi pi-play"
v-tooltip.top="t('electronFileDownload.resume')"
/>
<Button
class="file-action-button w-[22px] h-[22px] p-red"
size="small"
rounded
severity="danger"
@click="triggerCancelDownload"
v-if="['in_progress', 'paused'].includes(download.status)"
icon="pi pi-times-circle"
v-tooltip.top="t('electronFileDownload.cancel')"
/>
</div>
</div>
</template>
<script setup lang="ts">
import Button from 'primevue/button'
import ProgressBar from 'primevue/progressbar'
import Chip from 'primevue/chip'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
import {
type ElectronDownload,
useElectronDownloadStore
} from '@/stores/electronDownloadStore'
const electronDownloadStore = useElectronDownloadStore()
const props = defineProps<{
download: ElectronDownload
}>()
const getDownloadLabel = (savePath: string, filename: string) => {
let parts = (savePath ?? '').split('/')
parts = parts.length === 1 ? parts[0].split('\\') : parts
const name = parts.pop()
const dir = parts.pop()
return `${dir}/${name}`
}
const triggerCancelDownload = () =>
electronDownloadStore.cancel(props.download.url)
const triggerPauseDownload = () =>
electronDownloadStore.pause(props.download.url)
const triggerResumeDownload = () =>
electronDownloadStore.resume(props.download.url)
const handleRemoveDownload = () => {
electronDownloadStore.$patch((state) => {
state.downloads = state.downloads.filter(
({ url }) => url !== props.download.url
)
state.hasChanged = true
})
}
</script>