Skip to content

Commit 87f3e5a

Browse files
authored
Merge pull request #68 from OrcaXS/fix/api-changes
fix: correct date serialization type to Option<String>
2 parents 7df1a35 + 0ffa13d commit 87f3e5a

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

src/bangumi/types.rs

+14-7
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,9 @@ pub struct SubjectBase {
106106
pub name: String,
107107
pub name_cn: String,
108108
pub summary: String,
109-
pub date: String,
110-
pub score: f32,
111-
pub rank: u32,
112-
pub images: Option<String>,
109+
pub date: Option<String>,
110+
pub rating: SubjectRating,
111+
pub images: SubjectImage,
113112
#[serde(default)]
114113
pub tags: Vec<Tag>,
115114
}
@@ -127,7 +126,11 @@ impl fmt::Display for SubjectBase {
127126
let strings = [
128127
format!("{}* {} / {}", prefix, self.name, self.name_cn),
129128
format!("{} Subject ID: {}", prefix, self.id),
130-
format!("{} Air Date: {}", prefix, self.date),
129+
format!(
130+
"{} Air Date: {}",
131+
prefix,
132+
self.date.as_deref().unwrap_or("*")
133+
),
131134
format!("{} URL: {}", prefix, self.url()),
132135
];
133136
write!(f, "{}", strings.join("\n"))
@@ -146,7 +149,7 @@ pub struct Subject {
146149
pub name_cn: String,
147150
pub summary: String,
148151
pub nsfw: bool,
149-
pub date: String,
152+
pub date: Option<String>,
150153
/// TV, Web, 欧美剧, PS4...
151154
pub platform: String,
152155
pub images: Option<SubjectImage>,
@@ -170,7 +173,11 @@ impl fmt::Display for Subject {
170173
let strings = [
171174
format!("{}* {} / {}", prefix, self.name, self.name_cn),
172175
format!("{}* {}", prefix, self.url()),
173-
format!("{}* Air Date: {}", prefix, self.date),
176+
format!(
177+
"{} Air Date: {}",
178+
prefix,
179+
self.date.as_deref().unwrap_or("*")
180+
),
174181
format!("{}* {}", prefix, self.summary),
175182
];
176183
write!(f, "{}", strings.join("\n"))

src/dantalian/data.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl From<BgmAnime> for AnimeData {
3939
poster: subject.images.map(|img| img.large),
4040
genres: vec![],
4141
tags: vec![],
42-
premiered: subject.date,
42+
premiered: subject.date.as_deref().unwrap_or("*").to_string(),
4343
status: None,
4444
studio: None,
4545
actors: Rc::from(Vec::new()),

src/nfogen/nfo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ impl Movie {
170170
poster: subject.images.map(|img| img.large),
171171
genres: vec![],
172172
tags: vec![],
173-
premiered: subject.date,
173+
premiered: subject.date.as_deref().unwrap_or("*").to_string(),
174174
status: None,
175175
studio: None,
176176
// TODO: Set real date.

0 commit comments

Comments
 (0)