Changes

README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions)
 [![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity)
-[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2023.10.0b4%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
+[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2023.10.0%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest)
 <br><a href="https://www.buymeacoffee.com/aneisch" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-black.png" width="150px" height="35px" alt="Buy Me A Coffee" style="height: 35px !important;width: 150px !important;" ></a>
 
 
@@ -56,7 +56,7 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
 Description | value
 -- | --
 Lines of ESPHome YAML | 2467
-Lines of Home Assistant YAML | 8105
+Lines of Home Assistant YAML | 8121
 [Integrations](https://www.home-assistant.io/integrations/) in use | 52
 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37

automations.yaml

@@ -566,9 +566,21 @@
     event_type: folder_watcher
     event_data:
       event_type: modified
+      file: 'database.sqlite'
   action:
     - service: shell_command.sync_cloudflare_records
 
+- alias: "Commit Frigate Config"
+  id: "commit_frigate_config"
+  trigger:
+    platform: event
+    event_type: folder_watcher
+    event_data:
+      event_type: modified
+      file: 'config.yml'
+  action:
+    - service: shell_command.commit_frigate_changes
+
 - alias: "Compost Turn Reset"
   id: "compost_turn_reset"
   trigger:

configuration.yaml

@@ -37,6 +37,7 @@ homeassistant:
   allowlist_external_dirs:
     - "/tmp"
     - "/config"
+    - "/frigate_config"
   allowlist_external_urls:
     - "http://localhost:8123/api/frigate/notifications"
   media_dirs:
@@ -65,12 +66,15 @@ config:
 
 energy:
 
-# Watch for nginx proxy manager changes
 folder_watcher:
-  - folder: /tmp
-    use_polling: True
+  - folder: '/tmp'
+    #use_polling: True
     patterns:
       - "database.sqlite"
+  - folder: '/frigate_config'
+    #use_polling: True
+    patterns:
+      - "config.yml"
 
 monitor_docker:
   #scan_interval: 60

custom_components/dahua/camera.py

@@ -22,6 +22,7 @@
 # This service handles setting the video profile mode to day or night
 SERVICE_SET_VIDEO_PROFILE_MODE = "set_video_profile_mode"
 SERVICE_SET_FOCUS_ZOOM = "set_focus_zoom"
+SERVICE_SET_PRIVACY_MASKING = "set_privacy_masking"
 SERVICE_SET_CHANNEL_TITLE = "set_channel_title"
 SERVICE_SET_TEXT_OVERLAY = "set_text_overlay"
 SERVICE_SET_CUSTOM_OVERLAY = "set_custom_overlay"
@@ -83,6 +84,15 @@ async def async_setup_entry(hass: HomeAssistant, config_entry, async_add_entitie
         "async_adjustfocus"
     )
 
+    platform.async_register_entity_service(
+        SERVICE_SET_PRIVACY_MASKING,
+        {
+            vol.Required("index", default=0): int,
+            vol.Required("enabled", default=False): bool,
+        },
+        "async_set_privacy_masking"
+    )
+
     platform.async_register_entity_service(
         SERVICE_ENABLE_CHANNEL_TITLE,
         {
@@ -315,6 +325,10 @@ async def async_adjustfocus(self, focus: str, zoom: str):
         """ Handles the service call from SERVICE_SET_INFRARED_MODE to set zoom and focus """
         await self._coordinator.client.async_adjustfocus_v1(focus, zoom)
         await self._coordinator.async_refresh()
+
+    async def async_set_privacy_masking(self, index: int, enabled: bool):
+        """ Handles the service call from SERVICE_SET_PRIVACY_MASKING to control the privacy masking """
+        await self._coordinator.client.async_setprivacymask(index, enabled)
 
     async def async_set_enable_channel_title(self, enabled: bool):
         """ Handles the service call from SERVICE_ENABLE_CHANNEL_TITLE """

custom_components/dahua/client.py

@@ -354,6 +354,17 @@ async def async_adjustfocus_v1(self, focus: str, zoom: str):
 
         url = "/cgi-bin/devVideoInput.cgi?action=adjustFocus&focus={0}&zoom={1}".format(focus, zoom)
         return await self.get(url, True)
+
+    async def async_setprivacymask(self, index: int, enabled: bool):
+        """
+        async_setprivacymask will enable or disable the privacy mask
+        """
+
+
+        url = "/cgi-bin/configManager.cgi?action=setConfig&PrivacyMasking[0][{0}].Enable={1}".format(
+            index, str(enabled).lower()
+        )
+        return await self.get(url, True)
 
     async def async_set_night_switch_mode(self, channel: int, mode: str):
         """

custom_components/dahua/services.yaml

@@ -411,3 +411,30 @@ set_focus_zoom:
       selector:
         text:
 
+set_privacy_masking:
+  name: Set the Dahua Privacy Masking
+  description: Enables or disabled the cameras privacy masking
+  target:
+    entity:
+      integration: dahua
+      domain: camera
+  fields:
+    index:
+      name: Index
+      description: "The mask index. 0 is the first mask"
+      example: 0
+      required: true
+      default: 0
+      selector:
+        number:
+          mode: box
+          min: 0
+          max: 100
+    enabled:
+      name: Enabled
+      description: "If true enables the mask, otherwise disables it"
+      example: true
+      required: true
+      default: true
+      selector:
+        boolean:

extras/appdaemon/apps/apps.yaml

@@ -460,6 +460,7 @@ TV Automation Smallgroup:
 Pumkin Patch Smallgroup:
   module: entity_timer
   constrain_days: wed
+  constrain_presence: anyone
   class: Timer
   time_off: "18:00:00"
   time_on: "22:00:00"

extras/docker-compose/homeassistant/docker-compose.yml

@@ -1,19 +1,19 @@
 version: '3.2'
 
-volumes:
-  # https://rclone.org/docker/
-  frigate-drive:
-    driver: rclone:latest
-    driver_opts:
-      remote: 'frigate-drive:Frigate Offsite'
-      allow_other: 'true'
-      vfs_cache_mode: full
-      poll_interval: 0
+#volumes:
+#  # https://rclone.org/docker/
+#  frigate-drive:
+#    driver: rclone
+#    driver_opts:
+#      remote: 'frigate-drive:Frigate Offsite'
+#      allow_other: 'true'
+#      vfs_cache_mode: full
+#      poll_interval: 0
 
 services:
     homeassistant:
         container_name: hass
-        image: ghcr.io/home-assistant/home-assistant:beta
+        image: ghcr.io/home-assistant/home-assistant:stable
         labels:
           com.centurylinklabs.watchtower.monitor-only: "true"
         volumes:
@@ -24,7 +24,8 @@ services:
           - /tmp/radar.gif:/tmp/radar.gif
           - /sys/class/hwmon/hwmon1/temp1_input:/sys/class/thermal/thermal_zone0/temp:ro
           - /etc/localtime:/etc/localtime:ro
-          - frigate-drive:/frigate
+          - /frigate-drive:/frigate
+          - /opt/frigate:/frigate_config:ro
         devices:
             - /dev/zigbee
             - /dev/usb_modem_sim7080g:/dev/cellular_modem

extras/docker-compose/other/docker-compose.yml

@@ -132,6 +132,7 @@ services:
             - '/opt/appdaemon/:/config/appdaemon'
             - '/opt/docker-compose/:/config/docker-compose'
             - '/opt/github:/config/github_projects'
+            - '/opt/frigate:/config/frigate'
             - '/home/aneisch/.backup:/config/homeassistant-git'
         environment:
             - TZ=America/Chicago

extras/docker-compose/unified/docker-compose.yml

@@ -1,20 +1,20 @@
 # Concat 'homeassistant' and 'other' docker-compose files
 version: '3.2'
 
-volumes:
-  # https://rclone.org/docker/
-  frigate-drive:
-    driver: rclone:latest
-    driver_opts:
-      remote: 'frigate-drive:Frigate Offsite'
-      allow_other: 'true'
-      vfs_cache_mode: full
-      poll_interval: 0
+#volumes:
+#  # https://rclone.org/docker/
+#  frigate-drive:
+#    driver: rclone
+#    driver_opts:
+#      remote: 'frigate-drive:Frigate Offsite'
+#      allow_other: 'true'
+#      vfs_cache_mode: full
+#      poll_interval: 0
 
 services:
     homeassistant:
         container_name: hass
-        image: ghcr.io/home-assistant/home-assistant:beta
+        image: ghcr.io/home-assistant/home-assistant:stable
         labels:
           com.centurylinklabs.watchtower.monitor-only: "true"
         volumes:
@@ -25,7 +25,8 @@ services:
           - /tmp/radar.gif:/tmp/radar.gif
           - /sys/class/hwmon/hwmon1/temp1_input:/sys/class/thermal/thermal_zone0/temp:ro
           - /etc/localtime:/etc/localtime:ro
-          - frigate-drive:/frigate
+          - /frigate-drive:/frigate
+          - /opt/frigate:/frigate_config:ro
         devices:
             - /dev/zigbee
             - /dev/usb_modem_sim7080g:/dev/cellular_modem
@@ -307,6 +308,7 @@ services:
             - '/opt/appdaemon/:/config/appdaemon'
             - '/opt/docker-compose/:/config/docker-compose'
             - '/opt/github:/config/github_projects'
+            - '/opt/frigate:/config/frigate'
             - '/home/aneisch/.backup:/config/homeassistant-git'
         environment:
             - TZ=America/Chicago

packages/frigate.yaml

@@ -101,7 +101,6 @@ automation:
               data:
                 attachments:
                   - /config/images/logo.jpg
-          - delay: "00:00:30"
 
   - alias: Doorbell Ring
     id: "frigate_doorbell_ring"

packages/hass_update_check.yaml

@@ -190,7 +190,7 @@ script:
   hass_update_notify:
     # Notify and enable update button on frontend
     sequence:
-      - service: shell_command.pull_hass
+      #- service: shell_command.pull_hass
       - service: notify.signal_self
         data:
           message: >

packages/leak_detection.yaml

@@ -48,7 +48,8 @@ automation:
             and is_state('switch.maples_zone', 'off') 
             and is_state('group.trackers', 'not_home' ) 
             and is_state('input_boolean.guest_mode', 'off') 
-            and not (now().hour == 12 and now.minute in [0,1,2,3,4,5]) }}"
+            and not (now().hour == 12 and now.minute in [0,1,2,3,4,5]) 
+            and not (now().hour == 10 and now.minute in [16,17,18,19,20,21]) }}"
         then:
           - service: script.notify_wrapper
             data:

scripts/commit_frigate_changes.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd /opt/frigate
+
+git add config.yml
+git commit -m 'Autocommit by Home Assistant on change'
+git push

scripts/frigate_clips_drive.sh

@@ -3,7 +3,7 @@
 clip_id=$1
 
 cd /frigate
-wget -O /frigate/`date +%m_%d_%Y_%H_%M_%S_1690389398.964135-kk1s6p.mp4` http://localhost:5000/api/events/$clip_id/clip.mp4
+wget -O /frigate/`date +%m_%d_%Y_%H_%M_%S.mp4` http://localhost:5000/api/events/$clip_id/clip.mp4
 
 # Remove all but latest 90 clips
 #rm `ls -tr /frigate | awk 'NR>90'` &> /dev/null

shell_command.yaml

@@ -27,3 +27,5 @@ turn_off_mirroring: ssh weasel '/usr/bin/automator /Users/aneisch/Library/Servic
 weasel_shortcut: ssh weasel 'shortcuts run "{{ shortcut }}"'
 
 sync_cloudflare_records: ssh nuc '/opt/homeassistant/scripts/nginx_proxy_manager_sync.py'
+
+commit_frigate_changes: ssh nuc '/opt/homeassistant/scripts/commit_frigate_changes.sh'