Fix logging in repo, fix stale auth
This commit is contained in:
@@ -72,7 +72,6 @@ type ScreenHome struct {
|
||||
|
||||
func (s *ScreenHome) Init(a *App) {
|
||||
s.a, s.r = a, a.repo
|
||||
s.r.SetLogFunc(s.Log)
|
||||
|
||||
s.style = a.style
|
||||
|
||||
@@ -82,6 +81,7 @@ func (s *ScreenHome) Init(a *App) {
|
||||
return true
|
||||
})
|
||||
s.alert.SetCancelPressed(nil)
|
||||
s.alert.SetLogger(s.Log)
|
||||
|
||||
s.openPdsEntry = w.NewField("home.openpds.field", s.style)
|
||||
s.openPdsEntry.SetLabel("ID")
|
||||
@@ -170,6 +170,8 @@ func (s *ScreenHome) Init(a *App) {
|
||||
s.menuLayout.SetWidget(s.layout)
|
||||
s.layout.SetLogger(s.Log)
|
||||
s.columns.SetLogger(s.Log)
|
||||
|
||||
s.r.SetLogFunc(s.Log)
|
||||
}
|
||||
|
||||
func (s *ScreenHome) GetName() string { return "home" }
|
||||
@@ -209,14 +211,18 @@ func (s *ScreenHome) HandleKey(ev *tcell.EventKey) bool {
|
||||
}
|
||||
return s.openPdsEntry.HandleKey(ev)
|
||||
}
|
||||
|
||||
switch ev.Key() {
|
||||
case tcell.KeyCtrlO:
|
||||
return s.menuOpenPds()
|
||||
case tcell.KeyCtrlA:
|
||||
return s.addNewRecord()
|
||||
case tcell.KeyCtrlD:
|
||||
return s.deleteCurrentRecord()
|
||||
case tcell.KeyCtrlR:
|
||||
return s.menuRefreshPds()
|
||||
}
|
||||
|
||||
return s.menuLayout.HandleKey(ev)
|
||||
}
|
||||
func (s *ScreenHome) HandleTime(ev *tcell.EventTime) {
|
||||
@@ -530,12 +536,12 @@ func (s *ScreenHome) menuAuthPds() bool {
|
||||
time.Sleep(100)
|
||||
}
|
||||
s.alert.SetVisible(false)
|
||||
s.updatePdsListing()
|
||||
}()
|
||||
}
|
||||
}
|
||||
}()
|
||||
return true
|
||||
|
||||
}
|
||||
func (s *ScreenHome) menuOpenPds() bool {
|
||||
s.menuLayout.HideMenu()
|
||||
@@ -622,6 +628,32 @@ func (s *ScreenHome) getPds(atId string) {
|
||||
}()
|
||||
}
|
||||
|
||||
func (s *ScreenHome) addNewRecord() bool {
|
||||
if s.activePds == nil {
|
||||
return false
|
||||
}
|
||||
tn, err := s.pdsListing.GetActiveNode()
|
||||
if err != nil {
|
||||
s.Log("error getting active node")
|
||||
return true
|
||||
}
|
||||
tnPath := tn.GetValuePath()
|
||||
if len(tnPath) != 2 {
|
||||
return false
|
||||
}
|
||||
/*
|
||||
tnLabelPath := tn.GetLabelPath()
|
||||
nsid, err := syntax.ParseNSID(tnPath[0])
|
||||
if err != nil {
|
||||
s.Log("error parsing NSID from %s: %w", tnPath[0], err)
|
||||
return false
|
||||
}
|
||||
//tmplt := s.activePds.GetBlankRecordForNSID(nsid)
|
||||
//s.Log("%s", tmplt)
|
||||
*/
|
||||
return true
|
||||
}
|
||||
|
||||
func (s *ScreenHome) deleteCurrentRecord() bool {
|
||||
tn, err := s.pdsListing.GetActiveNode()
|
||||
if err != nil {
|
||||
@@ -639,17 +671,15 @@ func (s *ScreenHome) deleteCurrentRecord() bool {
|
||||
return false
|
||||
}
|
||||
rkey := tnPath[1]
|
||||
/*
|
||||
if err := s.r.DeleteRecord(s.activePds.Did, nsid, rkey); err != nil {
|
||||
s.Log("error deleting record: %w", err)
|
||||
}
|
||||
*/
|
||||
s.alert.SetTitle("Confirm Deletion")
|
||||
s.alert.SetMessage(fmt.Sprintf("Are you sure you want to delete this record?\n%s: %s\nThis cannot be undone.", tnLabelPath[0], tnLabelPath[1]))
|
||||
s.alert.SetVisible(true)
|
||||
s.alert.SetActive(true)
|
||||
s.alert.SetOkPressed(func() bool {
|
||||
s.r.DeleteRecord(s.activePds.Did, nsid, rkey)
|
||||
if err := s.r.DeleteRecord(s.activePds.Did, nsid, rkey); err != nil {
|
||||
panic(err)
|
||||
s.Log("! Error Deleting Record: %s / %s / %s", s.activePds.Did, nsid, rkey)
|
||||
}
|
||||
s.alert.SetVisible(false)
|
||||
s.alert.SetActive(false)
|
||||
return true
|
||||
@@ -659,7 +689,7 @@ func (s *ScreenHome) deleteCurrentRecord() bool {
|
||||
s.alert.SetActive(false)
|
||||
return true
|
||||
})
|
||||
s.alert.SetPos(w.Coord{X: s.w / 4, Y: s.h / 4})
|
||||
s.alert.HandleResize(w.Coord{X: s.w / 4, Y: s.h / 4}.ResizeEvent())
|
||||
s.alert.SetPos(w.Coord{X: (s.w / 2) - (s.alert.GetW() / 2), Y: (s.h / 2) - (s.alert.GetH() / 2)})
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user