85 read from stdin #86
Merged
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
|
LGTM - now you just need to rebase and resolve the conflict and we can merge this fella 🥳 |
|
Still not properly rebased - GH still showing conflicts :-( |
| with open(self.project_file) as fp: | ||
| return json.load(fp) | ||
| except json.JSONDecodeError: | ||
| raise FlictException(ReturnCodes.RET_INVALID_PROJECT, "File \"" + file_name + "\" does not contain valid JSON data") |
There was a problem hiding this comment.
f'File "{file_name}" does not contain valid JSON data'
| except json.JSONDecodeError: | ||
| raise FlictException(ReturnCodes.RET_INVALID_PROJECT, "File \"" + file_name + "\" does not contain valid JSON data") | ||
| except (FileNotFoundError, IsADirectoryError): | ||
| raise FlictException(ReturnCodes.RET_FILE_NOT_FOUND, "File \"" + file_name + "\" could not be found or is a directory") |
There was a problem hiding this comment.
f'File "{file_name}" could not be found or is a directory'
|
I took the liberty to fix this branch. See https://github.com/vinland-technology/flict/tree/85-read-from-stdin-fixed and feel free to take this as a replacement. We could also just create a new merge request instead. EDIT: There still seems to be an issue: |
jens-erdmann
force-pushed
the
85-read-from-stdin
branch
from
d520282 to
c1f783c
Compare
|
It seems to work :) All tests pass. Have also tried some manual testing. |
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.
Closes #85
Adding - to mean stdin we can use flict in pipes, like this