YAML files: ignore files inside automation sub-folder #4291
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
Also ignore unreachable files Signed-off-by: Laurent Garnier <lg.hc@free.fr>
|
Handles user feedbacks testing OH 4.2 milestone 4. First user reported these logs: Second user reported this exception: |
J-N-K
reviewed
Jul 3, 2024
| @@ -99,7 +99,8 @@ public YamlModelRepositoryImpl(@Reference(target = WatchService.CONFIG_WATCHER_F | |||
|
|
|||
| // read initial contents | |||
| try (Stream<Path> files = Files.walk(watchPath)) { | |||
| files.filter(Files::isRegularFile).map(watchPath::relativize).forEach(f -> processWatchEvent(CREATE, f)); | |||
| files.filter(f -> Files.isReadable(f) && Files.isRegularFile(f)).map(watchPath::relativize) | |||
There was a problem hiding this comment.
Is it really necessary to check .isReadable here? The check is done again when processWatchEvent is called.
There was a problem hiding this comment.
I was not sure what call triggered the AccessDeniedException. Not really clear when looking at the stack trace.
jlaur
reviewed
Jul 6, 2024
| @@ -116,7 +117,8 @@ public void deactivate() { | |||
| public synchronized void processWatchEvent(Kind kind, Path path) { | |||
| Path fullPath = watchPath.resolve(path); | |||
| String pathString = path.toString(); | |||
| if (Files.isDirectory(fullPath) || fullPath.toFile().isHidden() || !pathString.endsWith(".yaml")) { | |||
| if (!Files.isReadable(fullPath) || Files.isDirectory(fullPath) || path.startsWith("automation") | |||
There was a problem hiding this comment.
@lolodomo, @J-N-K - even though it's not a root cause, do you think it would make sense for performance reasons to explicitly ignore ".git" directories as well? See https://community.openhab.org/t/openhab-4-2-milestone-discussion/154316/185
I realize this could quickly turn into a rather large blacklist, though.
There was a problem hiding this comment.
No. That doesn't make sense. Another guy in thread thread had a directory _infdb, why should we add .git but not _infdb? automation is different because it is readable, but may contain incompatible .yaml files.
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.
Also ignore unreachable files
Signed-off-by: Laurent Garnier lg.hc@free.fr