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.

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

Fix anchor and subpath for relative links #22

Merged
merged 11 commits into from
Sep 11, 2024
Merged

Fix anchor and subpath for relative links #22

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37dc8da
Fix anchor and subpath for relative links
Zokhoi Sep 9, 2024
94ac829
Rename test files
Zokhoi Sep 9, 2024
2181835
Add test for triple bracket link with subpath
Zokhoi Sep 9, 2024
2779c34
Temp fix for empty path segment
Zokhoi Sep 10, 2024
636f6a6
Add parsing first and subsequent segments for links
Zokhoi Sep 10, 2024
b4f1109
Add tests
Zokhoi Sep 10, 2024
373e736
Add back potentially useful code as comment
Zokhoi Sep 10, 2024
4b47310
Improve link splitting
Zokhoi Sep 11, 2024
e653e8f
Add unit test for parsing link extras
Zokhoi Sep 11, 2024
3638970
Simplify expression
Zokhoi Sep 11, 2024
153f4d7
Improve test cases
Zokhoi Sep 11, 2024
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
13 changes: 11 additions & 2 deletions src/url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,18 @@ pub fn normalize_href(url: &str) -> Cow<str> {
warn!("Attempt to pass in dangerous URL: {url}");
Cow::Borrowed("#invalid-url")
} else {
let mut url = str!(url);
let split_anchor: Vec<&str> = url.splitn(2, "#").collect();
let mut split_url: Vec<&str> = split_anchor[0].split("/").collect();
if !split_url[0].is_empty() {
split_url.insert(0, "");
}
let mut url = str!(split_url[1]);
normalize(&mut url);
url.insert(0, '/');
split_url[1] = &url;
url = split_url.join("/");
if split_anchor.len() == 2 {
url = format!("{}#{}", url, split_anchor[1]);
}
Cow::Owned(url)
emmiegit marked this conversation as resolved.
Show resolved Hide resolved
}
}
Expand Down
1 change: 1 addition & 0 deletions test/link-subpath-anchor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<wj-body class="wj-body"><p><a href="/relative/link#toc0" class="wj-link wj-link-internal" data-link-type="direct">text</a></p></wj-body>
46 changes: 46 additions & 0 deletions test/link-subpath-anchor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"input": "[/relative/link#toc0 text]",
"tree": {
"elements": [
{
"element": "container",
"data": {
"type": "paragraph",
"attributes": {},
"elements": [
{
"element": "link",
"data": {
"type": "direct",
"link": "/relative/link#toc0",
"label": {
"text": "text"
},
"target": null
}
}
]
}
},
{
"element": "footnote-block",
"data": {
"title": null,
"hide": false
}
}
],
"html-blocks": [
],
"code-blocks": [
],
"table-of-contents": [
],
"footnotes": [
],
"bibliographies": [
]
},
"errors": [
]
}
1 change: 1 addition & 0 deletions test/link-subpath.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<wj-body class="wj-body"><p><a href="/relative/link" class="wj-link wj-link-internal" data-link-type="direct">text</a></p></wj-body>
46 changes: 46 additions & 0 deletions test/link-subpath.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"input": "[/relative/link text]",
"tree": {
"elements": [
{
"element": "container",
"data": {
"type": "paragraph",
"attributes": {},
"elements": [
{
"element": "link",
"data": {
"type": "direct",
"link": "/relative/link",
"label": {
"text": "text"
},
"target": null
}
}
]
}
},
{
"element": "footnote-block",
"data": {
"title": null,
"hide": false
}
}
],
"html-blocks": [
],
"code-blocks": [
],
"table-of-contents": [
],
"footnotes": [
],
"bibliographies": [
]
},
"errors": [
]
}
1 change: 1 addition & 0 deletions test/link-triple-anchor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<wj-body class="wj-body"><p><a href="/scp-series#001" class="wj-link wj-link-internal" data-link-type="page">SCP-001 to SCP-099</a></p></wj-body>
49 changes: 49 additions & 0 deletions test/link-triple-anchor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"input": "[[[scp-series#001|SCP-001 to SCP-099]]]",
"tree": {
"elements": [
{
"element": "container",
"data": {
"type": "paragraph",
"attributes": {},
"elements": [
{
"element": "link",
"data": {
"type": "page",
"link": {
"site": null,
"page": "scp-series#001"
},
"label": {
"text": "SCP-001 to SCP-099"
},
"target": null
}
}
]
}
},
{
"element": "footnote-block",
"data": {
"title": null,
"hide": false
}
}
],
"html-blocks": [
],
"code-blocks": [
],
"table-of-contents": [
],
"footnotes": [
],
"bibliographies": [
]
},
"errors": [
]
}
1 change: 1 addition & 0 deletions test/link-triple-subpath.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<wj-body class="wj-body"><p><a href="/example/edit" class="wj-link wj-link-internal" data-link-type="page">Edit page</a></p></wj-body>
49 changes: 49 additions & 0 deletions test/link-triple-subpath.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"input": "[[[example/edit|Edit page]]]",
"tree": {
"elements": [
{
"element": "container",
"data": {
"type": "paragraph",
"attributes": {},
"elements": [
{
"element": "link",
"data": {
"type": "page",
"link": {
"site": null,
"page": "example/edit"
},
"label": {
"text": "Edit page"
},
"target": null
}
}
]
}
},
{
"element": "footnote-block",
"data": {
"title": null,
"hide": false
}
}
],
"html-blocks": [
],
"code-blocks": [
],
"table-of-contents": [
],
"footnotes": [
],
"bibliographies": [
]
},
"errors": [
]
}
Loading