Fix/qml resources #135
Merged
Fix/qml resources #135
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
NeonJarbas
force-pushed
the
fix/qml_resources
branch
from
e9c074b
to
93bfbe4
Compare
JarbasAl
reviewed
Jun 5, 2022
| if x.is_file() and res_name == x.name: | ||
| return x | ||
|
|
||
| for directory in locate_base_directories(root_dir, res_dirname): |
There was a problem hiding this comment.
@NeonDaniel this should fix the bug you reported in chat
JarbasAl
added
bug
|
QML files are been resolved from a deeper level than the UI folder, it should only resolve the UI folder not deeper levels, for example its resolving for timer skill the "ui/+mediacenter/Timer.qml" where it should only be resolving "ui/Timer.qml" |
the resource file refactor was not handling non-lang resources properly, it would miss top level folders that are not localized QML files were completely ignored in the mk2 refactor, this commit adds "new style" support for handling of qml files
NeonJarbas
force-pushed
the
fix/qml_resources
branch
from
93bfbe4
to
d358472
Compare
Codecov Report
@@ Coverage Diff @@
## dev #135 +/- ##
==========================================
+ Coverage 50.35% 52.69% +2.34%
==========================================
Files 119 150 +31
Lines 10077 9652 -425
==========================================
+ Hits 5074 5086 +12
+ Misses 5003 4566 -437
Continue to review full report at Codecov.
|
qml files should not walk the directory, only check top level
AIIX
approved these changes
Jun 6, 2022
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.
fix/non_lang_resources - follow up to #130
the resource file refactor was not handling non-lang resources properly, it would miss top level folders that are not localized
QML files were completely ignored in the mk2 refactor, this commit adds "new style" support for handling of qml files