Skip to content
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

Jump to bottom

ingestion: Use utf-8 if encoding detection fails #1983

Merged
merged 1 commit into from
Jul 7, 2021
Merged

ingestion: Use utf-8 if encoding detection fails #1983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion ingestion/functions/retrieval/retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
SOURCE_ID_FIELD = "sourceId"
PARSING_DATE_RANGE_FIELD = "parsingDateRange"
TIME_FILEPART_FORMAT = "/%Y/%m/%d/%H%M/"
DEFAULT_ENCODING = 'utf-8'
READ_CHUNK_BYTES = 2048
HEADER_CHUNK_BYTES = 1024 * 1024
CSV_CHUNK_BYTES = 2 * 1024 * 1024
Expand Down Expand Up @@ -154,7 +155,11 @@ def retrieve_content(
# Read 2MB to be quite sure about the encoding.
detected_enc = detect(bytesio.read(2 << 20))
bytesio.seek(0)
print(f'Source encoding is presumably {detected_enc}')
if detected_enc['encoding']:
print(f'Source encoding is presumably {detected_enc}')
else:
detected_enc['encoding'] = DEFAULT_ENCODING
print(f'Source encoding detection failed, setting to {DEFAULT_ENCODING}')
fd, outfile_name = tempfile.mkstemp(dir=tempdir)
with os.fdopen(fd, "w", encoding='utf-8') as outfile:
text_stream = codecs.getreader(detected_enc['encoding'])(bytesio)
Expand Down