Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-12-12 22:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

preserve file modes for up- and downloads - fixes #4141

Browse source
This commit is contained in:
Eugene Pankov 2021-07-10 20:39:45 +02:00
parent 3e61630c6a
commit 0008b2f022
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
6 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tabby-core/src/api/platform.ts
View file

@ -21,6 +21,7 @@ export interface MessageBoxResult {
export abstract class FileTransfer {
abstract getName (): string
abstract getMode (): number
abstract getSize (): number
abstract close (): void
@ -95,7 +96,7 @@ export abstract class PlatformService {
abstract loadConfig (): Promise<string>
abstract saveConfig (content: string): Promise<void>
abstract startDownload (name: string, size: number): Promise<FileDownload|null>
abstract startDownload (name: string, mode: number, size: number): Promise<FileDownload|null>
abstract startUpload (options?: FileUploadOptions): Promise<FileUpload[]>
startUploadFromDragEvent (event: DragEvent, multiple = false): FileUpload[] {
@ -188,6 +189,10 @@ export class HTMLFileUpload extends FileUpload {
return this.file.name
}
getMode (): number {
return 0o644
}
getSize (): number {
return this.file.size
}

20
tabby-electron/src/services/platform.service.ts
View file

@ -205,7 +205,7 @@ export class ElectronPlatformService extends PlatformService {
}))
}
async startDownload (name: string, size: number): Promise<FileDownload|null> {
async startDownload (name: string, mode: number, size: number): Promise<FileDownload|null> {
const result = await this.electron.dialog.showSaveDialog(
this.hostWindow.getWindow(),
{
@ -215,7 +215,7 @@ export class ElectronPlatformService extends PlatformService {
if (!result.filePath) {
return null
}
const transfer = new ElectronFileDownload(result.filePath, size)
const transfer = new ElectronFileDownload(result.filePath, mode, size)
await wrapPromise(this.zone, transfer.open())
this.fileTransferStarted.next(transfer)
return transfer
@ -230,6 +230,7 @@ export class ElectronPlatformService extends PlatformService {
class ElectronFileUpload extends FileUpload {
private size: number
private mode: number
private file: fs.FileHandle
private buffer: Buffer
@ -239,7 +240,9 @@ class ElectronFileUpload extends FileUpload {
}
async open (): Promise<void> {
this.size = (await fs.stat(this.filePath)).size
const stat = await fs.stat(this.filePath)
this.size = stat.size
this.mode = stat.mode
this.file = await fs.open(this.filePath, 'r')
}
@ -247,6 +250,10 @@ class ElectronFileUpload extends FileUpload {
return path.basename(this.filePath)
}
getMode (): number {
return this.mode
}
getSize (): number {
return this.size
}
@ -267,19 +274,24 @@ class ElectronFileDownload extends FileDownload {
constructor (
private filePath: string,
private mode: number,
private size: number,
) {
super()
}
async open (): Promise<void> {
this.file = await fs.open(this.filePath, 'w')
this.file = await fs.open(this.filePath, 'w', this.mode)
}
getName (): string {
return path.basename(this.filePath)
}
getMode (): number {
return this.mode
}
getSize (): number {
return this.size
}

8
tabby-ssh/src/components/sftpPanel.component.ts
View file

@ -82,10 +82,10 @@ export class SFTPPanelComponent {
if (stat.isDirectory) {
await this.navigate(item.fullPath)
} else {
await this.download(item.fullPath, stat.size)
await this.download(item.fullPath, stat.mode, stat.size)
}
} else {
await this.download(item.fullPath, item.size)
await this.download(item.fullPath, item.mode, item.size)
}
}
@ -117,8 +117,8 @@ export class SFTPPanelComponent {
}
}
async download (itemPath: string, size: number): Promise<void> {
const transfer = await this.platform.startDownload(path.basename(itemPath), size)
async download (itemPath: string, mode: number, size: number): Promise<void> {
const transfer = await this.platform.startDownload(path.basename(itemPath), mode, size)
if (!transfer) {
return
}

2
tabby-terminal/src/features/debug.ts
View file

@ -71,7 +71,7 @@ export class DebugDecorator extends TerminalDecorator {
private async saveFile (content: string, name: string) {
const data = Buffer.from(content)
const transfer = await this.platform.startDownload(name, data.length)
const transfer = await this.platform.startDownload(name, 0o644, data.length)
if (transfer) {
transfer.write(data)
transfer.close()

2
tabby-terminal/src/features/zmodem.ts
View file

@ -113,7 +113,7 @@ export class ZModemDecorator extends TerminalDecorator {
this.showMessage(terminal, colors.bgYellow.black(' Offered ') + ' ' + details.name, true)
this.logger.info('offered', xfer)
const transfer = await this.platform.startDownload(details.name, details.size)
const transfer = await this.platform.startDownload(details.name, 0o644, details.size)
if (!transfer) {
this.showMessage(terminal, colors.bgRed.black(' Rejected ') + ' ' + details.name)
xfer.skip()

9
tabby-web/src/platform.ts
View file

@ -108,8 +108,8 @@ export class WebPlatformService extends PlatformService {
window.close()
}
async startDownload (name: string, size: number): Promise<FileDownload|null> {
const transfer = new HTMLFileDownload(name, size)
async startDownload (name: string, mode: number, size: number): Promise<FileDownload|null> {
const transfer = new HTMLFileDownload(name, mode, size)
this.fileTransferStarted.next(transfer)
return transfer
}
@ -145,6 +145,7 @@ class HTMLFileDownload extends FileDownload {
constructor (
private name: string,
private mode: number,
private size: number,
) {
super()
@ -154,6 +155,10 @@ class HTMLFileDownload extends FileDownload {
return this.name
}
getMode (): number {
return this.mode
}
getSize (): number {
return this.size
}