Skip to content

Commit

Permalink
fix macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@holmofy
holmofy committed Aug 3, 2024
1 parent 787e163 commit 1cb4f0c
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 30 deletions.
69 changes: 45 additions & 24 deletions reqwest-scraper-macros/src/css_selector.rs
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
use std::str::FromStr;

use crate::utils::syn::{get_type_detail, PathType};
use darling::{ast::Data, util::Flag, FromDeriveInput, FromField};
use darling::{ast::Data, util::Flag, FromDeriveInput, FromField, FromMeta};
use proc_macro2::{Span, TokenStream};
use quote::quote;
use scraper::Selector;
use syn::{spanned::Spanned, DeriveInput, Error, Result};

#[derive(Debug)]
struct CssSelector(String);

#[derive(Debug, FromDeriveInput)]
#[darling(attributes(selector), supports(struct_named))]
struct CssSelectorScraper {
ident: syn::Ident,
generics: syn::Generics,
data: Data<(), CssSelectorStructField>,
path: Option<String>,
path: Option<CssSelector>,
}

#[derive(Debug, FromField)]
Expand Down Expand Up @@ -48,11 +53,10 @@ pub fn expand_derive_from_response(input: DeriveInput) -> syn::Result<TokenStrea

Ok(match scraper.path {
Some(selector) => {
check_selector(&selector)?;
quote! {
impl #impl_generics reqwest_scraper::FromCssSelector for #type_name #ty_generics #where_clause {
type CssSelectorExtractResult = reqwest_scraper::error::Result<std::vec::Vec<Self>>;
fn from_html(html: reqwest_scraper::css_selector::Html) -> Self::CssSelectorExtractResult {
impl #impl_generics ::reqwest_scraper::FromCssSelector for #type_name #ty_generics #where_clause {
type CssSelectorExtractResult = ::reqwest_scraper::error::Result<std::vec::Vec<Self>>;
fn from_html(html: ::reqwest_scraper::css_selector::Html) -> Self::CssSelectorExtractResult {
let list = html.select(#selector)?;
let mut result: Vec<Self> = std::vec::Vec::new();

Expand All @@ -69,9 +73,9 @@ pub fn expand_derive_from_response(input: DeriveInput) -> syn::Result<TokenStrea
}
}
None => quote! {
impl #impl_generics reqwest_scraper::FromCssSelector for #type_name #ty_generics #where_clause {
type CssSelectorExtractResult = reqwest_scraper::error::Result<Self>;
fn from_html(html: reqwest_scraper::css_selector::Html) -> Self::CssSelectorExtractResult {
impl #impl_generics ::reqwest_scraper::FromCssSelector for #type_name #ty_generics #where_clause {
type CssSelectorExtractResult = ::reqwest_scraper::error::Result<Self>;
fn from_html(html: ::reqwest_scraper::css_selector::Html) -> Self::CssSelectorExtractResult {
let item = &html;

Ok(Self {
Expand Down Expand Up @@ -103,17 +107,16 @@ fn generate_field_extractors(fields: Vec<&CssSelectorStructField>) -> Result<Vec
}
tokens.push(match &f.path {
Some(selector) => {
check_selector(&selector)?;
match ty {
PathType::Option=>quote! {
#field_ident: item.select(#selector)?.first().and_then(#extractor).into()
},
PathType::Vector=>quote! {
#field_ident: item.select(#selector)?.iter()
.map(|item|std::option::Option::Some(item).and_then(#extractor))
.map(|item|::std::option::Option::Some(item).and_then(#extractor))
.filter(|o|o.is_some())
.map(|o|o.unwrap().into())
.collect::<std::vec::Vec<_>>()
.collect::<::std::vec::Vec<_>>()
},
PathType::Other=>quote! {
#field_ident: item.select(#selector)?.first().and_then(#extractor).unwrap_or(#default.into()).into()
Expand All @@ -123,7 +126,7 @@ fn generate_field_extractors(fields: Vec<&CssSelectorStructField>) -> Result<Vec
None => {
match ty {
PathType::Option=>quote! {
#field_ident: std::option::Option::Some(item).and_then(#extractor).into()
#field_ident: ::std::option::Option::Some(item).and_then(#extractor).into()
},
PathType::Vector=>{
return Err(Error::new(
Expand All @@ -132,7 +135,7 @@ fn generate_field_extractors(fields: Vec<&CssSelectorStructField>) -> Result<Vec
));
},
PathType::Other=>quote! {
#field_ident: std::option::Option::Some(item).and_then(#extractor).unwrap_or(#default.into()).into()
#field_ident: ::std::option::Option::Some(item).and_then(#extractor).unwrap_or(#default.into()).into()
}
}
},
Expand All @@ -141,15 +144,6 @@ fn generate_field_extractors(fields: Vec<&CssSelectorStructField>) -> Result<Vec
return Ok(tokens);
}

fn check_selector(selector: &str) -> syn::Result<()> {
Selector::parse(selector).map(|_| ()).map_err(|err| {
syn::Error::new(
Span::call_site(),
format!("invalid css selector `{}`: {:?}", selector, err),
)
})
}

#[derive(Debug)]
pub enum Extractor {
Name,
Expand Down Expand Up @@ -220,12 +214,39 @@ impl quote::ToTokens for Extractor {
Self::Text => quote! {|e|Some(e.text())},
Self::Html => quote! {|e|Some(e.html())},
Self::InnerHtml => quote! {|e|Some(e.inner_html())},
Self::HasClass(class) => quote! {|e|Some(e.has_class(#class,reqwest_scraper::css_selector::CaseSensitivity::CaseSensitive))},
Self::HasClass(class) => quote! {|e|Some(e.has_class(#class,::reqwest_scraper::css_selector::CaseSensitivity::CaseSensitive))},
Self::Attr(attr) => quote! {|e|e.attr(#attr).map(|v|v.to_string())},
})
}
}

impl FromStr for CssSelector {
type Err = syn::Error;

fn from_str(selector: &str) -> Result<Self> {
Selector::parse(selector).map(|_| ()).map_err(|err| {
syn::Error::new(
Span::call_site(),
format!("invalid css selector `{}`: {:?}", selector, err),
)
});
Ok(CssSelector(selector.to_string()))
}
}

impl FromMeta for CssSelector {
fn from_string(s: &str) -> darling::Result<Self> {
s.parse().map_err(darling::Error::from)
}
}

impl quote::ToTokens for CssSelector {
fn to_tokens(&self, tokens: &mut TokenStream) {
let selector = &self.0;
tokens.extend(quote! {#selector})
}
}

#[test]
fn test_select_list() -> Result<()> {
let input = r#"
Expand Down
12 changes: 6 additions & 6 deletions reqwest-scraper-macros/src/xpath.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ pub fn expand_derive_from_response(input: DeriveInput) -> syn::Result<TokenStrea
Some(xpath) => {
let field_extractors = generate_list_item_field_extractors(fields)?;
quote! {
impl #impl_generics reqwest_scraper::FromXPath for #type_name #ty_generics #where_clause {
type XPathExtractResult = reqwest_scraper::error::Result<std::vec::Vec<Self>>;
fn from_xhtml(html: reqwest_scraper::xpath::XHtml) -> Self::XPathExtractResult {
impl #impl_generics ::reqwest_scraper::FromXPath for #type_name #ty_generics #where_clause {
type XPathExtractResult = ::reqwest_scraper::error::Result<std::vec::Vec<Self>>;
fn from_xhtml(html: ::reqwest_scraper::xpath::XHtml) -> Self::XPathExtractResult {
let list = html.select(#xpath)?.as_nodes();
let mut result: Vec<Self> = std::vec::Vec::new();

Expand All @@ -61,9 +61,9 @@ pub fn expand_derive_from_response(input: DeriveInput) -> syn::Result<TokenStrea
None => {
let field_extractors = generate_field_extractors(fields)?;
quote! {
impl #impl_generics reqwest_scraper::FromXPath for #type_name #ty_generics #where_clause {
type XPathExtractResult = reqwest_scraper::error::Result<Self>;
fn from_xhtml(html: reqwest_scraper::xpath::XHtml) -> Self::XPathExtractResult {
impl #impl_generics ::reqwest_scraper::FromXPath for #type_name #ty_generics #where_clause {
type XPathExtractResult = ::reqwest_scraper::error::Result<Self>;
fn from_xhtml(html: ::reqwest_scraper::xpath::XHtml) -> Self::XPathExtractResult {
let item = &html;

Ok(Self {
Expand Down

0 comments on commit 1cb4f0c

Please sign in to comment.