mirror of
https://github.com/Eugeny/tabby.git
synced 2025-09-21 23:56:04 +00:00
SFTP folder downloads (#10586)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import * as C from 'constants'
|
||||
import { posix as path } from 'path'
|
||||
import { Component, Input, Output, EventEmitter, Inject, Optional } from '@angular/core'
|
||||
import { FileUpload, DirectoryUpload, MenuItemOptions, NotificationsService, PlatformService } from 'tabby-core'
|
||||
import { FileUpload, DirectoryUpload, DirectoryDownload, MenuItemOptions, NotificationsService, PlatformService } from 'tabby-core'
|
||||
import { SFTPSession, SFTPFile } from '../session/sftp'
|
||||
import { SSHSession } from '../session/ssh'
|
||||
import { SFTPContextMenuItemProvider } from '../api'
|
||||
@@ -220,6 +220,68 @@ export class SFTPPanelComponent {
|
||||
this.sftp.download(itemPath, transfer)
|
||||
}
|
||||
|
||||
async downloadFolder (folder: SFTPFile): Promise<void> {
|
||||
try {
|
||||
const transfer = await this.platform.startDownloadDirectory(folder.name, 0)
|
||||
if (!transfer) {
|
||||
return
|
||||
}
|
||||
|
||||
// Start background size calculation and download simultaneously
|
||||
const sizeCalculationPromise = this.calculateFolderSizeAndUpdate(folder, transfer)
|
||||
const downloadPromise = this.downloadFolderRecursive(folder, transfer, '')
|
||||
|
||||
try {
|
||||
await Promise.all([sizeCalculationPromise, downloadPromise])
|
||||
transfer.setStatus('')
|
||||
transfer.setCompleted(true)
|
||||
} catch (error) {
|
||||
transfer.cancel()
|
||||
throw error
|
||||
} finally {
|
||||
transfer.close()
|
||||
}
|
||||
} catch (error) {
|
||||
this.notifications.error(`Failed to download folder: ${error.message}`)
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
private async calculateFolderSizeAndUpdate (folder: SFTPFile, transfer: DirectoryDownload) {
|
||||
let totalSize = 0
|
||||
const items = await this.sftp.readdir(folder.fullPath)
|
||||
for (const item of items) {
|
||||
if (item.isDirectory) {
|
||||
totalSize += await this.calculateFolderSizeAndUpdate(item, transfer)
|
||||
} else {
|
||||
totalSize += item.size
|
||||
}
|
||||
transfer.setTotalSize(totalSize)
|
||||
}
|
||||
return totalSize
|
||||
}
|
||||
|
||||
private async downloadFolderRecursive (folder: SFTPFile, transfer: DirectoryDownload, relativePath: string): Promise<void> {
|
||||
const items = await this.sftp.readdir(folder.fullPath)
|
||||
|
||||
for (const item of items) {
|
||||
if (transfer.isCancelled()) {
|
||||
throw new Error('Download cancelled')
|
||||
}
|
||||
|
||||
const itemRelativePath = relativePath ? `${relativePath}/${item.name}` : item.name
|
||||
|
||||
transfer.setStatus(itemRelativePath)
|
||||
if (item.isDirectory) {
|
||||
await transfer.createDirectory(itemRelativePath)
|
||||
await this.downloadFolderRecursive(item, transfer, itemRelativePath)
|
||||
} else {
|
||||
const fileDownload = await transfer.createFile(itemRelativePath, item.mode, item.size)
|
||||
await this.sftp.download(item.fullPath, fileDownload)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getModeString (item: SFTPFile): string {
|
||||
const s = 'SGdrwxrwxrwx'
|
||||
const e = ' ---------'
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import { Injectable } from '@angular/core'
|
||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
|
||||
import { MenuItemOptions, PlatformService, TranslateService } from 'tabby-core'
|
||||
import { MenuItemOptions, PlatformService, TranslateService, HostAppService, Platform } from 'tabby-core'
|
||||
import { SFTPSession, SFTPFile } from './session/sftp'
|
||||
import { SFTPContextMenuItemProvider } from './api'
|
||||
import { SFTPDeleteModalComponent } from './components/sftpDeleteModal.component'
|
||||
@@ -16,37 +16,49 @@ export class CommonSFTPContextMenu extends SFTPContextMenuItemProvider {
|
||||
private platform: PlatformService,
|
||||
private ngbModal: NgbModal,
|
||||
private translate: TranslateService,
|
||||
private hostApp: HostAppService,
|
||||
) {
|
||||
super()
|
||||
}
|
||||
|
||||
async getItems (item: SFTPFile, panel: SFTPPanelComponent): Promise<MenuItemOptions[]> {
|
||||
return [
|
||||
const items: MenuItemOptions[] = [
|
||||
{
|
||||
click: async () => {
|
||||
await panel.openCreateDirectoryModal()
|
||||
},
|
||||
label: this.translate.instant('Create directory'),
|
||||
},
|
||||
{
|
||||
click: async () => {
|
||||
if ((await this.platform.showMessageBox({
|
||||
type: 'warning',
|
||||
message: this.translate.instant('Delete {fullPath}?', item),
|
||||
defaultId: 0,
|
||||
cancelId: 1,
|
||||
buttons: [
|
||||
this.translate.instant('Delete'),
|
||||
this.translate.instant('Cancel'),
|
||||
],
|
||||
})).response === 0) {
|
||||
await this.deleteItem(item, panel.sftp)
|
||||
panel.navigate(panel.path)
|
||||
}
|
||||
},
|
||||
label: this.translate.instant('Delete'),
|
||||
},
|
||||
]
|
||||
|
||||
// Add download folder option for directories (only in electron)
|
||||
if (item.isDirectory && this.hostApp.platform !== Platform.Web) {
|
||||
items.push({
|
||||
click: () => panel.downloadFolder(item),
|
||||
label: this.translate.instant('Download directory'),
|
||||
})
|
||||
}
|
||||
|
||||
items.push({
|
||||
click: async () => {
|
||||
if ((await this.platform.showMessageBox({
|
||||
type: 'warning',
|
||||
message: this.translate.instant('Delete {fullPath}?', item),
|
||||
defaultId: 0,
|
||||
cancelId: 1,
|
||||
buttons: [
|
||||
this.translate.instant('Delete'),
|
||||
this.translate.instant('Cancel'),
|
||||
],
|
||||
})).response === 0) {
|
||||
await this.deleteItem(item, panel.sftp)
|
||||
panel.navigate(panel.path)
|
||||
}
|
||||
},
|
||||
label: this.translate.instant('Delete'),
|
||||
})
|
||||
|
||||
return items
|
||||
}
|
||||
|
||||
async deleteItem (item: SFTPFile, session: SFTPSession): Promise<void> {
|
||||
|
Reference in New Issue
Block a user