GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-10-04 22:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

finished transfers menu

Browse Source
This commit is contained in:
Eugene Pankov
2021-06-07 01:13:53 +02:00
parent 49369873cc
commit 57c7e48bea
18 changed files with 221 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
terminus-terminal/src/features/debug.ts
View File

@@ -1,16 +1,13 @@
import * as fs from 'fs'
import { Injectable } from '@angular/core'
import { TerminalDecorator } from '../api/decorator'
import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component'
import { ElectronService, HostAppService, PlatformService } from 'terminus-core'
import { PlatformService } from 'terminus-core'
/** @hidden */
@Injectable()
export class DebugDecorator extends TerminalDecorator {
constructor (
private electron: ElectronService,
private platform: PlatformService,
private hostApp: HostAppService,
) {
super()
}
@@ -63,28 +60,21 @@ export class DebugDecorator extends TerminalDecorator {
}
private async loadFile (): Promise<string|null> {
const result = await this.electron.dialog.showOpenDialog(
this.hostApp.getWindow(),
{
buttonLabel: 'Load',
properties: ['openFile', 'treatPackageAsDirectory'],
},
)
if (result.filePaths.length) {
return fs.readFileSync(result.filePaths[0], { encoding: 'utf-8' })
const transfer = await this.platform.startUpload()
if (!transfer.length) {
return null
}
return null
const data = await transfer[0].readAll()
transfer[0].close()
return data.toString()
}
private async saveFile (content: string, name: string) {
const result = await this.electron.dialog.showSaveDialog(
this.hostApp.getWindow(),
{
defaultPath: name,
},
)
if (result.filePath) {
fs.writeFileSync(result.filePath, content)
const data = Buffer.from(content)
const transfer = await this.platform.startDownload(name, data.length)
if (transfer) {
transfer.write(data)
transfer.close()
}
}

34
terminus-terminal/src/features/zmodem.ts
View File

@@ -1,12 +1,11 @@
import colors from 'ansi-colors'
import * as ZModem from 'zmodem.js'
import * as fs from 'fs'
import { Observable } from 'rxjs'
import { filter } from 'rxjs/operators'
import { filter, first } from 'rxjs/operators'
import { Injectable } from '@angular/core'
import { TerminalDecorator } from '../api/decorator'
import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component'
import { LogService, Logger, ElectronService, HostAppService, HotkeysService, PlatformService, FileUpload } from 'terminus-core'
import { LogService, Logger, HotkeysService, PlatformService, FileUpload } from 'terminus-core'
const SPACER = ' '
@@ -20,8 +19,6 @@ export class ZModemDecorator extends TerminalDecorator {
constructor (
log: LogService,
hotkeys: HotkeysService,
private electron: ElectronService,
private hostApp: HostAppService,
private platform: PlatformService,
) {
super()
@@ -87,7 +84,7 @@ export class ZModemDecorator extends TerminalDecorator {
this.logger.info('new session', zsession)
if (zsession.type === 'send') {
const transfers = await this.platform.startUpload()
const transfers = await this.platform.startUpload({ multiple: true })
let filesRemaining = transfers.length
let sizeRemaining = transfers.reduce((a, b) => a + b.getSize(), 0)
for (const transfer of transfers) {
@@ -116,20 +113,14 @@ export class ZModemDecorator extends TerminalDecorator {
} = xfer.get_details()
this.showMessage(terminal, colors.bgYellow.black(' Offered ') + ' ' + details.name, true)
this.logger.info('offered', xfer)
const result = await this.electron.dialog.showSaveDialog(
this.hostApp.getWindow(),
{
defaultPath: details.name,
},
)
if (!result.filePath) {
const transfer = await this.platform.startDownload(details.name, details.size)
if (!transfer) {
this.showMessage(terminal, colors.bgRed.black(' Rejected ') + ' ' + details.name)
xfer.skip()
return
}
const stream = fs.createWriteStream(result.filePath)
let bytesSent = 0
let canceled = false
const cancelSubscription = this.cancelEvent.subscribe(() => {
if (terminal.hasFocus) {
@@ -147,18 +138,19 @@ export class ZModemDecorator extends TerminalDecorator {
if (canceled) {
return
}
stream.write(Buffer.from(chunk))
bytesSent += chunk.length
this.showMessage(terminal, colors.bgYellow.black(' ' + Math.round(100 * bytesSent / details.size).toString().padStart(3, ' ') + '% ') + ' ' + details.name, true)
transfer.write(Buffer.from(chunk))
this.showMessage(terminal, colors.bgYellow.black(' ' + Math.round(100 * transfer.getCompletedBytes() / details.size).toString().padStart(3, ' ') + '% ') + ' ' + details.name, true)
},
}),
this.cancelEvent.toPromise(),
this.cancelEvent.pipe(first()).toPromise(),
])
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (canceled) {
transfer.cancel()
this.showMessage(terminal, colors.bgRed.black(' Canceled ') + ' ' + details.name)
} else {
transfer.close()
this.showMessage(terminal, colors.bgGreen.black(' Received ') + ' ' + details.name)
}
} catch {
@@ -166,7 +158,6 @@ export class ZModemDecorator extends TerminalDecorator {
}
cancelSubscription.unsubscribe()
stream.end()
}
private async sendFile (terminal, zsession, transfer: FileUpload, filesRemaining, sizeRemaining) {
@@ -191,6 +182,7 @@ export class ZModemDecorator extends TerminalDecorator {
while (true) {
const chunk = await transfer.read()
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (canceled || !chunk.length) {
break
}
@@ -199,6 +191,7 @@ export class ZModemDecorator extends TerminalDecorator {
this.showMessage(terminal, colors.bgYellow.black(' ' + Math.round(100 * transfer.getCompletedBytes() / offer.size).toString().padStart(3, ' ') + '% ') + offer.name, true)
}
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (canceled) {
transfer.cancel()
} else {
@@ -216,6 +209,7 @@ export class ZModemDecorator extends TerminalDecorator {
cancelSubscription.unsubscribe()
} else {
transfer.cancel()
this.showMessage(terminal, colors.bgRed.black(' Rejected ') + ' ' + offer.name)
this.logger.warn('rejected by the other side')
}