v1.3.0 新增干支年、干支月、干支日、干支时辰；新增童限的所属大运、开始年龄、结束年龄；废弃八字的建除十二值神；废弃农历日的当天年干支、当天月干支；废弃农历时辰的当时年干支、当时月干支、当时日干支；废弃童限的结束农历年；废弃大运的开始农历年、结束农历年；废弃小运的农历年；修复八字身宫计算错误的问题；优化包结构。

Author: 6tail

CHANGELOG.md

@@ -64,3 +64,15 @@
 1. 优化：简化代码。
 2. 优化：流年计算逻辑。
 3. 优化：优化节气推移。
+
+## [1.3.0] - 2025-04-18
+1. 新增：干支年、干支月、干支日、干支时辰。
+2. 新增：童限的所属大运、开始年龄、结束年龄。
+3. 废弃：八字的建除十二值神（建议从干支日中获取）。
+4. 废弃：农历日的当天年干支、当天月干支（建议从干支日中获取）。
+5. 废弃：农历时辰的当时年干支、当时月干支、当时日干支（建议从干支时辰中获取）。
+6. 废弃：童限的结束农历年（建议取结束干支年）。
+7. 废弃：大运的开始农历年、结束农历年（建议取开始干支年、结束干支年）。
+8. 废弃：小运的农历年（建议取干支年）。
+9. 修复：八字身宫计算错误的问题。
+10. 优化：包结构。

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tyme4rs"
-version = "1.1.8"
+version = "1.3.0"
 edition = "2021"
 authors = ["6tail <[email protected]>"]
 description = "Tyme是一个非常强大的日历工具库，可以看作 Lunar 的升级版，拥有更优的设计和扩展性，支持公历和农历、星座、干支、生肖、节气、法定假日等。"

src/tyme/culture/fetus.rs

@@ -4,7 +4,7 @@ use crate::tyme::culture::Direction;
 use crate::tyme::enums::Side;
 use crate::tyme::{Culture, LoopTyme, Tyme};
 use crate::tyme::lunar::{LunarDay, LunarMonth};
-use crate::tyme::sixtycycle::SixtyCycle;
+use crate::tyme::sixtycycle::{SixtyCycle, SixtyCycleDay};
 
 /// 逐日胎神
 #[derive(Debug, Clone)]
