Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/misc/m.cdo.download/m.cdo.download.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@

import sys
import os
import requests
import urllib.request
import urllib.error
import json
import grass.script as gs
from grass.script.utils import separator
Expand Down Expand Up @@ -181,11 +182,10 @@ def fetch_once(endpoint, offset, limit):
response = None

for token in tokens:
ret = requests.get(request_url, headers={"token": token})
if ret.status_code != 200:
continue
try:
response = ret.json()
request = urllib.request.Request(request_url, headers={"token": token})
with urllib.request.urlopen(request) as f:
response = json.load(f)
except:
continue
if "message" in response:
Expand Down
45 changes: 24 additions & 21 deletions src/misc/m.tnm.download/m.tnm.download.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@

import sys
import os
import requests
import urllib.request
import urllib.error
import json
import grass.script as gs
from grass.script.utils import separator

Expand Down Expand Up @@ -164,26 +166,32 @@
)


def urlopen(url):
url = url.replace(" ", "%20")
return urllib.request.urlopen(url)
Comment on lines +169 to +171
Copy link
Member

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.

Copy link
Member Author

@HuidaeCho HuidaeCho Nov 7, 2023

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?

Copy link
Member Author

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.

Copy link
Member Author

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.

Copy link
Member

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() or encode_X_for_Y() as there seems to be some specificity to this particular case.



def show_datasets(fs):
datasets = query_datasets()
print(f"INDEX{fs}ID{fs}TAG")
print(f"index{fs}id{fs}tag")
for i in range(len(datasets)):
dataset = datasets[i]
print(f"{i}{fs}{dataset['id']}{fs}{dataset['sbDatasetTag']}")


def show_states(fs):
print(f"FIPS{fs}USPS{fs}NAME")
print(f"fips{fs}usps{fs}name")
for state in states:
print(f"{state['fips']}{fs}{state['usps']}{fs}{state['name']}")


def query_datasets():
url = datasets_url
res = requests.get(url)
if res.status_code != 200:
gs.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:
gs.fatal(_("Failed to fetch dataset metadata with status code %d") % e.code)

datasets = []
for item in ret:
Expand All @@ -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:
gs.warning(
_("Failed to download %s with status code %d") % (filename, res.status_code)
)
return

if os.path.exists(filename) and not gs.overwrite():
file_size = os.path.getsize(filename)
if not compare_file_size or file_size == size:
Expand All @@ -218,10 +219,11 @@ def download_file(item, code, compare_file_size):
)

gs.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:
gs.warning(_("Failed to download %s with status code %d") % (filename, e.code))


def main():
Expand Down Expand Up @@ -332,8 +334,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:
gs.fatal(
_("Failed to fetch product metadata for %s (offset %d of %d)")
Expand All @@ -344,7 +348,6 @@ def main():
_("Failed to fetch product metadata for %s (offset %d)")
% (code["name"], offset)
)
ret = res.json()
if not total:
total = ret["total"]
gs.message(_("Number of files to download: %d") % total)
Expand Down