List snapshots, accept snapshot id prefix

Example:

    $ ./khepri snapshots
    ID        Date                 Source      Directory
    --------------------------------------------------------------------------------
    fa31d65b  2014-11-24 19:45:11  kasimir     /home/user/testdata
    20bdc140  2014-11-24 20:00:47  kasimir     /home/user/testdata
    326cb59d  2014-11-24 20:01:40  kasimir     /home/user/testdata
    20ff988b  2014-11-24 20:35:35  kasimir     /home/user
This commit is contained in:
Alexander Neumann
2014-11-24 21:12:32 +01:00
parent 26cd6c5372
commit 2c5d07a571
6 changed files with 137 additions and 19 deletions
+13 -2
View File
@@ -19,7 +19,17 @@ func commandCat(be backend.Server, key *khepri.Key, args []string) error {
id, err := backend.ParseID(args[1])
if err != nil {
return err
id = nil
if tpe != "snapshot" {
return err
}
// find snapshot id with prefix
id, err = backend.Find(be, backend.Snapshot, args[1])
if err != nil {
return err
}
}
ch, err := khepri.NewContentHandler(be, key)
@@ -105,7 +115,8 @@ func commandCat(be backend.Server, key *khepri.Key, args []string) error {
return nil
case "snapshot":
var sn khepri.Snapshot
err := ch.LoadJSONRaw(backend.Snapshot, id, &sn)
err = ch.LoadJSONRaw(backend.Snapshot, id, &sn)
if err != nil {
return err
}
+1 -1
View File
@@ -53,7 +53,7 @@ func commandLs(be backend.Server, key *khepri.Key, args []string) error {
return errors.New("usage: ls SNAPSHOT_ID [dir]")
}
id, err := backend.ParseID(args[0])
id, err := backend.FindSnapshot(be, args[0])
if err != nil {
return err
}
+1 -1
View File
@@ -14,7 +14,7 @@ func commandRestore(be backend.Server, key *khepri.Key, args []string) error {
return errors.New("usage: restore ID dir")
}
id, err := backend.ParseID(args[0])
id, err := backend.FindSnapshot(be, args[0])
if err != nil {
errx(1, "invalid id %q: %v", args[0], err)
}
+58 -13
View File
@@ -3,34 +3,79 @@ package main
import (
"errors"
"fmt"
"os"
"sort"
"strings"
"time"
"github.com/fd0/khepri"
"github.com/fd0/khepri/backend"
)
const TimeFormat = "02.01.2006 15:04:05 -0700"
const (
minute = 60
hour = 60 * minute
day = 24 * hour
week = 7 * day
)
const TimeFormat = "2006-01-02 15:04:05"
func reltime(t time.Time) string {
sec := uint64(time.Since(t).Seconds())
switch {
case sec > week:
return t.Format(TimeFormat)
case sec > day:
return fmt.Sprintf("%d days ago", sec/day)
case sec > hour:
return fmt.Sprintf("%d hours ago", sec/hour)
case sec > minute:
return fmt.Sprintf("%d minutes ago", sec/minute)
default:
return fmt.Sprintf("%d seconds ago", sec)
}
}
func commandSnapshots(be backend.Server, key *khepri.Key, args []string) error {
if len(args) != 0 {
return errors.New("usage: snapshots")
}
// ch, err := khepri.NewContentHandler(be, key)
// if err != nil {
// return err
// }
ch, err := khepri.NewContentHandler(be, key)
if err != nil {
return err
}
fmt.Printf("%-8s %-19s %-10s %s\n", "ID", "Date", "Source", "Directory")
fmt.Printf("%s\n", strings.Repeat("-", 80))
list := []*khepri.Snapshot{}
backend.EachID(be, backend.Snapshot, func(id backend.ID) {
// sn, err := ch.LoadSnapshot(id)
// if err != nil {
// fmt.Fprintf(os.Stderr, "error loading snapshot %s: %v\n", id, err)
// return
// }
sn, err := ch.LoadSnapshot(id)
if err != nil {
fmt.Fprintf(os.Stderr, "error loading snapshot %s: %v\n", id, err)
return
}
// fmt.Printf("snapshot %s\n %s at %s by %s\n",
// id, sn.Dir, sn.Time, sn.Username)
fmt.Println(id)
pos := sort.Search(len(list), func(i int) bool {
return list[i].Time.After(sn.Time)
})
if pos < len(list) {
list = append(list, nil)
copy(list[pos+1:], list[pos:])
list[pos] = sn
} else {
list = append(list, sn)
}
})
for _, sn := range list {
fmt.Printf("%-8s %-19s %-10s %s\n", sn.ID().String()[:8], sn.Time.Format(TimeFormat), sn.Hostname, sn.Dir)
}
return nil
}