Removed unnecessary "else"s

This commit is contained in:
Deluan
2016-03-10 09:37:35 -05:00
parent d8e6076d66
commit 2437eed586
3 changed files with 13 additions and 13 deletions
+1 -3
View File
@@ -53,13 +53,11 @@ func (c cover) Get(id string, size int, out io.Writer) error {
if size > 0 { if size > 0 {
return resizeImage(reader, size, out) return resizeImage(reader, size, out)
} else { }
_, err = io.Copy(out, reader) _, err = io.Copy(out, reader)
return err return err
} }
}
func resizeImage(reader io.Reader, size int, out io.Writer) error { func resizeImage(reader io.Reader, size int, out io.Writer) error {
img, _, err := image.Decode(reader) img, _, err := image.Decode(reader)
if err != nil { if err != nil {
+6 -3
View File
@@ -55,16 +55,19 @@ type Importer struct {
func (i *Importer) Run() { func (i *Importer) Run() {
i.lastScan = i.lastModifiedSince() 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) beego.Error("Error importing iTunes Library:", err)
return return
} else { }
beego.Debug("Found", total, "tracks,", beego.Debug("Found", total, "tracks,",
len(i.scanner.MediaFiles()), "songs,", len(i.scanner.MediaFiles()), "songs,",
len(i.scanner.Albums()), "albums,", len(i.scanner.Albums()), "albums,",
len(i.scanner.Artists()), "artists", len(i.scanner.Artists()), "artists",
len(i.scanner.Playlists()), "playlists") len(i.scanner.Playlists()), "playlists")
}
if err := i.importLibrary(); err != nil { if err := i.importLibrary(); err != nil {
beego.Error("Error persisting data:", err) beego.Error("Error persisting data:", err)
} }
+1 -2
View File
@@ -31,9 +31,8 @@ func (m *MockProperty) Put(id string, value string) error {
func (m *MockProperty) Get(id string) (string, error) { func (m *MockProperty) Get(id string) (string, error) {
if m.err { if m.err {
return "", errors.New("Error!") 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) { func (m *MockProperty) DefaultGet(id string, defaultValue string) (string, error) {