-
Notifications
You must be signed in to change notification settings - Fork 58
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
ENH: Give more informative file format errors #1165
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
from typing import TYPE_CHECKING, Literal, Union | ||
|
||
import xtgeo._cxtgeo | ||
from xtgeo.common.exceptions import InvalidFileFormatError | ||
from xtgeo.common.log import null_logger | ||
|
||
if TYPE_CHECKING: | ||
|
@@ -70,6 +71,10 @@ class FileFormat(Enum): | |
RMS_ATTR = ["rms_attr", "rms_attrs", "rmsattr.*"] | ||
UNKNOWN = ["unknown"] | ||
|
||
@staticmethod | ||
def extensions_string(formats: list[FileFormat]) -> str: | ||
return ", ".join([f"'{item}'" for fmt in formats for item in fmt.value]) | ||
|
||
|
||
class FileWrapper: | ||
""" | ||
|
@@ -434,8 +439,8 @@ def fileformat(self, fileformat: str | None = None) -> FileFormat: | |
if fmt == FileFormat.UNKNOWN: | ||
fmt = self._format_from_contents() | ||
if fmt == FileFormat.UNKNOWN: | ||
raise ValueError( | ||
f"Unknown or unsupported file format for file {self._file}" | ||
raise InvalidFileFormatError( | ||
f"File format {fileformat} is unknown or unsupported" | ||
) | ||
return fmt | ||
|
||
|
@@ -453,7 +458,9 @@ def _validate_fileformat(self, fileformat: str | None) -> None: | |
for regex in fmt.value: | ||
if "*" in regex and re.compile(regex).match(fileformat): | ||
return | ||
raise ValueError("Unknown or unsupported file format: {fileformat}") | ||
raise InvalidFileFormatError( | ||
f"File format {fileformat} is unknown or unsupported" | ||
) | ||
|
||
def _format_from_suffix(self, fileformat: str | None = None) -> FileFormat: | ||
"""Detect format by the file suffix.""" | ||
|
@@ -491,7 +498,7 @@ def _format_from_contents(self) -> FileFormat: | |
self.file.seek(mark) | ||
else: | ||
if not self.exists(): | ||
raise ValueError(f"File {self.name} does not exist") | ||
raise FileNotFoundError(f"File {self.name} does not exist") | ||
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. Bonus exception type change |
||
with open(self.file, "rb") as fhandle: | ||
fhandle.readinto(buffer) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Ideally in #1164 this list becomes a property of the different class types, or something like that.