extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-11-25 17:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak ImportHistory so that all entries are guaranteed to have sequential timestamps that are monotonically increasing

Browse Source
This commit is contained in:
David Dworken 2023-10-07 11:05:19 -07:00
parent 1593caa90f
commit f5264b6eff
No known key found for this signature in database
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/client_test.go
View File

@ -2489,7 +2489,8 @@ func TestImportHistory(t *testing.T) {
require.Equal(t, "305", out) require.Equal(t, "305", out)
out = tester.RunInteractiveShell(t, ` hishtory export -pipefail`) out = tester.RunInteractiveShell(t, ` hishtory export -pipefail`)
require.Contains(t, out, "echo command-305") require.Contains(t, out, "echo command-305")
out = tester.RunInteractiveShell(t, ` hishtory export -pipefail`)
testutils.CompareGoldens(t, out, "TestImportHistory-export")
// TODO: There is a bug here that will be evident if you check that the export is in the correct order on the remote device, because timestamps don't have sufficient granularity // TODO: There is a bug here that will be evident if you check that the export is in the correct order on the remote device, because timestamps don't have sufficient granularity
} }

7
client/lib/lib.go
View File

@ -290,6 +290,7 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
numEntriesImported := 0 numEntriesImported := 0
var iteratorError error = nil var iteratorError error = nil
var batch []data.HistoryEntry var batch []data.HistoryEntry
importTimestamp := time.Now().UTC()
batchSize := 100 batchSize := 100
entriesIter(func(cmd string, err error) bool { entriesIter(func(cmd string, err error) bool {
if err != nil { if err != nil {
@ -300,6 +301,8 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
if isBashWeirdness(cmd) || strings.HasPrefix(cmd, " ") { if isBashWeirdness(cmd) || strings.HasPrefix(cmd, " ") {
return true return true
} }
startTime := importTimestamp.Add(time.Millisecond * time.Duration(numEntriesImported*2))
endTime := startTime.Add(time.Millisecond)
entry := normalizeEntryTimezone(data.HistoryEntry{ entry := normalizeEntryTimezone(data.HistoryEntry{
LocalUsername: currentUser.Name, LocalUsername: currentUser.Name,
Hostname: hostname, Hostname: hostname,
@ -307,8 +310,8 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
CurrentWorkingDirectory: "Unknown", CurrentWorkingDirectory: "Unknown",
HomeDirectory: homedir, HomeDirectory: homedir,
ExitCode: 0, ExitCode: 0,
StartTime: time.Now().UTC(), StartTime: startTime,
EndTime: time.Now().UTC(), EndTime: endTime,
DeviceId: config.DeviceId, DeviceId: config.DeviceId,
EntryId: uuid.Must(uuid.NewRandom()).String(), EntryId: uuid.Must(uuid.NewRandom()).String(),
}) })