v1.1.1 新增五行和方位互转；新增天干五合、地支六合、地支六害；优化性能；告别烦人的unwrap。

Author: 6tail

CHANGELOG.md

@@ -25,3 +25,9 @@
 3. 新增：每日宜忌、时辰宜忌。
 4. 修复：农历日获取时辰列表遇闰月报错的问题。
 5. 修复：获取当年第几周报错的问题。
+
+## [1.1.1] - 2024-07-30
+1. 新增：五行和方位互转。
+2. 新增：天干五合、地支六合、地支六害。
+3. 优化：性能。
+4. 优化：告别烦人的unwrap。

Cargo.toml

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

src/tyme/culture/dog.rs

@@ -10,8 +10,8 @@ pub struct Dog {
 }
 
 impl Tyme for Dog {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::from_index(self.parent.next_index(n) as isize))
+  fn next(&self, n: isize) -> Self {
+    Self::from_index(self.parent.next_index(n) as isize)
   }
 }
 
@@ -28,10 +28,10 @@ impl Dog {
     }
   }
 
-  pub fn from_name(name: &str) -> Result<Self, String> {
-    Ok(Self {
-      parent: LoopTyme::from_name(DOG_NAMES.to_vec().iter().map(|x| x.to_string()).collect(), name).unwrap()
-    })
+  pub fn from_name(name: &str) -> Self {
+    Self {
+      parent: LoopTyme::from_name(DOG_NAMES.to_vec().iter().map(|x| x.to_string()).collect(), name)
+    }
   }
 
   pub fn get_index(&self) -> usize {

src/tyme/culture/eightchar/mod.rs

@@ -28,10 +28,10 @@ impl Culture for EightChar {
 impl EightChar {
   pub fn new(year: &str, month: &str, day: &str, hour: &str) -> Self {
     Self {
-      year: SixtyCycle::from_name(year).unwrap(),
-      month: SixtyCycle::from_name(month).unwrap(),
-      day: SixtyCycle::from_name(day).unwrap(),
-      hour: SixtyCycle::from_name(hour).unwrap(),
+      year: SixtyCycle::from_name(year),
+      month: SixtyCycle::from_name(month),
+      day: SixtyCycle::from_name(day),
+      hour: SixtyCycle::from_name(hour),
     }
   }
 
@@ -61,25 +61,25 @@ impl EightChar {
   }
 
   pub fn get_fetal_origin(&self) -> SixtyCycle {
-    SixtyCycle::from_name(format!("{}{}", self.month.get_heaven_stem().next(1).unwrap().get_name(), self.month.get_earth_branch().next(3).unwrap().get_name()).as_str()).unwrap()
+    SixtyCycle::from_name(format!("{}{}", self.month.get_heaven_stem().next(1).get_name(), self.month.get_earth_branch().next(3).get_name()).as_str())
   }
 
   pub fn get_fetal_breath(&self) -> SixtyCycle {
-    SixtyCycle::from_name(format!("{}{}", self.day.get_heaven_stem().next(5).unwrap().get_name(), EarthBranch::from_index(13 - (self.day.get_earth_branch().get_index() as isize)).get_name()).as_str()).unwrap()
+    SixtyCycle::from_name(format!("{}{}", self.day.get_heaven_stem().next(5).get_name(), EarthBranch::from_index(13 - (self.day.get_earth_branch().get_index() as isize)).get_name()).as_str())
   }
 
   pub fn get_own_sign(&self) -> SixtyCycle {
-    let mut offset: isize = (self.month.get_earth_branch().next(-1).unwrap().get_index() + self.hour.get_earth_branch().next(-1).unwrap().get_index()) as isize;
+    let mut offset: isize = (self.month.get_earth_branch().next(-1).get_index() + self.hour.get_earth_branch().next(-1).get_index()) as isize;
     offset = if offset >= 14 { 26 } else { 14 } - offset;
     offset -= 1;
-    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()).unwrap()
+    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())
   }
 
   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;
-    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()).unwrap()
+    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())
   }
 
   pub fn get_duty(&self) -> Duty {
@@ -89,13 +89,13 @@ impl EightChar {
   pub fn get_solar_times(&self, start_year: isize, end_year: isize) -> Vec<SolarTime> {
     let mut l: Vec<SolarTime> = Vec::new();
     // 月地支距寅月的偏移值
-    let mut m: isize = self.month.get_earth_branch().next(-2).unwrap().get_index() as isize;
+    let mut m: isize = self.month.get_earth_branch().next(-2).get_index() as isize;
     // 月天干要一致
     if HeavenStem::from_index((self.year.get_heaven_stem().get_index() as isize + 1) * 2 + m) != self.month.get_heaven_stem() {
       return l;
     }
     // 1年的立春是辛酉，序号57
-    let mut y: isize = self.year.next(-57).unwrap().get_index() as isize + 1;
+    let mut y: isize = self.year.next(-57).get_index() as isize + 1;
     // 节令偏移值
     m *= 2;
     // 时辰地支转时刻，子时按零点算
@@ -107,24 +107,24 @@ impl EightChar {
         let mut term: SolarTerm = SolarTerm::from_index(y, 3);
         // 节令推移，年干支和月干支就都匹配上了
         if m > 0 {
-          term = term.next(m).unwrap();
+          term = term.next(m);
         }
         let solar_time: SolarTime = term.get_julian_day().get_solar_time();
         if solar_time.get_year() >= start_year {
           let mut mi: usize = 0;
           let mut s: usize = 0;
           // 日干支和节令干支的偏移值
           let mut solar_day: SolarDay = solar_time.get_solar_day();
-          let d: isize = self.day.next(-(solar_day.get_lunar_day().get_sixty_cycle().get_index() as isize)).unwrap().get_index() as isize;
+          let d: isize = self.day.next(-(solar_day.get_lunar_day().get_sixty_cycle().get_index() as isize)).get_index() as isize;
           if d > 0 {
             // 从节令推移天数
-            solar_day = solar_day.next(d).unwrap();
+            solar_day = solar_day.next(d);
           } else if h == solar_time.get_hour() {
             // 如果正好是节令当天，且小时和节令的小时数相等的极端情况，把分钟和秒钟带上
             mi = solar_time.get_minute();
             s = solar_time.get_second();
           }
-          let time: SolarTime = SolarTime::from_ymd_hms(solar_day.get_year(), solar_day.get_month(), solar_day.get_day(), h, mi, s).unwrap();
+          let time: SolarTime = SolarTime::from_ymd_hms(solar_day.get_year(), solar_day.get_month(), solar_day.get_day(), h, mi, s);
           // 验证一下
           if time.get_lunar_hour().get_eight_char() == *self {
             l.push(time);
@@ -232,10 +232,10 @@ impl ChildLimit {
     let forward: bool = (yang && man) || (!yang && !man);
     let mut term: SolarTerm = birth_time.get_term();
     if !term.is_jie() {
-      term = term.next(-1).unwrap();
+      term = term.next(-1);
     }
     if forward {
-      term = term.next(2).unwrap();
+      term = term.next(2);
     }
     let info: ChildLimitInfo = provider.get_info(birth_time, term);
 
@@ -318,8 +318,8 @@ impl Culture for DecadeFortune {
 }
 
 impl Tyme for DecadeFortune {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::new(self.get_child_limit(), (self.index as isize + n) as usize))
+  fn next(&self, n: isize) -> Self {
+    Self::new(self.get_child_limit(), (self.index as isize + n) as usize)
   }
 }
 
@@ -352,16 +352,16 @@ impl DecadeFortune {
   }
 
   pub fn get_start_lunar_year(&self) -> LunarYear {
-    self.child_limit.get_end_time().get_lunar_hour().get_lunar_day().get_lunar_month().get_lunar_year().next(self.index as isize * 10).unwrap()
+    self.child_limit.get_end_time().get_lunar_hour().get_lunar_day().get_lunar_month().get_lunar_year().next(self.index as isize * 10)
   }
 
   pub fn get_end_lunar(&self) -> LunarYear {
-    self.get_start_lunar_year().next(9).unwrap()
+    self.get_start_lunar_year().next(9)
   }
 
   pub fn get_sixty_cycle(&self) -> SixtyCycle {
     let n: isize = self.index as isize + 1;
-    self.child_limit.get_eight_char().get_month().next(if self.child_limit.is_forward() { n } else { -n }).unwrap()
+    self.child_limit.get_eight_char().get_month().next(if self.child_limit.is_forward() { n } else { -n })
   }
 
   pub fn get_start_fortune(&self) -> Fortune {
@@ -391,8 +391,8 @@ impl Culture for Fortune {
 }
 
 impl Tyme for Fortune {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::new(self.get_child_limit(), (self.get_index() as isize + n) as usize))
+  fn next(&self, n: isize) -> Self {
+    Self::new(self.get_child_limit(), (self.get_index() as isize + n) as usize)
   }
 }
 
@@ -421,12 +421,12 @@ impl Fortune {
   }
 
   pub fn get_lunar_year(&self) -> LunarYear {
-    self.child_limit.get_end_time().get_lunar_hour().get_lunar_day().get_lunar_month().get_lunar_year().next(self.index as isize).unwrap()
+    self.child_limit.get_end_time().get_lunar_hour().get_lunar_day().get_lunar_month().get_lunar_year().next(self.index as isize)
   }
 
   pub fn get_sixty_cycle(&self) -> SixtyCycle {
     let n: isize = self.get_age() as isize;
-    self.child_limit.get_eight_char().get_hour().next(if self.child_limit.is_forward() { n } else { -n }).unwrap()
+    self.child_limit.get_eight_char().get_hour().next(if self.child_limit.is_forward() { n } else { -n })
   }
 }
 

src/tyme/culture/eightchar/provider.rs

@@ -43,17 +43,17 @@ impl ChildLimitProvider for DefaultChildLimitProvider {
     d += h / 24;
     h %= 24;
 
-    let mut sm: SolarMonth = SolarMonth::from_ym(birth_time.get_year() + year as isize, birth_time.get_month()).unwrap().next(month as isize).unwrap();
+    let mut sm: SolarMonth = SolarMonth::from_ym(birth_time.get_year() + year as isize, birth_time.get_month()).next(month as isize);
 
     let dc: usize = sm.get_day_count();
     if d > dc {
       d -= dc;
-      sm = sm.next(1).unwrap();
+      sm = sm.next(1);
     }
 
     ChildLimitInfo {
       start_time: birth_time,
-      end_time: SolarTime::from_ymd_hms(sm.get_year(), sm.get_month(), d, h, mi, birth_time.get_second()).unwrap(),
+      end_time: SolarTime::from_ymd_hms(sm.get_year(), sm.get_month(), d, h, mi, birth_time.get_second()),
       year_count: year,
       month_count: month,
       day_count: day,
@@ -83,18 +83,18 @@ impl ChildLimitProvider for China95ChildLimitProvider {
     minutes %= 360;
     let day: usize = minutes / 12;
 
-    let mut sm: SolarMonth = SolarMonth::from_ym(birth_time.get_year() + year as isize, birth_time.get_month()).unwrap().next(month as isize).unwrap();
+    let mut sm: SolarMonth = SolarMonth::from_ym(birth_time.get_year() + year as isize, birth_time.get_month()).next(month as isize);
 
     let mut d: usize = birth_time.get_day() + day;
     let dc: usize = sm.get_day_count();
     if d > dc {
       d -= dc;
-      sm = sm.next(1).unwrap();
+      sm = sm.next(1);
     }
 
     ChildLimitInfo {
       start_time: birth_time,
-      end_time: SolarTime::from_ymd_hms(sm.get_year(), sm.get_month(), d, birth_time.get_hour(), birth_time.get_minute(), birth_time.get_second()).unwrap(),
+      end_time: SolarTime::from_ymd_hms(sm.get_year(), sm.get_month(), d, birth_time.get_hour(), birth_time.get_minute(), birth_time.get_second()),
       year_count: year,
       month_count: month,
       day_count: day,

src/tyme/culture/fetus.rs

@@ -98,8 +98,8 @@ pub struct FetusHeavenStem {
 }
 
 impl Tyme for FetusHeavenStem {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::from_index(self.parent.next_index(n) as isize))
+  fn next(&self, n: isize) -> Self {
+    Self::from_index(self.parent.next_index(n) as isize)
   }
 }
 
@@ -154,8 +154,8 @@ pub struct FetusEarthBranch {
 }
 
 impl Tyme for FetusEarthBranch {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::from_index(self.parent.next_index(n) as isize))
+  fn next(&self, n: isize) -> Self {
+    Self::from_index(self.parent.next_index(n) as isize)
   }
 }
 
@@ -210,8 +210,8 @@ pub struct FetusMonth {
 }
 
 impl Tyme for FetusMonth {
-  fn next(&self, n: isize) -> Result<Self, String> {
-    Ok(Self::from_index(self.parent.next_index(n) as isize))
+  fn next(&self, n: isize) -> Self {
+    Self::from_index(self.parent.next_index(n) as isize)
   }
 }
 
@@ -270,16 +270,16 @@ mod tests {
 
   #[test]
   fn test1() {
-    assert_eq!("碓磨厕 外东南", SolarDay::from_ymd(2021, 11, 13).unwrap().get_lunar_day().get_fetus_day().get_name());
+    assert_eq!("碓磨厕 外东南", SolarDay::from_ymd(2021, 11, 13).get_lunar_day().get_fetus_day().get_name());
   }
 
   #[test]
   fn test2() {
-    assert_eq!("占门碓 外东南", SolarDay::from_ymd(2021, 11, 12).unwrap().get_lunar_day().get_fetus_day().get_name());
+    assert_eq!("占门碓 外东南", SolarDay::from_ymd(2021, 11, 12).get_lunar_day().get_fetus_day().get_name());
   }
 
   #[test]
   fn test3() {
-    assert_eq!("厨灶厕 外西南", SolarDay::from_ymd(2011, 11, 12).unwrap().get_lunar_day().get_fetus_day().get_name());
+    assert_eq!("厨灶厕 外西南", SolarDay::from_ymd(2011, 11, 12).get_lunar_day().get_fetus_day().get_name());
   }
 }