danvics/howdy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new config variable names in all scripts

Browse source 
Changed:
capture_failed -> save_failed
capture_successful -> save_successful
ignore_ssh -> abort_if_ssh
ignore_closed_lid -> abort_if_lid_closed
This commit is contained in:
jEzEk 2022-11-23 00:36:16 +01:00
parent 58a5368448
commit 0803465cd9
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
howdy/debian/postinst
View file

@ -88,6 +88,10 @@ if "upgrade" in sys.argv:
key = "abort_if_ssh" key = "abort_if_ssh"
if key == "ignore_closed_lid": if key == "ignore_closed_lid":
key = "abort_if_lid_closed" key = "abort_if_lid_closed"
if key == "capture_failed":
key = "save_failed"
if key == "capture_successful":
key = "save_successful"
try: try:
newConf.set(section, key, value) newConf.set(section, key, value)

10
howdy/src/compare.py
View file

@ -146,8 +146,8 @@ timeout = config.getint("video", "timeout", fallback=5)
dark_threshold = config.getfloat("video", "dark_threshold", fallback=50.0) dark_threshold = config.getfloat("video", "dark_threshold", fallback=50.0)
video_certainty = config.getfloat("video", "certainty", fallback=3.5) / 10 video_certainty = config.getfloat("video", "certainty", fallback=3.5) / 10
end_report = config.getboolean("debug", "end_report", fallback=False) end_report = config.getboolean("debug", "end_report", fallback=False)
capture_failed = config.getboolean("snapshots", "capture_failed", fallback=False) save_failed = config.getboolean("snapshots", "save_failed", fallback=False)
capture_successful = config.getboolean("snapshots", "capture_successful", fallback=False) save_successful = config.getboolean("snapshots", "save_successful", fallback=False)
gtk_stdout = config.getboolean("debug", "gtk_stdout", fallback=False) gtk_stdout = config.getboolean("debug", "gtk_stdout", fallback=False)
rotate = config.getint("video", "rotate", fallback=0) rotate = config.getint("video", "rotate", fallback=0)
@ -232,7 +232,7 @@ while True:
# Stop if we've exceded the time limit # Stop if we've exceded the time limit
if time.time() - timings["fr"] > timeout: if time.time() - timings["fr"] > timeout:
# Create a timeout snapshot if enabled # Create a timeout snapshot if enabled
if capture_failed: if save_failed:
make_snapshot(_("FAILED")) make_snapshot(_("FAILED"))
if dark_tries == valid_frames: if dark_tries == valid_frames:
@ -247,7 +247,7 @@ while True:
gsframe = clahe.apply(gsframe) gsframe = clahe.apply(gsframe)
# If snapshots have been turned on # If snapshots have been turned on
if capture_failed or capture_successful: if save_failed or save_successful:
# Start capturing frames for the snapshot # Start capturing frames for the snapshot
if len(snapframes) < 3: if len(snapframes) < 3:
snapframes.append(frame) snapframes.append(frame)
@ -354,7 +354,7 @@ while True:
print(_("Winning model: %d (\"%s\")") % (match_index, models[match_index]["label"])) print(_("Winning model: %d (\"%s\")") % (match_index, models[match_index]["label"]))
# Make snapshot if enabled # Make snapshot if enabled
if capture_successful: if save_successful:
make_snapshot(_("SUCCESSFUL")) make_snapshot(_("SUCCESSFUL"))
# Run rubberstamps if enabled # Run rubberstamps if enabled

2
howdy/src/pam.py
View file

@ -40,7 +40,7 @@ def doAuth(pamh):
if config.getboolean("video", "warn_no_device"): if config.getboolean("video", "warn_no_device"):
pamh.conversation(pamh.Message(pamh.PAM_ERROR_MSG, "Camera path is not configured correctly, please edit the 'device_path' config value.")) pamh.conversation(pamh.Message(pamh.PAM_ERROR_MSG, "Camera path is not configured correctly, please edit the 'device_path' config value."))
return pamh.PAM_AUTHINFO_UNAVAIL return pamh.PAM_AUTHINFO_UNAVAIL
# Set up syslog # Set up syslog
syslog.openlog("[HOWDY]", 0, syslog.LOG_AUTH) syslog.openlog("[HOWDY]", 0, syslog.LOG_AUTH)

4
howdy/src/pam/main.cc
View file

@ -141,7 +141,7 @@ auto check_enabled(const INIReader &config) -> int {
} }
// Stop if we're in a remote shell and configured to exit // Stop if we're in a remote shell and configured to exit
if (config.GetBoolean("core", "ignore_ssh", true)) { if (config.GetBoolean("core", "abort_if_ssh", true)) {
if (getenv("SSH_CONNECTION") != nullptr || if (getenv("SSH_CONNECTION") != nullptr ||
getenv("SSH_CLIENT") != nullptr || getenv("SSHD_OPTS") != nullptr) { getenv("SSH_CLIENT") != nullptr || getenv("SSHD_OPTS") != nullptr) {
syslog(LOG_INFO, "Skipped authentication, SSH session detected"); syslog(LOG_INFO, "Skipped authentication, SSH session detected");
@ -150,7 +150,7 @@ auto check_enabled(const INIReader &config) -> int {
} }
// Try to detect the laptop lid state and stop if it's closed // Try to detect the laptop lid state and stop if it's closed
if (config.GetBoolean("core", "ignore_closed_lid", true)) { if (config.GetBoolean("core", "abort_if_lid_closed", true)) {
glob_t glob_result; glob_t glob_result;
// Get any files containing lid state // Get any files containing lid state