Skip to content
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

Fix file matching in annotation import for multiple dots in filenames #6350

Merged
merged 12 commits into from
Jun 29, 2023

Conversation

zhiltsov-max
Copy link
Contributor

@zhiltsov-max zhiltsov-max commented Jun 21, 2023

Motivation and context

Fixes #6319

  • Fixed invalid dataset root search, leading to invalid file matching
  • Restored detailed dataset import error messages
  • Added tests

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

@zhiltsov-max
Copy link
Contributor Author

@yf-yang, could you please check and confirm this solution works for you?

You can launch this version this way:

git clone https://github.com/opencv/cvat
cd cvat
git checkout zm/fix-file-matching
docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build

@codecov
Copy link

codecov bot commented Jun 21, 2023

Codecov Report

Merging #6350 (a585d6c) into develop (d950d24) will increase coverage by 0.85%.
The diff coverage is 87.50%.

@@             Coverage Diff             @@
##           develop    #6350      +/-   ##
===========================================
+ Coverage    80.04%   80.89%   +0.85%     
===========================================
  Files          332      332              
  Lines        38438    38443       +5     
  Branches      6923     6925       +2     
===========================================
+ Hits         30767    31098     +331     
+ Misses        7355     7029     -326     
  Partials       316      316              
Components Coverage Δ
cvat-ui 75.08% <ø> (+1.71%) ⬆️
cvat-server 86.28% <87.50%> (+0.04%) ⬆️

@zhiltsov-max zhiltsov-max removed the request for review from Marishka17 June 23, 2023 12:10
@yf-yang
Copy link

yf-yang commented Jun 25, 2023

Just saw it, I'll give it a try, thanks!

@yf-yang
Copy link

yf-yang commented Jun 26, 2023

@zhiltsov-max It works as expected, thank you 😄!

@azhavoro
Copy link
Contributor

@zhiltsov-max Could you add a note to the changelog?

@zhiltsov-max zhiltsov-max merged commit 31f78d5 into develop Jun 29, 2023
@zhiltsov-max zhiltsov-max deleted the zm/fix-file-matching branch June 29, 2023 16:59
@azhavoro azhavoro mentioned this pull request Jul 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot import annotations for image path with dot
3 participants