lifegpc/pixiv_downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/pixiv_downloader.git synced 2026-07-08 01:32:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
lifegpc
2022-07-10 05:24:55 +00:00
committed by GitHub
parent 22185554c1
commit 3e796eee62
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/fanbox/article/block.rs
View File

@@ -1,4 +1,5 @@
use super::super::check::CheckUnkown;
use super::super::error::FanboxAPIError;
use json::JsonValue;
use proc_macros::check_json_keys;
use std::fmt::Debug;
@@ -26,8 +27,8 @@ impl FanboxArticleParagraphBoldStyle {
}
impl CheckUnkown for FanboxArticleParagraphBoldStyle {
fn check_unknown(&self) -> Result<(), crate::fanbox::error::FanboxAPIError> {
check_json_keys!("offset"+, "length"+,);
fn check_unknown(&self) -> Result<(), FanboxAPIError> {
check_json_keys!("offset"+, "length"+, "type",);
Ok(())
}
}
@@ -41,7 +42,7 @@ impl Debug for FanboxArticleParagraphBoldStyle {
}
}
#[derive(Debug)]
#[derive(proc_macros::CheckUnkown, Debug)]
pub enum FanboxArticleParagraphStyle {
Bold(FanboxArticleParagraphBoldStyle),
Unknown(JsonValue),
@@ -92,6 +93,21 @@ impl FanboxArticleParagraphBlock {
}
}
impl CheckUnkown for FanboxArticleParagraphBlock {
fn check_unknown(&self) -> Result<(), FanboxAPIError> {
check_json_keys!("styles", "text"+, "type",);
match self.styles() {
Some(styles) => {
for style in styles {
style.check_unknown()?;
}
}
None => {}
}
Ok(())
}
}
impl Debug for FanboxArticleParagraphBlock {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("FanboxArticleParagraphBlock")
@@ -101,7 +117,7 @@ impl Debug for FanboxArticleParagraphBlock {
}
}
#[derive(Debug)]
#[derive(proc_macros::CheckUnkown, Debug)]
pub enum FanboxArticleBlock {
Paragraph(FanboxArticleParagraphBlock),
Unknown(JsonValue),