1 files changed, 59 insertions, 6 deletions

diff --git a/ticket/src/actions.rs b/ticket/src/actions.rs
index 381c9f7..3e237ff 100644
--- a/ticket/src/actions.rs
+++ b/ticket/src/actions.rs
@@ -1,5 +1,11 @@
-use crate::Ticket;
-use anyhow::Result;
+use crate::{
+  Ticket,
+  TicketV0,
+};
+use anyhow::{
+  bail,
+  Result,
+};
 use log::*;
 use shared::find_root;
 use std::{
@@ -8,11 +14,11 @@ use std::{
 };
 
 pub fn get_open_tickets() -> Result<Vec<Ticket>> {
-  get_tickets(ticket_root()?.join("open"))
+  get_tickets(open_tickets()?)
 }
 
 pub fn get_closed_tickets() -> Result<Vec<Ticket>> {
-  get_tickets(ticket_root()?.join("closed"))
+  get_tickets(closed_tickets()?)
 }
 
 fn get_tickets(path: PathBuf) -> Result<Vec<Ticket>> {
@@ -24,13 +30,60 @@ fn get_tickets(path: PathBuf) -> Result<Vec<Ticket>> {
     trace!("Looking at entry {}.", path.display());
     if path.is_file() {
       trace!("Entry is a file.");
-      out.push(toml::from_slice::<Ticket>(&fs::read(&path)?)?);
+      match toml::from_slice::<Ticket>(&fs::read(&path)?) {
+        Ok(ticket) => out.push(ticket),
+        Err(e) => {
+          error!("Failed to parse ticket {}", path.canonicalize()?.display());
+          error!("Is the file an old ticket format? You might need to run `ticket migrate`.");
+          bail!("Underlying error was {}", e);
+        }
+      }
     }
   }
-  out.sort_by(|a, b| a.number.cmp(&b.number));
+  out.sort_by(|a, b| a.id.cmp(&b.id));
   Ok(out)
 }
 
 pub fn ticket_root() -> Result<PathBuf> {
   Ok(find_root()?.join(".dev-suite").join("ticket"))
 }
+
+pub fn closed_tickets() -> Result<PathBuf> {
+  Ok(ticket_root()?.join("closed"))
+}
+
+pub fn open_tickets() -> Result<PathBuf> {
+  Ok(ticket_root()?.join("open"))
+}
+
+// Old version ticket code to handle grabbing code
+pub fn get_all_ticketsv0() -> Result<Vec<TicketV0>> {
+  let mut tickets = get_open_ticketsv0()?;
+  tickets.extend(get_closed_ticketsv0()?);
+  Ok(tickets)
+}
+pub fn get_open_ticketsv0() -> Result<Vec<TicketV0>> {
+  get_ticketsv0(open_tickets()?)
+}
+
+pub fn get_closed_ticketsv0() -> Result<Vec<TicketV0>> {
+  get_ticketsv0(closed_tickets()?)
+}
+
+fn get_ticketsv0(path: PathBuf) -> Result<Vec<TicketV0>> {
+  let mut out = Vec::new();
+  debug!("Looking for ticket.");
+  for entry in fs::read_dir(&path)? {
+    let entry = entry?;
+    let path = entry.path();
+    trace!("Looking at entry {}.", path.display());
+    if path.is_file() {
+      trace!("Entry is a file.");
+      if let Ok(ticket) = toml::from_slice::<TicketV0>(&fs::read(&path)?) {
+        out.push(ticket);
+      }
+    }
+  }
+  out.sort_by(|a, b| a.number.cmp(&b.number));
+  Ok(out)
+}