From b02757938a8a42924c5d7b48d75fe39b2c2572df Mon Sep 17 00:00:00 2001 From: Jeff Culverhouse Date: Tue, 6 Jan 2026 17:32:01 -0500 Subject: [PATCH] fix: use consistent fallback pattern and clarify documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change protocol_version to use 'or' fallback pattern like other config values - Update config.yaml.sample comment to clarify both quoted and unquoted values work - Addresses Copilot feedback on PR #3 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 --- config.yaml.sample | 2 +- src/amcrest2mqtt/mixins/helpers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml.sample b/config.yaml.sample index a1f6a86..6a40e99 100644 --- a/config.yaml.sample +++ b/config.yaml.sample @@ -4,7 +4,7 @@ mqtt: username: mqtt password: password qos: 0 - protocol_version: "5" # MQTT protocol version: "3.1.1" or "5" (default: "5") + protocol_version: "5" # MQTT protocol version: 3.1.1/3 or 5 (with or without quotes, default: 5) prefix: amcrest2mqtt discovery_prefix: homeassistant tls_enabled: False diff --git a/src/amcrest2mqtt/mixins/helpers.py b/src/amcrest2mqtt/mixins/helpers.py index 5aad5e7..2b8098c 100644 --- a/src/amcrest2mqtt/mixins/helpers.py +++ b/src/amcrest2mqtt/mixins/helpers.py @@ -200,7 +200,7 @@ class HelpersMixin: "host": str(mqtt.get("host") or os.getenv("MQTT_HOST", "localhost")), "port": int(str(mqtt.get("port") or os.getenv("MQTT_PORT", 1883))), "qos": int(str(mqtt.get("qos") or os.getenv("MQTT_QOS", 0))), - "protocol_version": str(mqtt.get("protocol_version", os.getenv("MQTT_PROTOCOL", "5"))), + "protocol_version": str(mqtt.get("protocol_version") or os.getenv("MQTT_PROTOCOL", "5")), "username": str(mqtt.get("username") or os.getenv("MQTT_USERNAME", "")), "password": str(mqtt.get("password") or os.getenv("MQTT_PASSWORD", "")), "tls_enabled": bool(mqtt.get("tls_enabled") or (os.getenv("MQTT_TLS_ENABLED", "false").lower() == "true")),