From 71a57537efa39dbf82590f7995f051a9cf9612bc Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 15 Mar 2015 15:48:05 +0100
Subject: [PATCH] Report errors, ignore files and continue. Closes #108

---
 archiver.go  | 25 ++++++++++++++++++++++---
 pipe/pipe.go |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/archiver.go b/archiver.go
index ef6e6cd68..6a54f42a1 100644
--- a/archiver.go
+++ b/archiver.go
@@ -395,7 +395,12 @@ func (arch *Archiver) fileWorker(wg *sync.WaitGroup, p *Progress, done <-chan st
 			// check for errors
 			if e.Error() != nil {
 				debug.Log("Archiver.fileWorker", "job %v has errors: %v", e.Path(), e.Error())
-				panic(e.Error())
+				// TODO: integrate error reporting
+				fmt.Fprintf(os.Stderr, "error for %v: %v\n", e.Path(), e.Error())
+				// ignore this file
+				e.Result() <- nil
+				p.Report(Stat{Files: 1})
+				continue
 			}
 
 			node, err := NodeFromFileInfo(e.Fullpath(), e.Info())
@@ -432,7 +437,12 @@ func (arch *Archiver) fileWorker(wg *sync.WaitGroup, p *Progress, done <-chan st
 				debug.Log("Archiver.fileWorker", "   read and save %v, content: %v", e.Path(), node.Content)
 				node.blobs, err = arch.SaveFile(p, node)
 				if err != nil {
-					panic(err)
+					// TODO: integrate error reporting
+					fmt.Fprintf(os.Stderr, "error for %v: %v\n", node.path, err)
+					// ignore this file
+					e.Result() <- nil
+					p.Report(Stat{Files: 1})
+					continue
 				}
 			} else {
 				// report old data size
@@ -467,7 +477,16 @@ func (arch *Archiver) dirWorker(wg *sync.WaitGroup, p *Progress, done <-chan str
 
 			// wait for all content
 			for _, ch := range dir.Entries {
-				node := (<-ch).(*Node)
+				res := <-ch
+
+				// if we get a nil pointer here, an error has happened while
+				// processing this entry. Ignore it for now.
+				if res == nil {
+					continue
+				}
+
+				// else insert node
+				node := res.(*Node)
 				tree.Insert(node)
 
 				if node.Type == "dir" {
diff --git a/pipe/pipe.go b/pipe/pipe.go
index b301af60d..7090faa6c 100644
--- a/pipe/pipe.go
+++ b/pipe/pipe.go
@@ -130,7 +130,7 @@ func walk(basedir, dir string, done chan struct{}, jobs chan<- Job, res chan<- R
 		fi, err := os.Lstat(subpath)
 		if err != nil {
 			select {
-			case jobs <- Entry{info: fi, error: err, result: ch}:
+			case jobs <- Entry{info: fi, error: err, basedir: basedir, path: filepath.Join(relpath, name), result: ch}:
 			case <-done:
 				return errCancelled
 			}