spankbang fix
This commit is contained in:
@@ -346,6 +346,7 @@ impl SpankbangProvider {
|
|||||||
|
|
||||||
fn get_video_items_from_html(&self, html: String) -> Vec<VideoItem> {
|
fn get_video_items_from_html(&self, html: String) -> Vec<VideoItem> {
|
||||||
let document = Html::parse_document(&html);
|
let document = Html::parse_document(&html);
|
||||||
|
let video_list_selector = Selector::parse(r#"[data-testid="video-list"]"#).unwrap();
|
||||||
let card_selector = Selector::parse(r#"[data-testid="video-item"]"#).unwrap();
|
let card_selector = Selector::parse(r#"[data-testid="video-item"]"#).unwrap();
|
||||||
let video_link_selector = Selector::parse(r#"a[href*="/video/"]"#).unwrap();
|
let video_link_selector = Selector::parse(r#"a[href*="/video/"]"#).unwrap();
|
||||||
let title_selector = Selector::parse(r#"a[title]"#).unwrap();
|
let title_selector = Selector::parse(r#"a[title]"#).unwrap();
|
||||||
@@ -359,7 +360,14 @@ impl SpankbangProvider {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let mut items = Vec::new();
|
let mut items = Vec::new();
|
||||||
for card in document.select(&card_selector) {
|
let roots = document.select(&video_list_selector).collect::<Vec<_>>();
|
||||||
|
let cards = if let Some(root) = roots.last() {
|
||||||
|
root.select(&card_selector).collect::<Vec<_>>()
|
||||||
|
} else {
|
||||||
|
document.select(&card_selector).collect::<Vec<_>>()
|
||||||
|
};
|
||||||
|
|
||||||
|
for card in cards {
|
||||||
if let Some(item) = self.parse_card(
|
if let Some(item) = self.parse_card(
|
||||||
card,
|
card,
|
||||||
&video_link_selector,
|
&video_link_selector,
|
||||||
@@ -688,4 +696,41 @@ mod tests {
|
|||||||
assert_eq!(items[0].id, "2");
|
assert_eq!(items[0].id, "2");
|
||||||
assert_eq!(items[0].title, "Free video");
|
assert_eq!(items[0].title, "Free video");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn prefers_primary_video_list_over_header_dropdown_cards() {
|
||||||
|
let provider = SpankbangProvider::new();
|
||||||
|
let html = r#"
|
||||||
|
<div data-testid="video-list">
|
||||||
|
<div data-testid="video-item" data-id="111">
|
||||||
|
<a href="/wrong/video/header-card">
|
||||||
|
<picture><img src="https://example.com/wrong.jpg" alt="Wrong header card" /></picture>
|
||||||
|
<div data-testid="video-item-length">5m</div>
|
||||||
|
</a>
|
||||||
|
<div data-testid="video-info-with-badge">
|
||||||
|
<span data-testid="views"><span>1K</span></span>
|
||||||
|
<p><a href="/wrong/video/header-card" title="Wrong header card"><span>Wrong header card</span></a></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div data-testid="video-list">
|
||||||
|
<div data-testid="video-item" data-id="222">
|
||||||
|
<a href="/right/video/adriana+chechik">
|
||||||
|
<picture><img src="https://example.com/right.jpg" alt="Right result" /></picture>
|
||||||
|
<div data-testid="video-item-length">17m</div>
|
||||||
|
</a>
|
||||||
|
<div data-testid="video-info-with-badge">
|
||||||
|
<span data-testid="views"><span>35K</span></span>
|
||||||
|
<span data-testid="rates"><span>96%</span></span>
|
||||||
|
<p><a href="/right/video/adriana+chechik" title="Right result"><span>Right result</span></a></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
let items = provider.get_video_items_from_html(html.to_string());
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
assert_eq!(items[0].id, "222");
|
||||||
|
assert_eq!(items[0].title, "Right result");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user