a
/
nat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use parseduration

This commit is contained in:
Eliot Whalan 2016-07-15 12:39:20 +10:00
parent fcee4082ac
commit 5ae8540ad7
No known key found for this signature in database
GPG Key ID: C0A42175139840D6
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/clone.html
View File

@ -451,12 +451,12 @@
</select>
<select id="expiry" name="expiry" class="form-control">
<option value="1">1 hour</option>
<option value="24">1 day</option>
<option value="24 * 7">1 week</option>
<option value="24 * 30">1 month</option>
<option value="24 * 365">1 year</option>
<option value="24 * (20 * 365)" selected>Forever</option>
<option value="1h">1 hour</option>
<option value="24h">1 day</option>
<option value="1w">1 week</option>
<option value="1m">1 month</option>
<option value="12m">1 year</option>
<option value="240m" selected>Forever</option>
</select>
<button type="submit" class="btn btn-raised btn-primary">Submit<div class="ripple-container"></div></button>

12
assets/index.html
View File

@ -450,12 +450,12 @@
</select>
<select id="expiry" name="expiry" class="form-control">
<option value="1">1 hour</option>
<option value="24">1 day</option>
<option value="24 * 7">1 week</option>
<option value="24 * 30">1 month</option>
<option value="24 * 365">1 year</option>
<option value="24 * (20 * 365)" selected>Forever</option>
<option value="1h">1 hour</option>
<option value="24h">1 day</option>
<option value="1w">1 week</option>
<option value="1m">1 month</option>
<option value="12m">1 year</option>
<option value="240m" selected>Forever</option>
</select>
<button type="submit" class="btn btn-raised btn-primary">Submit<div class="ripple-container"></div></button>
</div>

5
pastebin.go
View File

@ -14,7 +14,6 @@ import (
"io/ioutil"
"log"
"net/http"
"strconv"
"time"
// uniuri is used for easy random string generation
@ -108,9 +107,9 @@ func Sha1(paste string) string {
// DurationFromExpiry takes the expiry in string format and returns the duration
// that the paste will exist for
func DurationFromExpiry(expiry string) time.Duration {
i, err := strconv.ParseInt(expiry, 10, 64)
duration, err := time.ParseDuration(expiry)
Check(err)
return time.Hour * time.Duration(i)
return duration
}
// Save function handles the saving of each paste.