Skip to content

Commit 0f547c7

Browse files
chrisgorgorysteboe
authored andcommitted
adding tar mode
1 parent 2df738d commit 0f547c7

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ optional arguments:
314314
-u, --public Create publicly (default is private)
315315
-q, --quiet Suppress printing information about the upload/download progress
316316
-t, --keep-tabular Do not convert tabular files to CSV (default is to convert)
317-
-r {skip,zip}, --dir-mode {skip,zip}
318-
What to do with directories: "skip" - ignore; "zip" - compress and upload
317+
-r {skip,zip,tar}, --dir-mode {skip,zip,tar}
318+
What to do with directories: "skip" - ignore; "zip" - compressed upload; "tar" - uncompressed upload
319319
```
320320

321321
Example:
@@ -338,8 +338,8 @@ optional arguments:
338338
Folder for upload, containing data files and a special dataset-metadata.json file (https://github.com/Kaggle/kaggle-api/wiki/Dataset-Metadata). Defaults to current working directory
339339
-q, --quiet Suppress printing information about the upload/download progress
340340
-t, --keep-tabular Do not convert tabular files to CSV (default is to convert)
341-
-r {skip,zip}, --dir-mode {skip,zip}
342-
What to do with directories: "skip" - ignore; "zip" - compress and upload
341+
-r {skip,zip,tar}, --dir-mode {skip,zip,tar}
342+
What to do with directories: "skip" - ignore; "zip" - compressed upload; "tar" - uncompressed upload
343343
-d, --delete-old-versions
344344
Delete old versions of this dataset
345345
```

kaggle/api/kaggle_api_extended.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,12 +2242,12 @@ def upload_files(self, request, resources, folder, quiet=False, dir_mode='skip')
22422242
if exitcode:
22432243
return
22442244
elif os.path.isdir(full_path):
2245-
if dir_mode == 'zip':
2245+
if dir_mode in ['zip', 'tar']:
22462246
temp_dir = tempfile.mkdtemp()
22472247
try:
22482248
_, dir_name = os.path.split(full_path)
2249-
archive_path = shutil.make_archive(os.path.join(temp_dir, dir_name), "zip",
2250-
full_path)
2249+
archive_path = shutil.make_archive(os.path.join(temp_dir, dir_name),
2250+
dir_mode, full_path)
22512251
_, archive_name = os.path.split(archive_path)
22522252
exitcode = self._upload_file(archive_name, archive_path, quiet, request,
22532253
resources)
@@ -2256,8 +2256,7 @@ def upload_files(self, request, resources, folder, quiet=False, dir_mode='skip')
22562256
if exitcode:
22572257
return
22582258
elif not quiet:
2259-
print("Skipping folder: " + file_name + "; use '--dir-mode zip' to upload "
2260-
"folders")
2259+
print("Skipping folder: " + file_name + "; use '--dir-mode' to upload folders")
22612260
else:
22622261
if not quiet:
22632262
print('Skipping: ' + file_name)

kaggle/cli.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ def parse_datasets(subparsers):
503503
'-r',
504504
'--dir-mode',
505505
dest='dir_mode',
506-
choices=['skip', 'zip'],
506+
choices=['skip', 'zip', 'tar'],
507507
default='skip',
508508
help=Help.param_dir_mode)
509509
parser_datasets_create._action_groups.append(
@@ -547,7 +547,7 @@ def parse_datasets(subparsers):
547547
'-r',
548548
'--dir-mode',
549549
dest='dir_mode',
550-
choices=['skip', 'zip'],
550+
choices=['skip', 'zip', 'tar'],
551551
default='skip',
552552
help=Help.param_dir_mode)
553553
parser_datasets_version_optional.add_argument(
@@ -949,7 +949,8 @@ class Help(object):
949949
param_keep_tabular = (
950950
'Do not convert tabular files to CSV (default is to convert)')
951951
param_dir_mode = (
952-
'What to do with directories: "skip" - ignore; "zip" - compress and upload')
952+
'What to do with directories: "skip" - ignore; "zip" - compressed upload; "tar" - '
953+
'uncompressed upload')
953954
param_delete_old_version = 'Delete old versions of this dataset'
954955
param_force = (
955956
'Skip check whether local version of file is up to date, force'

0 commit comments

Comments
 (0)