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

Enhancing photo renaming with custom expressions #3514

Merged
merged 6 commits into from
Jun 26, 2024

Conversation

VitorVieiraZ
Copy link
Contributor

@VitorVieiraZ VitorVieiraZ commented Jun 20, 2024

Setting Photo name format in Photo attachments configuration previously did not accept formats beginning with '/', such as '/photos/'||@mergin_username||'-'||@layer_name||to_string("count")||'_'||format_date("date",'yyyy-MM-dd_Thh.mm.ss'). Now, it is possible to configure expression with leading slashes. Mergin Maps will automatically remove any slashes at the beginning of the photo name format during data processing.

Fixes #3415

Copy link
Collaborator

@tomasMizera tomasMizera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Can we add a test here please?

@VitorVieiraZ VitorVieiraZ changed the title Enhancing photo renaming with custom expressions WIP - Enhancing photo renaming with custom expressions Jun 24, 2024
@VitorVieiraZ VitorVieiraZ changed the title WIP - Enhancing photo renaming with custom expressions Enhancing photo renaming with custom expressions Jun 24, 2024
Copy link

Pull Request Test Coverage Report for Build 9653861643

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 8 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.05%) to 59.919%

Files with Coverage Reduction New Missed Lines %
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.05%
Covered Lines: 7675
Relevant Lines: 12809

💛 - Coveralls

2 similar comments
Copy link

Pull Request Test Coverage Report for Build 9653861643

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 8 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.05%) to 59.919%

Files with Coverage Reduction New Missed Lines %
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.05%
Covered Lines: 7675
Relevant Lines: 12809

💛 - Coveralls

Copy link

Pull Request Test Coverage Report for Build 9653861643

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 8 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.05%) to 59.919%

Files with Coverage Reduction New Missed Lines %
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.05%
Covered Lines: 7675
Relevant Lines: 12809

💛 - Coveralls

Copy link
Collaborator

@tomasMizera tomasMizera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there! :)

app/attributes/attributecontroller.cpp Outdated Show resolved Hide resolved
test/test_data/test_photo_rename/photo2.jpg Outdated Show resolved Hide resolved
Copy link

Pull Request Test Coverage Report for Build 9678435592

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 9 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.04%) to 59.927%

Files with Coverage Reduction New Missed Lines %
input/core/merginuserinfo.cpp 1 75.18%
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.04%
Covered Lines: 7676
Relevant Lines: 12809

💛 - Coveralls

2 similar comments
Copy link

Pull Request Test Coverage Report for Build 9678435592

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 9 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.04%) to 59.927%

Files with Coverage Reduction New Missed Lines %
input/core/merginuserinfo.cpp 1 75.18%
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.04%
Covered Lines: 7676
Relevant Lines: 12809

💛 - Coveralls

Copy link

Pull Request Test Coverage Report for Build 9678435592

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 9 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.04%) to 59.927%

Files with Coverage Reduction New Missed Lines %
input/core/merginuserinfo.cpp 1 75.18%
input/core/merginapi.cpp 8 78.49%
Totals Coverage Status
Change from base Build 9583371861: -0.04%
Covered Lines: 7676
Relevant Lines: 12809

💛 - Coveralls

Copy link
Collaborator

@tomasMizera tomasMizera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing my comments! :)

@tomasMizera tomasMizera merged commit 33ff5a8 into master Jun 26, 2024
9 checks passed
@tomasMizera tomasMizera deleted the fix/photoRenamingWithExpressions branch June 26, 2024 11:41
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.

Photo renaming does not work when multiple photo fields have custom expressions
3 participants