From 2437eed5869f25d56b313a65fc2a7d966f959fdb Mon Sep 17 00:00:00 2001
From: Deluan <github@deluan.com>
Date: Thu, 10 Mar 2016 09:37:35 -0500
Subject: [PATCH] Removed unnecessary "else"s

---
 engine/cover.go                   |  6 ++----
 scanner/importer.go               | 17 ++++++++++-------
 tests/mocks/mock_property_repo.go |  3 +--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/engine/cover.go b/engine/cover.go
index 5c0bc75e..52668976 100644
--- a/engine/cover.go
+++ b/engine/cover.go
@@ -53,11 +53,9 @@ func (c cover) Get(id string, size int, out io.Writer) error {
 
 	if size > 0 {
 		return resizeImage(reader, size, out)
-	} else {
-		_, err = io.Copy(out, reader)
-		return err
 	}
-
+	_, err = io.Copy(out, reader)
+	return err
 }
 
 func resizeImage(reader io.Reader, size int, out io.Writer) error {
diff --git a/scanner/importer.go b/scanner/importer.go
index 69e39aec..8174cef6 100644
--- a/scanner/importer.go
+++ b/scanner/importer.go
@@ -55,16 +55,19 @@ type Importer struct {
 
 func (i *Importer) Run() {
 	i.lastScan = i.lastModifiedSince()
-	if total, err := i.scanner.ScanLibrary(i.lastScan, i.mediaFolder); err != nil {
+
+	total, err := i.scanner.ScanLibrary(i.lastScan, i.mediaFolder)
+	if err != nil {
 		beego.Error("Error importing iTunes Library:", err)
 		return
-	} else {
-		beego.Debug("Found", total, "tracks,",
-			len(i.scanner.MediaFiles()), "songs,",
-			len(i.scanner.Albums()), "albums,",
-			len(i.scanner.Artists()), "artists",
-			len(i.scanner.Playlists()), "playlists")
 	}
+
+	beego.Debug("Found", total, "tracks,",
+		len(i.scanner.MediaFiles()), "songs,",
+		len(i.scanner.Albums()), "albums,",
+		len(i.scanner.Artists()), "artists",
+		len(i.scanner.Playlists()), "playlists")
+
 	if err := i.importLibrary(); err != nil {
 		beego.Error("Error persisting data:", err)
 	}
diff --git a/tests/mocks/mock_property_repo.go b/tests/mocks/mock_property_repo.go
index 92862968..9ba5c686 100644
--- a/tests/mocks/mock_property_repo.go
+++ b/tests/mocks/mock_property_repo.go
@@ -31,9 +31,8 @@ func (m *MockProperty) Put(id string, value string) error {
 func (m *MockProperty) Get(id string) (string, error) {
 	if m.err {
 		return "", errors.New("Error!")
-	} else {
-		return m.data[id], nil
 	}
+	return m.data[id], nil
 }
 
 func (m *MockProperty) DefaultGet(id string, defaultValue string) (string, error) {