Restructure commands a bit

src/commands.rs

@@ -25,34 +25,32 @@ struct TimeDelta {
 }
 
 #[derive(Debug)]
-enum EndDate {
+struct EndDateSpec {
-    Fixed(NaiveDate),
+    end: Option<NaiveDate>,
-    Delta(DateDelta),
+    delta: Option<Delta>,
-}
-
-#[derive(Debug)]
-enum EndTime {
-    Fixed(NaiveTime),
-    Delta(TimeDelta),
 }
 
 #[derive(Debug)]
 struct DateSpec {
     start: NaiveDate,
-    end: Option<EndDate>,
+    start_time: Option<NaiveTime>,
-    repeat: Option<DateDelta>,
+    offset: Option<Delta>,
+    end: Option<EndDateSpec>,
+    repeat: Option<Delta>,
 }
 
-#[derive(Debug)]
+// #[derive(Debug)]
-struct TimeSpec {
+// struct FormulaSpec {
-    start: NaiveTime,
+//     start: (), // TODO Formula
-    end: Option<EndTime>,
+//     start_time: Option<NaiveTime>,
-}
+//     offset: Option<Delta>,
+//     end: Option<Delta>,
+// }
 
 #[derive(Debug)]
-struct WhenSpec {
+enum Spec {
-    date: DateSpec,
+    Date(DateSpec),
-    time: Option<TimeSpec>,
+    // Formula(FormulaSpec),
 }
 
 #[derive(Debug)]
@@ -64,7 +62,7 @@ struct Done {
 #[derive(Debug)]
 struct Task {
     title: String,
-    when: Option<WhenSpec>,
+    when: Option<Spec>,
     desc: Option<String>,
     dones: Vec<Done>,
 }
@@ -72,14 +70,14 @@ struct Task {
 #[derive(Debug)]
 struct Note {
     title: String,
-    when: WhenSpec,
+    when: Spec,
     desc: Option<String>,
 }
 
 #[derive(Debug)]
-enum BirthdaySpec {
+struct BirthdaySpec {
-    Date(NaiveDate),
+    date: NaiveDate,
-    DateWithoutYear { month: u8, day: u8 },
+    year_known: bool, // If year is unknown, use NaiveDate of year 0
 }
 
 #[derive(Debug)]