@@ -20,9 +20,9 @@ def view_all_entries(options, kp_entries, dbname):
2020 # Have to number each entry to capture duplicates correctly
2121 kps = str ("\n " ).join ([kp_entry_pattern .format (j ,
2222 os .path .join ("/" .join (i .path [:- 1 ]),
23- i . deref ( 'title' ) or "" ),
24- i . deref ( 'username' ) or "" ,
25- i . deref ( 'url' ) or "" ,
23+ keepmenu . safe_deref ( i , 'title' )),
24+ keepmenu . safe_deref ( i , 'username' ),
25+ keepmenu . safe_deref ( i , 'url' ),
2626 na = num_align )
2727 for j , i in enumerate (kp_entries )])
2828 if options :
@@ -50,13 +50,13 @@ def view_entry(kp_entry):
5050 Returns: dmenu selection
5151
5252 """
53- fields = [os .path .join ("/" .join (kp_entry .path [:- 1 ]), kp_entry . deref ( 'title' ) or "" )
53+ fields = [os .path .join ("/" .join (kp_entry .path [:- 1 ]), keepmenu . safe_deref ( kp_entry , 'title' ))
5454 or "Title: None" ,
55- kp_entry . deref ( 'username' ) or "Username: None" ,
56- '**********' if kp_entry . deref ( 'password' ) else "Password: None" ,
55+ keepmenu . safe_deref ( kp_entry , 'username' ) or "Username: None" ,
56+ '**********' if keepmenu . safe_deref ( kp_entry , 'password' ) else "Password: None" ,
5757 "TOTP: ******" if get_otp_url (kp_entry ) else "TOTP: None" ,
58- kp_entry . deref ( 'url' ) or "URL: None" ,
59- "Notes: <Enter to view>" if kp_entry . deref ( 'notes' ) else "Notes: None" ,
58+ keepmenu . safe_deref ( kp_entry , 'url' ) or "URL: None" ,
59+ "Notes: <Enter to view>" if keepmenu . safe_deref ( kp_entry , 'notes' ) else "Notes: None" ,
6060 str (f"Expire time: { kp_entry .expiry_time } " )
6161 if kp_entry .expires is True else "Expiry date: None" ]
6262
@@ -74,11 +74,11 @@ def view_entry(kp_entry):
7474
7575 sel = dmenu_select (len (fields ), inp = "\n " .join (fields ))
7676 if sel == "Notes: <Enter to view>" :
77- sel = view_notes (kp_entry . deref ( 'notes' ) or "" )
77+ sel = view_notes (keepmenu . safe_deref ( kp_entry , 'notes' ))
7878 elif sel == "Notes: None" :
7979 sel = ""
8080 elif sel == '**********' :
81- sel = kp_entry . deref ( 'password' ) or ""
81+ sel = keepmenu . safe_deref ( kp_entry , 'password' )
8282 elif sel == "TOTP: ******" :
8383 sel = gen_otp (get_otp_url (kp_entry ))
8484 elif sel == fields [4 ] and not keepmenu .CONF .getboolean ("database" , "type_url" , fallback = False ):
0 commit comments