Disambiguate files on import #3085
Open
Conversation
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
jonenst
force-pushed
the
disambiguateimport
branch
from
eda4baf
to
2dbe40a
Compare
|
|
Need more tests |
jonenst
commented
Jul 15, 2024
| @@ -79,6 +79,12 @@ public String getComment() { | |||
|
|
|||
| @Override | |||
| public boolean exists(ReadOnlyDataSource dataSource) { | |||
| // if given a main file with an extension and it's not compatible, don't import | |||
| // to avoid importing a file when the user specified another | |||
| if (!dataSource.getBaseExtension().isEmpty()) { | |||
There was a problem hiding this comment.
bug here if getBaseExtension.equals(EXT) we must not return false...
jonenst
commented
Jul 15, 2024
| @@ -515,6 +515,12 @@ private static boolean reactiveLimitsAreOk(double minQ, double maxQ) { | |||
|
|
|||
| @Override | |||
| public boolean exists(ReadOnlyDataSource dataSource) { | |||
| // if given a main file with an extension and it's not compatible, don't import | |||
| // to avoid importing a file when the user specified another | |||
| if (!dataSource.getBaseExtension().isEmpty()) { | |||
Signed-off-by: HARPER Jon <jon.harper87@gmail.com>
jonenst
force-pushed
the
disambiguateimport
branch
from
2dbe40a
to
2c21ab3
Compare
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
#989
#3082
#2959
others...
What kind of change does this PR introduce?
bug fix
What is the current behavior?
$ itools convert-network --input-file foo.xiidm # will wrongly use foo.xml from cgmes if it existsWhat is the new behavior (if this is a feature change)?
always use the file specified by the user in the command line
Does this PR introduce a breaking change or deprecate an API?