-
Notifications
You must be signed in to change notification settings - Fork 25
[WJ-1224] [WJ-99] [WJ-1301] [WJ-1302] Implement hosted text blocks #2354
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
Merged
Conversation
This file contains hidden or 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
dcc0153 to
2b9564e
Compare
9c43fae to
cdec375
Compare
This reverts commit a41290e.
This version requires a page ID so it can submit hosted text blocks to the database and S3.
Pulls in changes from scpwiki/ftml#44
This makes a generic helper function which can handle both cases.
This removes the unused warning and also it's cool to be able to resolve the actual index number from a name.
This is needed for special page rendering. It's also just a more natural way to extract the page ID.
Since this is the hash of its content and the hash always changes when the file does (pointing to a different blob), this is what we want in terms of cache management.
This is a QoL for local, where 'cargo watch' may be still rebuilding deepwell when wws restarts.
cdec375 to
8c2569c
Compare
Zokhoi
approved these changes
May 5, 2025
Member
Author
|
thanks Zokhoi! |
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.
This resolves a number of issues related to hosted text blocks:
[[html]][[code]]This glues together several pieces from previous PRs to finally support text blocks within Wikijump. There are a few components of this:
The flow is this:
RenderServiceis made. This is now divided intoRenderService::render()(regular calls) andRenderService::render_page()(specifically named pages).RenderService::render_page(), it goes through all the text blocks in the tree and adds them.TextBlockService::add_blocks(), this goes and replaces all existing text blocks with the new ones in S3 and the database.Then when you request a block:
s3_filename, which is what the text block is called in its S3 bucket.The special error changes also remove a number of stubs for failure cases in wws and improves its handling in the code for a smoother developer experience.
A separate preprocess/parse timeout is required to resolve some borrow issues, since we need the syntax tree intact to do text block processing after rendering.
This PR bumps the versions of deepwell and wws to v2025.5.4.
There are also some miscellaneous improvements: