Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow files in directories to be downloaded onto local machine #2199

Merged
merged 15 commits into from
May 21, 2024
Merged

fix: allow files in directories to be downloaded onto local machine #2199

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2c2dcc6
fix: allow files in nested folders to be downloaded onto local machine
hochoy May 18, 2023
4cfce7f
fix: revert removal of options.prefix check
hochoy May 28, 2023
dff1e50
test: file.download should create directory paths recursively
hochoy May 29, 2023
e7039e1
fix: move the filtering of directory objects from TransferManager.dow…
hochoy May 29, 2023
0218cdb
fix: handle windows path
hochoy May 30, 2023
f34b30f
chore: remove temporary comments
hochoy Jun 3, 2023
41fa9cb
test: add scenarios where destination is set in Transfer Manager
hochoy Jun 3, 2023
44aa7e0
chore: remove console.warn
hochoy Jun 3, 2023
4030043
Merge branch 'main' into hochoy/main
vishwarajanand May 6, 2024
da9f4f3
fix: merge with main
vishwarajanand May 6, 2024
6bb1841
fix: added transfer manager tests for prefix
vishwarajanand May 8, 2024
303f3fb
fix: address PR comments
vishwarajanand May 15, 2024
63cfceb
fix: paths for windows ci
vishwarajanand May 15, 2024
d886548
fix: migrate mkdirsync to await fs/promises/mkdir
vishwarajanand May 18, 2024
a9419a5
fix: var name
vishwarajanand May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import * as resumableUpload from './resumable-upload';
import {Writable, Readable, pipeline, Transform, PassThrough} from 'stream';
import * as zlib from 'zlib';
import * as http from 'http';
import * as path from 'path';

import {
ExceptionMessages,
Expand Down Expand Up @@ -2098,6 +2099,8 @@ class File extends ServiceObject<File> {
const fileStream = this.createReadStream(options);
let receivedData = false;
if (destination) {
fs.mkdirSync(path.dirname(destination), {recursive: true});
hochoy marked this conversation as resolved.
Show resolved Hide resolved
hochoy marked this conversation as resolved.
Show resolved Hide resolved

fileStream
.on('error', callback)
.once('data', data => {
Expand Down
3 changes: 3 additions & 0 deletions src/transfer-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ export class TransferManager {
prefix: filesOrFolder,
});
files = directoryFiles[0];
// filter out directories
files = files.filter(file => !file.name.endsWith('/'));
} else {
files = filesOrFolder.map(curFile => {
if (typeof curFile === 'string') {
Expand All @@ -258,6 +260,7 @@ export class TransferManager {
{},
options.passthroughOptions
);

if (options.prefix) {
passThroughOptionsCopy.destination = path.join(
options.prefix || '',
Expand Down