Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ENH: unzip support for download #209

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

Merged
merged 12 commits into from
Oct 31, 2023
Merged

ENH: unzip support for download #209

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5e49f93
ENH: allow files to be unzipped after download
jklenzing Oct 4, 2023
c9e7f6f
STY: update comments
jklenzing Oct 4, 2023
ca4a609
Merge branch 'develop' into enh/103_104_zip
jklenzing Oct 6, 2023
fa6ab02
DOC: update changelog
jklenzing Oct 6, 2023
37096e3
ENH: add test data
jklenzing Oct 23, 2023
2913b28
STY: use year for dir
jklenzing Oct 23, 2023
ebe4d53
Remove test data
jklenzing Oct 30, 2023
e2ad89f
STY: remove gzip
jklenzing Oct 30, 2023
8c9ff67
DOC: update changelog
jklenzing Oct 30, 2023
6825a0d
DOC: add comment
jklenzing Oct 31, 2023
058ab05
TST: add warning test
jklenzing Oct 31, 2023
756b952
STY: pep8
jklenzing Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
STY: remove gzip
  • Loading branch information
@jklenzing
jklenzing committed Oct 30, 2023
commit e2ad89f90ffcaa4949bbcc15428d690ae206fb7f
11 changes: 2 additions & 9 deletions pysatNASA/instruments/methods/cdaweb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"""

import datetime as dt
import gzip
import numpy as np
import os
import pandas as pds
Expand Down Expand Up @@ -600,7 +599,7 @@ def get_file(remote_file, data_path, fname, temp_path=None, zip_method=None):
temp_path : str
Path to temporary directory. (Default=None)
zip_method : str
The method used to zip the file. Supports 'gzip', 'zip', and None.
The method used to zip the file. Supports 'zip' and None.
If None, downloads files directly. (default=None)

"""
Expand All @@ -617,13 +616,7 @@ def get_file(remote_file, data_path, fname, temp_path=None, zip_method=None):
open_f.write(remote_file)

# Unzip and move the files from the temporary directory.
if zip_method == 'gzip':
local_fname = os.path.join(data_path, fname).replace('.gz', '')
with gzip.open(dl_fname) as open_zip:
with open(local_fname, 'wb') as open_f:
open_f.write(open_zip.read())

elif zip_method == 'zip':
if zip_method == 'zip':
with zipfile.ZipFile(dl_fname, 'r') as open_zip:
open_zip.extractall(data_path)

Expand Down