From 5310566b81ae6bfe55aaabd25a653672035e84b8 Mon Sep 17 00:00:00 2001
From: Andrea Spacca <andrea.spacca@gmail.com>
Date: Mon, 18 Mar 2019 19:09:22 +0100
Subject: [PATCH] fixes

---
 server/handlers.go |  2 ++
 server/storage.go  | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/handlers.go b/server/handlers.go
index 8c8a937..5c989b5 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -390,6 +390,8 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
 
 	reader = r.Body
 
+	defer r.Body.Close()
+
 	if contentLength == -1 {
 		// queue file to disk, because s3 needs content length
 		var err error
diff --git a/server/storage.go b/server/storage.go
index 61d3d86..723b6dd 100644
--- a/server/storage.go
+++ b/server/storage.go
@@ -402,11 +402,11 @@ func (s *GDrive) findId(filename string, token string) (string, error) {
 
 	q := fmt.Sprintf("'%s' in parents and name='%s' and mimeType='%s' and trashed=false", s.rootId, token, GDriveDirectoryMimeType)
 	l, err := s.list(nextPageToken, q)
-	for 0 < len(l.Files) {
-		if err != nil {
-			return "", err
-		}
+	if err != nil {
+		return "", err
+	}
 
+	for 0 < len(l.Files) {
 		for _, fi := range l.Files {
 			tokenId = fi.Id
 			break
@@ -427,12 +427,11 @@ func (s *GDrive) findId(filename string, token string) (string, error) {
 
 	q = fmt.Sprintf("'%s' in parents and name='%s' and mimeType!='%s' and trashed=false", tokenId, filename, GDriveDirectoryMimeType)
 	l, err = s.list(nextPageToken, q)
+	if err != nil {
+		return "", err
+	}
 
 	for 0 < len(l.Files) {
-		if err != nil {
-			return "", err
-		}
-
 		for _, fi := range l.Files {
 
 			fileId = fi.Id