@@ -16,8 +16,7 @@ pub struct FetusDay {
 }
 
 impl FetusDay {
-  pub fn from_lunar_day(lunar_day: LunarDay) -> Self {
-    let sixty_cycle: SixtyCycle = lunar_day.get_sixty_cycle();
+  pub fn new(sixty_cycle: SixtyCycle) -> Self {
     let fetus_heaven_stem: FetusHeavenStem = FetusHeavenStem::from_index((sixty_cycle.get_heaven_stem().get_index() as isize) % 5);
     let fetus_earth_branch: FetusEarthBranch = FetusEarthBranch::from_index((sixty_cycle.get_earth_branch().get_index() as isize) % 6);
     let index: isize = [3, 3, 8, 8, 8, 8, 8, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, -9, -9, -9, -9, -9, -5, -5, -1, -1, -1, -3, -7, -7, -7, -7, -5, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 3, 3, 3, 3][sixty_cycle.get_index()];
@@ -32,6 +31,14 @@ impl FetusDay {
     }
   }
 
+  pub fn from_lunar_day(lunar_day: LunarDay) -> Self {
+    Self::new(lunar_day.get_sixty_cycle())
+  }
+
+  pub fn from_sixty_cycle_day(sixty_cycle_day: SixtyCycleDay) -> Self {
+    Self::new(sixty_cycle_day.get_sixty_cycle())
+  }
+
   pub fn get_fetus_heaven_stem(&self) -> FetusHeavenStem {
     self.fetus_heaven_stem.clone()
   }

src/tyme/culture/mod.rs

@@ -1429,7 +1429,6 @@ pub mod fetus;
 pub mod peng_zu;
 pub mod phenology;
 pub mod star;
-pub mod eightchar;
 pub mod plumrain;
 pub mod ren;
 

src/tyme/culture/eightchar/mod.rs renamed to src/tyme/eightchar/mod.rs

@@ -5,10 +5,10 @@ use lazy_static::lazy_static;
 
 use crate::tyme::{Culture, Tyme};
 use crate::tyme::culture::Duty;
-use crate::tyme::culture::eightchar::provider::{ChildLimitProvider, DefaultChildLimitProvider};
+use crate::tyme::eightchar::provider::{ChildLimitProvider, DefaultChildLimitProvider};
 use crate::tyme::enums::{Gender, YinYang};
 use crate::tyme::lunar::LunarYear;
-use crate::tyme::sixtycycle::{EarthBranch, HeavenStem, SixtyCycle};
+use crate::tyme::sixtycycle::{EarthBranch, HeavenStem, SixtyCycle, SixtyCycleYear};
 use crate::tyme::solar::{SolarDay, SolarTerm, SolarTime};
 
 pub mod provider;
@@ -79,12 +79,11 @@ impl EightChar {
   }
 
   pub fn get_body_sign(&self) -> SixtyCycle {
-    let mut offset: isize = (self.month.get_earth_branch().get_index() + self.hour.get_earth_branch().get_index()) as isize;
-    offset %= 12;
-    offset -= 1;
+    let offset: isize = (self.month.get_earth_branch().get_index() as isize + self.hour.get_earth_branch().get_index() as isize - 1) % 12;
     SixtyCycle::from_name(format!("{}{}", HeavenStem::from_index(((self.year.get_heaven_stem().get_index() as isize) + 1) * 2 + offset).get_name(), EarthBranch::from_index(2 + offset).get_name()).as_str())
   }
 
+  #[deprecated(since = "1.3.0", note = "please use SixtyCycleDay.get_duty() instead")]
   pub fn get_duty(&self) -> Duty {
     Duty::from_index((self.day.get_earth_branch().get_index() as isize) - (self.month.get_earth_branch().get_index() as isize))
   }
@@ -302,17 +301,48 @@ impl ChildLimit {
     self.info.get_end_time()
   }
 
+  /// 起始大运
   pub fn get_start_decade_fortune(&self) -> DecadeFortune {
     DecadeFortune::from_child_limit(self.clone(), 0)
   }
 
+  /// 所属大运
+  pub fn get_decade_fortune(&self) -> DecadeFortune {
+    DecadeFortune::from_child_limit(self.clone(), -1)
+  }
+
   pub fn get_start_fortune(&self) -> Fortune {
     Fortune::from_child_limit(self.clone(), 0)
   }
 
+  #[deprecated(since = "1.3.0", note = "please use get_end_sixty_cycle_year() instead")]
   pub fn get_end_lunar_year(&self) -> LunarYear {
     LunarYear::from_year(self.get_start_time().get_lunar_hour().get_year() + self.get_end_time().get_year() - self.get_start_time().get_year())
   }
+
+  /// 开始(即出生)干支年
+  pub fn get_start_sixty_cycle_year(&self) -> SixtyCycleYear {
+    SixtyCycleYear::from_year(self.get_start_time().get_year())
+  }
+
+  /// 结束(即起运)干支年
+  pub fn get_end_sixty_cycle_year(&self) -> SixtyCycleYear {
+    SixtyCycleYear::from_year(self.get_end_time().get_year())
+  }
+
+  /// 开始年龄
+  pub fn get_start_age(&self) -> usize {
+    1
+  }
+
+  /// 结束年龄
+  pub fn get_end_age(&self) -> usize {
+    let n: isize = self.get_end_sixty_cycle_year().get_year() - self.get_start_sixty_cycle_year().get_year();
+    if n > 1 {
+      return n as usize;
+    }
+    1
+  }
 }
 
 impl PartialEq for ChildLimit {
@@ -327,7 +357,7 @@ impl Eq for ChildLimit {}
 #[derive(Debug, Clone)]
 pub struct DecadeFortune {
   child_limit: ChildLimit,
-  index: usize,
+  index: isize,
 }
 
 impl Culture for DecadeFortune {
@@ -338,48 +368,60 @@ impl Culture for DecadeFortune {
 
 impl Tyme for DecadeFortune {
   fn next(&self, n: isize) -> Self {
-    Self::new(self.get_child_limit(), (self.index as isize + n) as usize)
+    Self::new(self.get_child_limit(), self.index + n)
   }
 }
 
 impl DecadeFortune {
-  pub fn new(child_limit: ChildLimit, index: usize) -> Self {
+  pub fn new(child_limit: ChildLimit, index: isize) -> Self {
     Self {
       child_limit,
       index,
     }
   }
 
-  pub fn from_child_limit(child_limit: ChildLimit, index: usize) -> Self {
+  pub fn from_child_limit(child_limit: ChildLimit, index: isize) -> Self {
     Self::new(child_limit, index)
   }
 
   pub fn get_child_limit(&self) -> ChildLimit {
     self.child_limit.clone()
   }
 
-  pub fn get_index(&self) -> usize {
+  pub fn get_index(&self) -> isize {
     self.index
   }
 
-  pub fn get_start_age(&self) -> usize {
-    (self.child_limit.get_end_time().get_year() - self.child_limit.get_start_time().get_year()) as usize + 1 + self.index * 10
+  pub fn get_start_age(&self) -> isize {
+    self.child_limit.get_end_sixty_cycle_year().get_year() - self.child_limit.get_start_sixty_cycle_year().get_year() + 1 + self.index * 10
   }
 
-  pub fn get_end_age(&self) -> usize {
+  pub fn get_end_age(&self) -> isize {
     self.get_start_age() + 9
   }
 
+  #[deprecated(since = "1.3.0", note = "please use get_start_sixty_cycle_year() instead")]
   pub fn get_start_lunar_year(&self) -> LunarYear {
-    self.child_limit.get_end_lunar_year().next(self.index as isize * 10)
+    LunarYear::from_year(self.child_limit.get_start_time().get_lunar_hour().get_year() + self.child_limit.get_end_time().get_year() - self.child_limit.get_start_time().get_year()).next(self.index * 10)
   }
 
-  pub fn get_end_lunar(&self) -> LunarYear {
-    self.get_start_lunar_year().next(9)
+  /// 开始干支年
+  pub fn get_start_sixty_cycle_year(&self) -> SixtyCycleYear {
+    self.child_limit.get_end_sixty_cycle_year().next(self.index * 10)
+  }
+
+  #[deprecated(since = "1.3.0", note = "please use get_end_sixty_cycle_year() instead")]
+  pub fn get_end_lunar_year(&self) -> LunarYear {
+    LunarYear::from_year(self.child_limit.get_start_time().get_lunar_hour().get_year() + self.child_limit.get_end_time().get_year() - self.child_limit.get_start_time().get_year()).next(self.index * 10 + 9)
+  }
+
+  /// 结束干支年
+  pub fn get_end_sixty_cycle_year(&self) -> SixtyCycleYear {
+    self.get_start_sixty_cycle_year().next(9)
   }
 
   pub fn get_sixty_cycle(&self) -> SixtyCycle {
-    let n: isize = self.index as isize + 1;
+    let n: isize = self.index + 1;
     self.child_limit.get_eight_char().get_month().next(if self.child_limit.is_forward() { n } else { -n })
   }
 
@@ -400,7 +442,7 @@ impl Eq for DecadeFortune {}
 #[derive(Debug, Clone)]
 pub struct Fortune {
   child_limit: ChildLimit,
-  index: usize,
+  index: isize,
 }
 
 impl Culture for Fortune {
@@ -411,40 +453,46 @@ impl Culture for Fortune {
 
 impl Tyme for Fortune {
   fn next(&self, n: isize) -> Self {
-    Self::new(self.get_child_limit(), (self.get_index() as isize + n) as usize)
+    Self::new(self.get_child_limit(), self.get_index() + n)
   }
 }
 
 impl Fortune {
-  pub fn new(child_limit: ChildLimit, index: usize) -> Self {
+  pub fn new(child_limit: ChildLimit, index: isize) -> Self {
     Self {
       child_limit,
       index,
     }
   }
 
-  pub fn from_child_limit(child_limit: ChildLimit, index: usize) -> Self {
+  pub fn from_child_limit(child_limit: ChildLimit, index: isize) -> Self {
     Self::new(child_limit, index)
   }
 
   pub fn get_child_limit(&self) -> ChildLimit {
     self.child_limit.clone()
   }
 
-  pub fn get_index(&self) -> usize {
+  pub fn get_index(&self) -> isize {
     self.index
   }
 
-  pub fn get_age(&self) -> usize {
-    (self.child_limit.get_end_time().get_year() - self.child_limit.get_start_time().get_year()) as usize + 1 + self.index
+  pub fn get_age(&self) -> isize {
+    self.child_limit.get_end_sixty_cycle_year().get_year() - self.child_limit.get_start_sixty_cycle_year().get_year() + 1 + self.index
   }
 
+  #[deprecated(since = "1.3.0", note = "please use get_sixty_cycle_year() instead")]
   pub fn get_lunar_year(&self) -> LunarYear {
-    self.child_limit.get_end_lunar_year().next(self.index as isize)
+    LunarYear::from_year(self.child_limit.get_start_time().get_lunar_hour().get_year() + self.child_limit.get_end_time().get_year() - self.child_limit.get_start_time().get_year()).next(self.index)
+  }
+
+  /// 干支年
+  pub fn get_sixty_cycle_year(&self) -> SixtyCycleYear {
+    self.child_limit.get_end_sixty_cycle_year().next(self.index)
   }
 
   pub fn get_sixty_cycle(&self) -> SixtyCycle {
-    let n: isize = self.get_age() as isize;
+    let n: isize = self.get_age();
     self.child_limit.get_eight_char().get_hour().next(if self.child_limit.is_forward() { n } else { -n })
   }
 }
@@ -460,8 +508,8 @@ impl Eq for Fortune {}
 #[cfg(test)]
 mod tests {
   use std::sync::MutexGuard;
-  use crate::tyme::culture::eightchar::{CHILD_LIMIT_PROVIDER, ChildLimit};
-  use crate::tyme::culture::eightchar::provider::{ChildLimitProvider, DefaultChildLimitProvider};
+  use crate::tyme::eightchar::{CHILD_LIMIT_PROVIDER, ChildLimit};
+  use crate::tyme::eightchar::provider::{ChildLimitProvider, DefaultChildLimitProvider};
   use crate::tyme::enums::Gender;
   use crate::tyme::solar::SolarTime;
 

src/tyme/culture/eightchar/provider.rs renamed to src/tyme/eightchar/provider.rs

@@ -1,5 +1,6 @@
-use crate::tyme::culture::eightchar::{ChildLimitInfo, EightChar};
+use crate::tyme::eightchar::{ChildLimitInfo, EightChar};
 use crate::tyme::lunar::LunarHour;
+use crate::tyme::sixtycycle::SixtyCycleHour;
 use crate::tyme::solar::{SolarMonth, SolarTerm, SolarTime};
 use crate::tyme::Tyme;
 
@@ -26,7 +27,7 @@ impl DefaultEightCharProvider {
 
 impl EightCharProvider for DefaultEightCharProvider {
   fn get_eight_char(&self, hour: LunarHour) -> EightChar {
-    EightChar::from_sixty_cycle(hour.get_year_sixty_cycle(), hour.get_month_sixty_cycle(), hour.get_day_sixty_cycle(), hour.get_sixty_cycle())
+    hour.get_sixty_cycle_hour().get_eight_char()
   }
 }
 
@@ -43,7 +44,8 @@ impl LunarSect2EightCharProvider {
 
 impl EightCharProvider for LunarSect2EightCharProvider {
   fn get_eight_char(&self, hour: LunarHour) -> EightChar {
-    EightChar::from_sixty_cycle(hour.get_year_sixty_cycle(), hour.get_month_sixty_cycle(), hour.get_lunar_day().get_sixty_cycle(), hour.get_sixty_cycle())
+    let h: SixtyCycleHour = hour.get_sixty_cycle_hour();
+    EightChar::from_sixty_cycle(h.get_year(), h.get_month(), hour.get_lunar_day().get_sixty_cycle(), h.get_sixty_cycle())
   }
 }
 

src/tyme/festival.rs

@@ -264,7 +264,7 @@ impl LunarFestival {
   }
 
   pub fn get_day(&self) -> LunarDay {
-    self.day
+    self.day.clone()
   }
 
   pub fn get_solar_term(&self) -> Option<SolarTerm> {