fix(starrail): Occationally skip one row

wormtql · May 9, 2024 · a39c151 · a39c151
1 parent 730e067
commit a39c151
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs b/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs
@@ -1,4 +1,4 @@
-use std::{cell::RefCell, ops::{Coroutine, CoroutineState}, pin::Pin, rc::Rc, sync::{mpsc::{self, Sender}}, time::SystemTime};
+use std::{cell::RefCell, ops::{Coroutine, CoroutineState}, pin::Pin, rc::Rc, sync::mpsc::{self, Sender}, time::SystemTime};
 
 use anyhow::Result;
 use clap::FromArgMatches;

diff --git a/yas-starrail/src/export/relic/config.rs b/yas-starrail/src/export/relic/config.rs
@@ -2,7 +2,7 @@ use crate::export::relic::export_format::StarRailRelicExportFormat;
 
 #[derive(clap::Args)]
 pub struct ExportRelicConfig {
-    #[arg(id = "format", long = "format", short = 'f', default_value_t = StarRailRelicExportFormat::March7th, help = "输出格式")]
+    #[arg(id = "format", long = "format", short = 'f', default_value_t = StarRailRelicExportFormat::HSR, help = "输出格式")]
     #[arg(value_enum)]
     pub format: StarRailRelicExportFormat,
 

diff --git a/yas-starrail/src/export/relic/export_format.rs b/yas-starrail/src/export/relic/export_format.rs
@@ -8,6 +8,6 @@ pub enum StarRailRelicExportFormat {
 
 impl Default for StarRailRelicExportFormat {
     fn default() -> Self {
-        Self::March7th
+        Self::HSR
     }
 }
diff --git a/yas-starrail/src/export/relic/hsr.rs b/yas-starrail/src/export/relic/hsr.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::ops::Deref;
 use nanoid::nanoid;
 use serde::{Serialize, Serializer};
@@ -178,6 +179,10 @@ impl<'a> Serialize for StarRailHSRFormat<'a> {
         root.serialize_entry("relics", &self.results)?;
         root.serialize_entry::<str, [usize; 0]>("characters", &[])?;
 
+        let mut metadata: HashMap<String, String> = HashMap::new();
+        metadata.insert(String::from("trailblazer"), String::from("Stelle"));
+        root.serialize_entry("metadata", &metadata);
+
         root.end()
     }
 }
diff --git a/yas-starrail/src/scanner_controller/repository_layout/scan_logic.rs b/yas-starrail/src/scanner_controller/repository_layout/scan_logic.rs
@@ -424,6 +424,6 @@ impl StarRailRepositoryScanController {
 
     #[inline(always)]
     fn estimate_scroll_length(&self, count: i32) -> i32 {
-        ((self.avg_scroll_one_row * count as f64 - 2.0).round() as i32).max(0)
+        ((self.avg_scroll_one_row * count as f64 - 3.0).round() as i32).max(0)
     }
 }