From 6cea681f6f98d14b11609c0e19b823dd80a8d874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Tue, 8 Sep 2020 15:45:26 +0200 Subject: [PATCH] Refactor error handling for cleaner code --- afterlock/afterlock.go | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/afterlock/afterlock.go b/afterlock/afterlock.go index f62471d..d18a826 100644 --- a/afterlock/afterlock.go +++ b/afterlock/afterlock.go @@ -84,23 +84,12 @@ func (af *AfterLock) detectKeypresses() { func (af *AfterLock) hybernateDisplayLoop() { for { - screenLocked, err := af.LockScreen.IsActive() - if err != nil { - panic(err) - } - if !screenLocked { + if !af.screenLocked() { return } - displayOn, err := af.Display.IsOn() - if err != nil { - panic(err) - } - if displayOn { - err := af.Display.Suspend() - if err != nil { - panic(err) - } + if af.displayIsOn() { + af.suspendDisplay() } for { @@ -112,4 +101,27 @@ func (af *AfterLock) hybernateDisplayLoop() { break } } +} + +func (af *AfterLock) screenLocked() bool { + screenLocked, err := af.LockScreen.IsActive() + if err != nil { + panic(err) + } + return screenLocked +} + +func (af *AfterLock) displayIsOn() bool { + displayOn, err := af.Display.IsOn() + if err != nil { + panic(err) + } + return displayOn +} + +func (af *AfterLock) suspendDisplay() { + err := af.Display.Suspend() + if err != nil { + panic(err) + } } \ No newline at end of file