tildes-community/tildes-parser
tildes-community
/
tildes-parser
1
Fork 0
Code Issues 1 Releases Activity

Add group parsing to Topic.

This commit is contained in:
Bauke 2023-06-22 12:55:35 +02:00
parent fdc9fb8b98
commit 6f0d4d394d
Signed by: Bauke
GPG Key ID: C1C0F29952BCF558
10 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/selectors.rs
View File

@ -29,6 +29,9 @@ lazy_static! {
/// Selector for group wiki links. /// Selector for group wiki links.
pub static ref GROUP_WIKI_LINKS: Selector = selector(r#"#sidebar [href*="/wiki/"]"#); pub static ref GROUP_WIKI_LINKS: Selector = selector(r#"#sidebar [href*="/wiki/"]"#);
/// Selector for the site header context.
pub static ref SITE_HEADER_CONTEXT: Selector = selector(".site-header-context");
/// Selector for the topic comment count. /// Selector for the topic comment count.
pub static ref TOPIC_COMMENT_COUNT: Selector = selector(".topic-comments-header h2"); pub static ref TOPIC_COMMENT_COUNT: Selector = selector(".topic-comments-header h2");

23
source/topic.rs
View File

@ -5,8 +5,9 @@ use scraper::Html;
use crate::{ use crate::{
regexes::DUPLICATE_WHITESPACE_RE, regexes::DUPLICATE_WHITESPACE_RE,
selectors::{ selectors::{
TOPIC_COMMENT_COUNT, TOPIC_FULL_BYLINE, TOPIC_FULL_LINK, TOPIC_FULL_TAGS, SITE_HEADER_CONTEXT, TOPIC_COMMENT_COUNT, TOPIC_FULL_BYLINE,
TOPIC_FULL_TEXT, TOPIC_MAIN_ARTICLE, TOPIC_TOAST_WARNING, TOPIC_VOTE_COUNT, TOPIC_FULL_LINK, TOPIC_FULL_TAGS, TOPIC_FULL_TEXT, TOPIC_MAIN_ARTICLE,
TOPIC_TOAST_WARNING, TOPIC_VOTE_COUNT,
}, },
utilities::select_first_element_text, utilities::select_first_element_text,
ParseError, ParseError,
@ -25,6 +26,9 @@ pub struct Topic {
/// The content of the topic. /// The content of the topic.
pub content: TopicContent, pub content: TopicContent,
/// The group the topic was posted in, with a leading tilde character.
pub group: String,
/// The unique ID of the topic. /// The unique ID of the topic.
pub id: String, pub id: String,
@ -132,6 +136,20 @@ impl Topic {
TopicContent::Unknown TopicContent::Unknown
}; };
let group = DUPLICATE_WHITESPACE_RE
.replace_all(
html
.select(&SITE_HEADER_CONTEXT)
.next()
.ok_or(ParseError::MissingExpectedHtml)?
.text()
.collect::<String>()
.trim(),
"",
)
.to_string();
assert!(group.starts_with("~"));
let id = topic_article_element let id = topic_article_element
.value() .value()
.id() .id()
@ -158,6 +176,7 @@ impl Topic {
author, author,
comment_total, comment_total,
content, content,
group,
id, id,
is_locked, is_locked,
is_official: false, // TODO: Implement this once it can be done. is_official: false, // TODO: Implement this once it can be done.

8
tests/samples/topic_deleted.html
View File

@ -5,7 +5,13 @@
<title>Deleted topic sample for topic.rs</title> <title>Deleted topic sample for topic.rs</title>
</head> </head>
<body class="theme-white"> <body>
<header>
<div class="site-header-context">
<a href="/~group">~group</a>
</div>
</header>
<main> <main>
<article id="topic-666" class="topic-full"> <article id="topic-666" class="topic-full">
<header> <header>

6
tests/samples/topic_link.html
View File

@ -6,6 +6,12 @@
</head> </head>
<body> <body>
<header>
<div class="site-header-context">
<a href="/~group">~group</a>
</div>
</header>
<main> <main>
<article id="topic-456" class="topic-full"> <article id="topic-456" class="topic-full">
<header> <header>

8
tests/samples/topic_scheduled.html
View File

@ -6,6 +6,14 @@
</head> </head>
<body> <body>
<header>
<div class="site-header-context">
<a href="/~group">~group</a>
.
<a href="/~group.recurring">recurring</a>
</div>
</header>
<main> <main>
<article id="topic-789" class="topic-full"> <article id="topic-789" class="topic-full">
<header> <header>

6
tests/samples/topic_text.html
View File

@ -6,6 +6,12 @@
</head> </head>
<body> <body>
<header>
<div class="site-header-context">
<a href="/~group">~group</a>
</div>
</header>
<main> <main>
<article id="topic-123" class="topic-full"> <article id="topic-123" class="topic-full">
<header> <header>

1
tests/snapshots/topic__deleted.snap
View File

@ -6,6 +6,7 @@ Topic {
author: Unknown, author: Unknown,
comment_total: 2, comment_total: 2,
content: Unknown, content: Unknown,
group: "~group",
id: "666", id: "666",
is_locked: false, is_locked: false,
is_official: false, is_official: false,

1
tests/snapshots/topic__link.snap
View File

@ -10,6 +10,7 @@ Topic {
content: Link( content: Link(
"https://tildes.net/~test", "https://tildes.net/~test",
), ),
group: "~group",
id: "456", id: "456",
is_locked: false, is_locked: false,
is_official: false, is_official: false,

1
tests/snapshots/topic__scheduled.snap
View File

@ -8,6 +8,7 @@ Topic {
content: Text( content: Text(
"<p>Scheduled Topic Text</p>", "<p>Scheduled Topic Text</p>",
), ),
group: "~group.recurring",
id: "789", id: "789",
is_locked: false, is_locked: false,
is_official: false, is_official: false,

1
tests/snapshots/topic__text.snap
View File

@ -10,6 +10,7 @@ Topic {
content: Text( content: Text(
"<p>Topic Text</p>", "<p>Topic Text</p>",
), ),
group: "~group",
id: "123", id: "123",
is_locked: true, is_locked: true,
is_official: false, is_official: false,