GithubBackup/bili-sync
1
0
Fork 0
mirror of https://github.com/amtoaer/bili-sync.git synced 2026-09-05 07:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 nfo 的 cdata 错误

Browse Source
This commit is contained in:
amtoaer
2024-03-31 19:28:15 +08:00
parent 511daa1768
commit 5e8b351ee4
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/utils.rs
+15 -12
View File
@@ -2,9 +2,10 @@ use std::collections::HashSet;
use std::path::Path; use std::path::Path;
use entity::*; use entity::*;
use filenamify::filenamify;
use migration::OnConflict; use migration::OnConflict;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use quick_xml::events::BytesText; use quick_xml::events::{BytesCData, BytesText};
use quick_xml::writer::Writer; use quick_xml::writer::Writer;
use quick_xml::Error; use quick_xml::Error;
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
@@ -107,7 +108,7 @@ pub async fn create_videos(
bvid: Set(v.bvid.clone()), bvid: Set(v.bvid.clone()),
name: Set(v.title.clone()), name: Set(v.title.clone()),
path: Set(Path::new(&favorite.path) path: Set(Path::new(&favorite.path)
.join( .join(filenamify(
TEMPLATE TEMPLATE
.render( .render(
"video", "video",
@@ -119,7 +120,7 @@ pub async fn create_videos(
}), }),
) )
.unwrap_or_else(|_| v.bvid.clone()), .unwrap_or_else(|_| v.bvid.clone()),
) ))
.to_str() .to_str()
.unwrap() .unwrap()
.to_owned()), .to_owned()),
@@ -238,7 +239,7 @@ impl<'a> NFOSerializer<'a> {
.write_inner_content_async::<_, _, Error>(|writer| async move { .write_inner_content_async::<_, _, Error>(|writer| async move {
writer writer
.create_element("plot") .create_element("plot")
.write_text_content_async(BytesText::new(&format!(r#"![CDATA[{}]]"#, &v.intro))) .write_cdata_content_async(BytesCData::new(&v.intro))
.await .await
.unwrap(); .unwrap();
writer.create_element("outline").write_empty_async().await.unwrap(); writer.create_element("outline").write_empty_async().await.unwrap();
@@ -266,7 +267,7 @@ impl<'a> NFOSerializer<'a> {
.unwrap(); .unwrap();
writer writer
.create_element("year") .create_element("year")
.write_text_content_async(BytesText::new(&v.pubtime.format("%Y").to_string())) .write_text_content_async(BytesText::new(&v.favtime.format("%Y").to_string()))
.await .await
.unwrap(); .unwrap();
if let Some(tags) = &v.tags { if let Some(tags) = &v.tags {
@@ -287,7 +288,7 @@ impl<'a> NFOSerializer<'a> {
.unwrap(); .unwrap();
writer writer
.create_element("aired") .create_element("aired")
.write_text_content_async(BytesText::new(&v.pubtime.format("%Y-%m-%d").to_string())) .write_text_content_async(BytesText::new(&v.favtime.format("%Y-%m-%d").to_string()))
.await .await
.unwrap(); .unwrap();
Ok(writer) Ok(writer)
@@ -301,7 +302,7 @@ impl<'a> NFOSerializer<'a> {
.write_inner_content_async::<_, _, Error>(|writer| async move { .write_inner_content_async::<_, _, Error>(|writer| async move {
writer writer
.create_element("plot") .create_element("plot")
.write_text_content_async(BytesText::new(&format!(r#"![CDATA[{}]]"#, &v.intro))) .write_cdata_content_async(BytesCData::new(&v.intro))
.await .await
.unwrap(); .unwrap();
writer.create_element("outline").write_empty_async().await.unwrap(); writer.create_element("outline").write_empty_async().await.unwrap();
@@ -329,7 +330,7 @@ impl<'a> NFOSerializer<'a> {
.unwrap(); .unwrap();
writer writer
.create_element("year") .create_element("year")
.write_text_content_async(BytesText::new(&v.pubtime.format("%Y").to_string())) .write_text_content_async(BytesText::new(&v.favtime.format("%Y").to_string()))
.await .await
.unwrap(); .unwrap();
if let Some(tags) = &v.tags { if let Some(tags) = &v.tags {
@@ -350,7 +351,7 @@ impl<'a> NFOSerializer<'a> {
.unwrap(); .unwrap();
writer writer
.create_element("aired") .create_element("aired")
.write_text_content_async(BytesText::new(&v.pubtime.format("%Y-%m-%d").to_string())) .write_text_content_async(BytesText::new(&v.favtime.format("%Y-%m-%d").to_string()))
.await .await
.unwrap(); .unwrap();
Ok(writer) Ok(writer)
@@ -371,7 +372,9 @@ impl<'a> NFOSerializer<'a> {
.unwrap(); .unwrap();
writer writer
.create_element("dateadded") .create_element("dateadded")
.write_text_content_async(BytesText::new(&v.pubtime.format("%Y-%m-%d").to_string())) .write_text_content_async(BytesText::new(
&v.pubtime.format("%Y-%m-%d %H:%M:%S").to_string(),
))
.await .await
.unwrap(); .unwrap();
writer writer
@@ -447,7 +450,7 @@ mod tests {
.unwrap(), .unwrap(),
r#"<?xml version="1.0" encoding="utf-8" standalone="yes"?> r#"<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<movie> <movie>
<plot>![CDATA[intro]]</plot> <plot><![CDATA[intro]]></plot>
<outline/> <outline/>
<title>name</title> <title>name</title>
<actor> <actor>
@@ -468,7 +471,7 @@ mod tests {
.unwrap(), .unwrap(),
r#"<?xml version="1.0" encoding="utf-8" standalone="yes"?> r#"<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<tvshow> <tvshow>
<plot>![CDATA[intro]]</plot> <plot><![CDATA[intro]]></plot>
<outline/> <outline/>
<title>name</title> <title>name</title>
<actor> <actor>