Merge pull request src-d#147 from root-gg/1.1.1

Version 1.1.1

Author: Charles-Antoine Mathieu

Makefile

@@ -24,7 +24,7 @@
 # THE SOFTWARE.
 ###
 
-RELEASE_VERSION="1.1"
+RELEASE_VERSION="1.1.1"
 RELEASE_DIR="release/plik-$(RELEASE_VERSION)"
 RELEASE_TARGETS=darwin-386 darwin-amd64 freebsd-386 \
 freebsd-amd64 linux-386 linux-amd64 linux-arm openbsd-386 \

README.md

@@ -19,16 +19,16 @@ Plik is an simple and powerful file uploading system written in golang.
    - Comments : Add custom message (in Markdown format)
 
 ### Version
-1.1
+1.1.1
 
 ### Installation
 
 ##### From release
 To run plik, it's very simple :
 ```sh
-$ wget https://github.com/root-gg/plik/releases/download/1.1/plik-1.1.tar.gz
-$ tar xvf plik-1.1.tar.gz
-$ cd plik-1.1/server
+$ wget https://github.com/root-gg/plik/releases/download/1.1.1/plik-1.1.1.tar.gz
+$ tar xvf plik-1.1.1.tar.gz
+$ cd plik-1.1.1/server
 $ ./plikd
 ```
 Et voilà ! You now have a fully functional instance of plik running on http://127.0.0.1:8080.  

client/plik.go

@@ -42,7 +42,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -605,13 +604,17 @@ func updateClient(updateFlag bool) (err error) {
 		return
 	}
 
-	// Download new client
-	tmpPath := filepath.Dir(path) + "/" + "." + filepath.Base(path) + ".tmp"
-	tmpFile, err := os.OpenFile(tmpPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0777)
+	// Create tmp file
+	tmpFile, err := ioutil.TempFile("", ".plik_update_")
 	if err != nil {
 		return
 	}
-	defer tmpFile.Close()
+	defer func() {
+		tmpFile.Close()
+		os.Remove(tmpFile.Name())
+	}()
+
+	// Download new client
 	URL, err = url.Parse(downloadURL)
 	if err != nil {
 		err = fmt.Errorf("Unable to download client : %s", err)
@@ -637,9 +640,14 @@ func updateClient(updateFlag bool) (err error) {
 		err = fmt.Errorf("Unable to download client : %s", err)
 		return
 	}
+	err = tmpFile.Close()
+	if err != nil {
+		err = fmt.Errorf("Unable to download client : %s", err)
+		return
+	}
 
 	// Check download integrity
-	downloadMD5, err := utils.FileMd5sum(tmpPath)
+	downloadMD5, err := utils.FileMd5sum(tmpFile.Name())
 	if err != nil {
 		err = fmt.Errorf("Unable to download client : %s", err)
 		return
@@ -650,7 +658,7 @@ func updateClient(updateFlag bool) (err error) {
 	}
 
 	// Replace old client
-	err = os.Rename(tmpPath, path)
+	err = os.Rename(tmpFile.Name(), path)
 	if err != nil {
 		err = fmt.Errorf("Unable to replace client : %s", err)
 		return

server/metadataBackend/file/file.go

@@ -321,7 +321,8 @@ func (fmb *MetadataBackend) GetUploadsToRemove(ctx *common.PlikContext) (ids []s
 			// Get upload metadata
 			upload, err := fmb.Get(ctx, uploadDirectory.Name())
 			if err != nil {
-				return ids, err
+				ctx.EWarningf("Unable to get upload metadata %s : %s", uploadDirectory.Name(), err)
+				continue
 			}
 
 			// If a TTL is set, test if expired or not

server/public/index.html

@@ -50,7 +50,7 @@
                 <div class="row">
                     <!-- HEADER LEFT -->
                     <div class="col-sm-3 text-center">
-                        <h1><a href="/">Plik</a></h1>
+                        <h1><a href="#/_">Plik</a></h1>
                     </div>
                     <!-- HEADER RIGHT -->
                     <div class="col-sm-9 text-right hidden-xs hidden-sm">