Sulkta-OSS/rustypipe
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: clean up response models

Browse source
This commit is contained in:
Theta-Dev 2022-10-17 11:26:00 +02:00
parent db6b1ab8a7
commit 999ebf7c36
7 changed files with 33 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/client/search.rs
View file

@ -93,21 +93,19 @@ impl MapResponse<SearchResult> for response::Search {
lang: Language,
_deobf: Option<&Deobfuscator>,
) -> Result<MapResult<SearchResult>, ExtractionError> {
let section_list_items = self
let items = self
.contents
.two_column_search_results_renderer
.primary_contents
.section_list_renderer
.contents;
let (items, ctoken) = map_section_list_items(section_list_items)?;
let mut mapper = response::YouTubeListMapper::<YouTubeItem>::new(lang);
mapper.map_response(items);
Ok(MapResult {
c: SearchResult {
items: Paginator::new(self.estimated_results, mapper.items, ctoken),
items: Paginator::new(self.estimated_results, mapper.items, mapper.ctoken),
corrected_query: mapper.corrected_query,
},
warnings: mapper.warnings,
@ -115,32 +113,6 @@ impl MapResponse<SearchResult> for response::Search {
}
}
fn map_section_list_items(
section_list_items: Vec<response::search::SectionListItem>,
) -> Result<(MapResult<Vec<response::YouTubeListItem>>, Option<String>), ExtractionError> {
let mut items = None;
let mut ctoken = None;
section_list_items.into_iter().for_each(|item| match item {
response::search::SectionListItem::ItemSectionRenderer { contents } => {
items = Some(contents);
}
response::search::SectionListItem::ContinuationItemRenderer {
continuation_endpoint,
} => {
ctoken = Some(continuation_endpoint.continuation_command.token);
}
});
let items = some_or_bail!(
items,
Err(ExtractionError::InvalidData(
"no item section renderer".into()
))
);
Ok((items, ctoken))
}
#[cfg(test)]
mod tests {
use std::{fs::File, io::BufReader, path::Path};