From c94956df1ca37f90a42b5f66ccb63213253e4d3e Mon Sep 17 00:00:00 2001
From: Bunchhieng <Bunchhieng@gmail.com>
Date: Thu, 15 Sep 2016 10:13:42 -0400
Subject: Refactored code

---
 todolist/app.go        | 9 +++++++--
 todolist/file_store.go | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'todolist')

diff --git a/todolist/app.go b/todolist/app.go
index 7f64366..44d97f5 100644
--- a/todolist/app.go
+++ b/todolist/app.go
@@ -153,8 +153,13 @@ func (a *App) getGroups(input string, todos []*Todo) *GroupedTodos {
 	return grouped
 }
 
-func (a *App) Load() {
-	a.TodoList.Load(a.TodoStore.Load())
+func (a *App) Load() error {
+	todos, err := a.TodoStore.Load()
+	if err != nil {
+		return err
+	}
+	a.TodoList.Load(todos)
+	return nil
 }
 
 func (a *App) Save() {
diff --git a/todolist/file_store.go b/todolist/file_store.go
index 61e6e7c..5413295 100644
--- a/todolist/file_store.go
+++ b/todolist/file_store.go
@@ -16,11 +16,12 @@ func NewFileStore() *FileStore {
 	return &FileStore{FileLocation: ".todos.json", Loaded: false}
 }
 
-func (f *FileStore) Load() []*Todo {
+func (f *FileStore) Load() ([]*Todo, error) {
 	data, err := ioutil.ReadFile(f.FileLocation)
 	if err != nil {
 		fmt.Println("No todo file found!")
 		fmt.Println("Initialize a new todo repo by running 'todo init'")
+		return nil, err
 		os.Exit(0)
 	}
 
@@ -28,11 +29,12 @@ func (f *FileStore) Load() []*Todo {
 	jerr := json.Unmarshal(data, &todos)
 	if jerr != nil {
 		fmt.Println("Error reading json data", jerr)
+		return nil, jerr
 		os.Exit(1)
 	}
 	f.Loaded = true
 
-	return todos
+	return todos, nil
 }
 
 func (f *FileStore) Initialize() {
-- 
cgit v1.3