extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-12-24 15:58:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add homedir to context

Browse Source
This commit is contained in:
David Dworken 2022-09-21 20:19:11 -07:00
parent 569e2f3e61
commit 8002c5e942
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/hctx/hctx.go
View File

@ -108,6 +108,11 @@ func MakeContext() *context.Context {
panic(fmt.Errorf("failed to open local DB: %v", err)) panic(fmt.Errorf("failed to open local DB: %v", err))
} }
ctx = context.WithValue(ctx, hishtoryContextKey("db"), db) ctx = context.WithValue(ctx, hishtoryContextKey("db"), db)
homedir, err := os.UserHomeDir()
if err != nil {
panic(fmt.Errorf("failed to get homedir: %v", err))
}
ctx = context.WithValue(ctx, hishtoryContextKey("homedir"), homedir)
return &ctx return &ctx
} }
@ -127,6 +132,14 @@ func GetDb(ctx *context.Context) *gorm.DB {
panic(fmt.Errorf("failed to find db in ctx")) panic(fmt.Errorf("failed to find db in ctx"))
} }
func GetHome(ctx *context.Context) string {
v := (*ctx).Value(hishtoryContextKey("homedir"))
if v != nil {
return v.(string)
}
panic(fmt.Errorf("failed to find homedir in ctx"))
}
type ClientConfig struct { type ClientConfig struct {
// The user secret that is used to derive encryption keys for syncing history entries // The user secret that is used to derive encryption keys for syncing history entries
UserSecret string `json:"user_secret"` UserSecret string `json:"user_secret"`
@ -200,5 +213,3 @@ func InitConfig() error {
} }
return err return err
} }
// TODO: make homedir part of the context

14
client/lib/lib.go
View File

@ -54,15 +54,12 @@ var Version string = "Unknown"
// 256KB ought to be enough for any reasonable cmd // 256KB ought to be enough for any reasonable cmd
var maxSupportedLineLengthForImport = 256_000 var maxSupportedLineLengthForImport = 256_000
func getCwd() (string, string, error) { func getCwd(ctx *context.Context) (string, string, error) {
cwd, err := os.Getwd() cwd, err := os.Getwd()
if err != nil { if err != nil {
return "", "", fmt.Errorf("failed to get cwd for last command: %v", err) return "", "", fmt.Errorf("failed to get cwd for last command: %v", err)
} }
homedir, err := os.UserHomeDir() homedir := hctx.GetHome(ctx)
if err != nil {
return "", "", fmt.Errorf("failed to get user's home directory: %v", err)
}
if cwd == homedir { if cwd == homedir {
return "~/", homedir, nil return "~/", homedir, nil
} }
@ -96,7 +93,7 @@ func BuildHistoryEntry(ctx *context.Context, args []string) (*data.HistoryEntry,
entry.LocalUsername = user.Username entry.LocalUsername = user.Username
// cwd and homedir // cwd and homedir
cwd, homedir, err := getCwd() cwd, homedir, err := getCwd(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to build history entry: %v", err) return nil, fmt.Errorf("failed to build history entry: %v", err)
} }
@ -382,10 +379,7 @@ func ImportHistory(ctx *context.Context) (int, error) {
// Don't run an import if we already have run one. This avoids importing the same entry multiple times. // Don't run an import if we already have run one. This avoids importing the same entry multiple times.
return 0, nil return 0, nil
} }
homedir, err := os.UserHomeDir() homedir := hctx.GetHome(ctx)
if err != nil {
return 0, fmt.Errorf("failed to get user's home directory: %v", err)
}
historyEntries, err := parseBashHistory(homedir) historyEntries, err := parseBashHistory(homedir)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to parse bash history: %v", err) return 0, fmt.Errorf("failed to parse bash history: %v", err)