-
Notifications
You must be signed in to change notification settings - Fork 148
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.
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
m.(cdo|tnm).download: Replace requests with urllib #977
base: grass8
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,9 @@ | |
|
||
import sys | ||
import os | ||
import requests | ||
import urllib.request | ||
import urllib.error | ||
import json | ||
import grass.script as grass | ||
from grass.script.utils import separator | ||
|
||
|
@@ -164,6 +166,11 @@ | |
) | ||
|
||
|
||
def urlopen(url): | ||
url = url.replace(" ", "%20") | ||
return urllib.request.urlopen(url) | ||
|
||
|
||
def show_datasets(fs): | ||
datasets = query_datasets() | ||
print(f"INDEX{fs}ID{fs}TAG") | ||
|
@@ -180,10 +187,11 @@ def show_states(fs): | |
|
||
def query_datasets(): | ||
url = datasets_url | ||
res = requests.get(url) | ||
if res.status_code != 200: | ||
grass.fatal(_("Failed to fetch dataset metadata")) | ||
ret = res.json() | ||
try: | ||
with urlopen(url) as f: | ||
ret = json.load(f) | ||
except urllib.error.HTTPError as e: | ||
grass.fatal(_("Failed to fetch dataset metadata with status code %d") % e.code) | ||
|
||
datasets = [] | ||
for item in ret: | ||
|
@@ -201,13 +209,6 @@ def download_file(item, code, compare_file_size): | |
filename = url.split("/")[-1] | ||
size = item["sizeInBytes"] | ||
name = code["name"] | ||
res = requests.get(url, stream=True) | ||
if res.status_code != 200: | ||
grass.warning( | ||
_("Failed to download %s with status code %d") % (filename, res.status_code) | ||
) | ||
return | ||
|
||
if os.path.exists(filename) and not grass.overwrite(): | ||
file_size = os.path.getsize(filename) | ||
if not compare_file_size or file_size == size: | ||
|
@@ -218,10 +219,13 @@ def download_file(item, code, compare_file_size): | |
) | ||
|
||
grass.message(_("Downloading %s for %s...") % (filename, name)) | ||
with open(filename, "wb") as f: | ||
for chunk in res.iter_content(chunk_size=1024): | ||
if chunk: | ||
f.write(chunk) | ||
try: | ||
with urlopen(url) as inf, open(filename, "wb") as outf: | ||
outf.write(inf.read()) | ||
except urllib.error.HTTPError as e: | ||
grass.warning( | ||
_("Failed to download %s with status code %d") % (filename, e.code) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought C-like formats would be better for cross-language translations, but anyway, we already have Python formats, so not a big deal. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We definitively use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @wenzeslaus Shouldn't we prefer f-strings (better readability and shorter) in that case when the minimum Python version we support is 3.8? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We didn't adapt the CI yet, but for the main branch, the minimum supported version agreed upon is 3.9. So you are free There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought this was this GRASS repo, not the GRASS addons repo. For addons I don't know, but hope to follow the main grass repo to allow sharing similar maintenance |
||
) | ||
|
||
|
||
def main(): | ||
|
@@ -332,8 +336,10 @@ def main(): | |
) | ||
+ date_params | ||
) | ||
res = requests.get(url) | ||
if res.status_code != 200: | ||
try: | ||
with urlopen(url) as f: | ||
ret = json.load(f) | ||
except urllib.error.HTTPError as e: | ||
if total: | ||
grass.fatal( | ||
_("Failed to fetch product metadata for %s (offset %d of %d)") | ||
|
@@ -344,7 +350,6 @@ def main(): | |
_("Failed to fetch product metadata for %s (offset %d)") | ||
% (code["name"], offset) | ||
) | ||
ret = res.json() | ||
if not total: | ||
total = ret["total"] | ||
grass.message(_("Number of files to download: %d") % total) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is probably encode-decode function which would do this in more general way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found
url = urllib.parse.quote(url, safe=":/?=&")
, but I liked the above simpler version. Any better suggestion?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was actually surprised that I couldn't find any general URL encode/decode functions that can simply take full URLs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh BTW, TNM only complained about spaces in URL. That was another reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then I don't have a better suggestion. I think a documentation would clarify the existence of the function or a separate function
encode_spaces()
orencode_X_for_Y()
as there seems to be some specificity to this particular case.