Profouzors
/
ProfouzorsLinx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dyreshark breakages + fix small file with no extension bug

This commit is contained in:
andreimarcu 2015-10-07 01:15:45 -04:00
parent 3d55697adc
commit 11039d57f1
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
expiry.go
View File

@ -4,10 +4,12 @@ import (
"time" "time"
) )
var neverExpire = time.Unix(0, 0)
// Determine if a file with expiry set to "ts" has expired yet // Determine if a file with expiry set to "ts" has expired yet
func isTsExpired(ts time.Time) bool { func isTsExpired(ts time.Time) bool {
now := time.Now() now := time.Now()
return !ts.IsZero() && now.After(ts) return ts != neverExpire && now.After(ts)
} }
// Determine if the given filename is expired // Determine if the given filename is expired

2
meta.go
View File

@ -23,7 +23,7 @@ func metadataWrite(filename string, upload *Upload) error {
w := bufio.NewWriter(file) w := bufio.NewWriter(file)
fmt.Fprintln(w, upload.Expiry) fmt.Fprintln(w, upload.Expiry.Unix())
fmt.Fprintln(w, upload.DeleteKey) fmt.Fprintln(w, upload.DeleteKey)
return w.Flush() return w.Flush()

9
upload.go
View File

@ -199,8 +199,8 @@ func processUpload(upReq UploadRequest) (upload Upload, err error) {
if len(extension) == 0 { if len(extension) == 0 {
// Pull the first 512 bytes off for use in MIME detection // Pull the first 512 bytes off for use in MIME detection
header = make([]byte, 512) header = make([]byte, 512)
n, err := upReq.src.Read(header) n, _ := upReq.src.Read(header)
if n == 0 || err != nil { if n == 0 {
return upload, errors.New("Empty file") return upload, errors.New("Empty file")
} }
header = header[:n] header = header[:n]
@ -246,7 +246,10 @@ func processUpload(upReq UploadRequest) (upload Upload, err error) {
defer dst.Close() defer dst.Close()
// Get the rest of the metadata needed for storage // Get the rest of the metadata needed for storage
if upReq.expiry != 0 { if upReq.expiry == 0 {
upload.Expiry = neverExpire
} else {
upload.Expiry = time.Now().Add(upReq.expiry) upload.Expiry = time.Now().Add(upReq.expiry)
} }