From f0474514f07325f3987522dfd91144b48761bab6 Mon Sep 17 00:00:00 2001
From: Dominic Breuker <dominic.breuker@gmail.com>
Date: Mon, 12 Mar 2018 08:47:29 +0100
Subject: [PATCH] refactor event parsing

---
 internal/fswatcher/inotify/inotify.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/internal/fswatcher/inotify/inotify.go b/internal/fswatcher/inotify/inotify.go
index 0ebb8e9..f60b28d 100644
--- a/internal/fswatcher/inotify/inotify.go
+++ b/internal/fswatcher/inotify/inotify.go
@@ -97,19 +97,26 @@ func (i *Inotify) ParseNextEvent(buf []byte) (*Event, uint32, error) {
 		return nil, offset, fmt.Errorf("unknown watcher ID: %d", sys.Wd)
 	}
 
+	return &Event{
+		Name: getEventName(watcher, sys, buf, offset),
+		Op:   getEventOp(sys),
+	}, offset, nil
+}
+
+func getEventName(watcher *Watcher, sys *unix.InotifyEvent, buf []byte, offset uint32) string {
 	name := watcher.Dir + "/"
 	if sys.Len > 0 && len(buf) >= int(offset) {
 		name += string(bytes.TrimRight(buf[unix.SizeofInotifyEvent:offset], "\x00"))
 	}
+	return name
+}
+
+func getEventOp(sys *unix.InotifyEvent) string {
 	op, ok := InotifyEvents[sys.Mask]
 	if !ok {
 		op = strconv.FormatInt(int64(sys.Mask), 2)
 	}
-
-	return &Event{
-		Name: name,
-		Op:   op,
-	}, offset, nil
+	return op
 }
 
 func (i *Inotify) Close() error {