θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

Fix/drupal wiki (improve table & url handling) #4097

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.

Sign up for GitHub

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
merged 9 commits into from
Jul 7, 2025
Merged

Fix/drupal wiki (improve table & url handling) #4097

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b16778b
feat: add support for custom table formatting in htmlToText conversion
rexjohannes Jul 6, 2025
c72d8cc
fix tables
rexjohannes Jul 6, 2025
3fb327e
feat: improve plain text table formatting for AI readability
rexjohannes Jul 6, 2025
9185f0c
fix options
rexjohannes Jul 6, 2025
e841662
improve drupal wiki connector
rexjohannes Jul 6, 2025
8b0ddfb
final fix
rexjohannes Jul 6, 2025
c612f6d
adjust leading slash to match code
rexjohannes Jul 6, 2025
22c9dce
linting
timothycarambat Jul 7, 2025
ec489ad
Merge branch 'master' into fix/drupal-wiki
timothycarambat Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions collector/utils/extensions/DrupalWiki/DrupalWiki/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@ class DrupalWiki {
pageId: pageId,
accessToken: this.accessToken,
};
return `drupalwiki://${this.baseUrl}?payload=${encryptionWorker.encrypt(
return `drupalwiki://${
this.baseUrl
}/node/${pageId}?payload=${encryptionWorker.encrypt(
JSON.stringify(payload)
)}`;
}
Expand Down Expand Up @@ -259,17 +261,27 @@ class DrupalWiki {
* @private
*/
#processPageBody({ body, url, title, lastModified }) {
// use the title as content if there is none
const textContent = body.trim() !== "" ? body : title;

const plainTextContent = htmlToText(textContent, {
wordwrap: false,
preserveNewlines: true,
selectors: [
{
selector: "table",
format: "dataTable",
options: {
colSpacing: 3,
rowSpacing: 1,
uppercaseHeaderCells: true,
maxColumnWidth: Infinity,
},
},
],
});
// preserve structure

const plainBody = plainTextContent.replace(/\n{3,}/g, "\n\n");
// add the link to the document
return `Link/URL: ${url}\n\n${plainBody}`;
return plainBody;
}

async #downloadAndProcessAttachments(pageId) {
Expand Down