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 public headers inclusion (+ small other fixes) #574

Merged
merged 5 commits into from
Jul 7, 2021

Conversation

mgautierfr
Copy link
Member

@mgautierfr mgautierfr commented Jun 30, 2021

Fix #564

This also fix some declaration of SuggestionItem methods.

On recent gcc, httplib raise warning and it break compilation with -WError.
This PR include a patch for this. Upstream patch is here : yhirose/cpp-httplib#980

This has been removed from the PR as it fix a issue I've got only on my computer and the fix make macos compilation fail.

@codecov
Copy link

codecov bot commented Jun 30, 2021

Codecov Report

Merging #574 (6cd50f6) into master (967eb10) will increase coverage by 0.00%.
The diff coverage is 83.33%.

❗ Current head 6cd50f6 differs from pull request most recent head 0b6b671. Consider uploading reports for the commit 0b6b671 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master     #574   +/-   ##
=======================================
  Coverage   64.91%   64.92%           
=======================================
  Files          53       53           
  Lines        3737     3738    +1     
  Branches     1884     1881    -3     
=======================================
+ Hits         2426     2427    +1     
  Misses       1309     1309           
  Partials        2        2           
Impacted Files Coverage Δ
include/opds_dumper.h 100.00% <ø> (ø)
include/searcher.h 33.33% <ø> (ø)
src/aria2.cpp 0.00% <ø> (ø)
src/book.cpp 96.35% <ø> (ø)
src/kiwixserve.cpp 37.14% <ø> (ø)
src/library.cpp 79.20% <ø> (ø)
src/libxml_dumper.cpp 0.00% <ø> (ø)
src/manager.cpp 77.98% <ø> (+0.20%) ⬆️
src/opds_dumper.cpp 100.00% <ø> (ø)
src/reader.cpp 43.95% <ø> (ø)
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 967eb10...0b6b671. Read the comment docs.

@mgautierfr mgautierfr force-pushed the remove_mustache_public_header branch 3 times, most recently from bf5ae05 to 39a6308 Compare June 30, 2021 15:18
@kelson42 kelson42 force-pushed the remove_mustache_public_header branch from 39a6308 to d438890 Compare June 30, 2021 19:36
include/tools.h Outdated Show resolved Hide resolved
include/tools.h Outdated Show resolved Hide resolved
include/tools.h Outdated Show resolved Hide resolved
include/tools.h Outdated Show resolved Hide resolved
include/tools.h Outdated Show resolved Hide resolved
include/tools.h Outdated Show resolved Hide resolved
@mgautierfr mgautierfr force-pushed the remove_mustache_public_header branch from d438890 to b65f065 Compare July 6, 2021 13:47
Copy link
Contributor

@maneeshpm maneeshpm left a comment

Choose a reason for hiding this comment

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

Just a couple of comments for better docstring

include/tools.h Outdated Show resolved Hide resolved
include/tools.h Show resolved Hide resolved
@mgautierfr mgautierfr force-pushed the remove_mustache_public_header branch from b65f065 to 6cd50f6 Compare July 6, 2021 15:00
@mgautierfr
Copy link
Member Author

Rebase on master (fixing the conflict (new archiveTools.h)).

Fix last review comments of @maneeshpm

@kelson42 kelson42 assigned maneeshpm and unassigned maneeshpm Jul 6, 2021
@mgautierfr mgautierfr force-pushed the remove_mustache_public_header branch from 6cd50f6 to 243406c Compare July 6, 2021 15:46
@mgautierfr mgautierfr requested a review from veloman-yunkan July 6, 2021 15:53
@kelson42
Copy link
Collaborator

kelson42 commented Jul 7, 2021

This branch needs to be rebased

This by definition remove all the tool functions from the public API.
This header will contain our public tool functions.
- Add docstring
- Move the declaration in kiwix namespace.
- Adapt our include to include the right headers.
@mgautierfr mgautierfr force-pushed the remove_mustache_public_header branch from 243406c to 0b6b671 Compare July 7, 2021 12:43
@kelson42
Copy link
Collaborator

kelson42 commented Jul 7, 2021

IMO we can merge now.

@kelson42 kelson42 merged commit e2db1b3 into master Jul 7, 2021
@kelson42 kelson42 deleted the remove_mustache_public_header branch July 7, 2021 16:00
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.

Do not expose mustache (and other depedency/tools) in public headers.
4 participants