From d130cfe8e1cd47e14cd7e84552dac5777006ece7 Mon Sep 17 00:00:00 2001 From: andreimarcu Date: Thu, 24 Sep 2015 08:30:16 -0400 Subject: [PATCH] Some cleanup --- templates/base.html | 4 ++-- templates/index.html | 4 ++-- upload.go | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/templates/base.html b/templates/base.html index 34e960c..4d2bad6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,11 +1,11 @@ - {% block title %}{{ sitename }}{% endblock %} + {% block title %}{{ sitename }}{% endblock %}
- {% block content %}{% endblock %} + {% block content %}{% endblock %}
diff --git a/templates/index.html b/templates/index.html index 568f158..3a7b105 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,7 +2,7 @@ {% block content %}
- - + +
{% endblock %} diff --git a/upload.go b/upload.go index 8a5016e..44021d8 100644 --- a/upload.go +++ b/upload.go @@ -77,16 +77,14 @@ func processUpload(upReq UploadRequest) (upload Upload, err error) { upload.Filename = strings.Join([]string{barename, extension}, ".") - dst, ferr := os.Create(path.Join("files/", upload.Filename)) - defer dst.Close() - if ferr != nil { - err = ferr + dst, err := os.Create(path.Join("files/", upload.Filename)) + if err != nil { return } + defer dst.Close() - bytes, cerr := io.Copy(dst, upReq.src) - if cerr != nil { - err = cerr + bytes, err := io.Copy(dst, upReq.src) + if err != nil { return } else if bytes == 0 { err = errors.New("Empty file")