Use time.Time in the Signature struct
This commit is contained in:
parent
4b40227697
commit
32a62bb01a
17
commit.go
17
commit.go
|
@ -58,22 +58,23 @@ func (c *Commit) Committer() *Signature {
|
||||||
type Signature struct {
|
type Signature struct {
|
||||||
Name string
|
Name string
|
||||||
Email string
|
Email string
|
||||||
UnixTime int64
|
When time.Time
|
||||||
Offset int
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func newSignatureFromC(sig *C.git_signature) *Signature {
|
func newSignatureFromC(sig *C.git_signature) *Signature {
|
||||||
|
// git stores minutes, go wants seconds
|
||||||
|
loc := time.FixedZone("", int(sig.when.offset)*60)
|
||||||
return &Signature{
|
return &Signature{
|
||||||
C.GoString(sig.name),
|
C.GoString(sig.name),
|
||||||
C.GoString(sig.email),
|
C.GoString(sig.email),
|
||||||
int64(sig.when.time),
|
time.Unix(int64(sig.when.time), 0).In(loc),
|
||||||
int(sig.when.offset),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sig *Signature) Time() time.Time {
|
// the offset in mintes, which is what git wants
|
||||||
loc := time.FixedZone("", sig.Offset*60)
|
func (v *Signature) Offset() int {
|
||||||
return time.Unix(sig.UnixTime, 0).In(loc)
|
_, offset := v.When.Zone()
|
||||||
|
return offset/60
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sig *Signature) toC() (*C.git_signature) {
|
func (sig *Signature) toC() (*C.git_signature) {
|
||||||
|
@ -85,7 +86,7 @@ func (sig *Signature) toC() (*C.git_signature) {
|
||||||
email := C.CString(sig.Email)
|
email := C.CString(sig.Email)
|
||||||
defer C.free(unsafe.Pointer(email))
|
defer C.free(unsafe.Pointer(email))
|
||||||
|
|
||||||
ret := C.git_signature_new(&out, name, email, C.git_time_t(sig.UnixTime), C.int(sig.Offset))
|
ret := C.git_signature_new(&out, name, email, C.git_time_t(sig.When.Unix()), C.int(sig.Offset()))
|
||||||
if ret < 0 {
|
if ret < 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue