Skip to content

Only perform decompress step if requested in conform #76

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
iandees merged 2 commits into from
Apr 11, 2025
Merged

Only perform decompress step if requested in conform #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7523dac
Only perform decompress step if requested in conform
iandees Apr 10, 2025
aeaf132
Fix test
iandees Apr 11, 2025
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
13 changes: 9 additions & 4 deletions openaddr/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,15 @@ def conform(source_config, destdir, extras):
downloaded_path = task1.download(source_urls, workdir, source_config)
_L.info("Downloaded to %s", downloaded_path)

task2 = DecompressionTask.from_format_string(source_config.data_source.get('compression'))
names = elaborate_filenames(source_config.data_source.get('conform', {}).get('file', None))
decompressed_paths = task2.decompress(downloaded_path, workdir, names)
_L.info("Decompressed to %d files", len(decompressed_paths))
compression = source_config.data_source.get('compression')
if compression:
task2 = DecompressionTask.from_format_string(compression)
names = elaborate_filenames(source_config.data_source.get('conform', {}).get('file', None))
decompressed_paths = task2.decompress(downloaded_path, workdir, names)
_L.info("Decompressed to %d files", len(decompressed_paths))
else:
decompressed_paths = downloaded_path
_L.info("No decompression requested")

task4 = ConvertToGeojsonTask()
try:
Expand Down
2 changes: 1 addition & 1 deletion openaddr/conform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def decompress(self, source_paths, workdir, filenames):
_L.info('Guessing gzip compression based on file names')
return substitute_task.decompress(source_paths, workdir, filenames)

_L.warning('Could not guess a single compression from file names')
_L.info('Could not guess a single compression from file names')
return source_paths

def is_in(path, names):
Expand Down
1 change: 1 addition & 0 deletions openaddr/tests/sources/us-wy-park.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"addresses": [{
"name": "default",
"data": "https://data.openaddresses.io/cache/uploads/nvkelso/5a5bf6/ParkCountyADDRESS_POINTS_point.zip",
"compression": "zip",
"protocol": "http",
"conform": {
"format": "shapefile",
Expand Down