Add STORAGE_POLL_INTERVAL environment variable

[ci skip]: Bump docker/login-action from 1.9.0 to 1.10.0

.github/workflows/publish.yml

@@ -21,18 +21,25 @@ jobs:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Checkout code
+              uses: actions/checkout@v2.3.4
+              with:
+                  ref: main
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v1.2.0
+              with:
+                  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1.3.0
+              uses: docker/setup-buildx-action@v1.5.1
             - name: Login to DockerHub
-              uses: docker/login-action@v1.9.0
+              uses: docker/login-action@v1.10.0
               with:
                   username: ${{ secrets.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKER_PASSWORD }}
             - name: Build and push
-              uses: docker/build-push-action@v2.5.0
+              uses: docker/build-push-action@v2.6.1
               with:
+                  context: .
                   push: true
                   platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
                   tags: |

Dockerfile

@@ -5,7 +5,7 @@ RUN mkdir /install
 WORKDIR /install
 
 COPY requirements.txt /
-RUN pip install --prefix=/install -r /requirements.txt
+RUN pip install --no-warn-script-location --prefix=/install -r /requirements.txt
 
 FROM base
 COPY --from=builder /install /usr/local

README.md

@@ -16,6 +16,7 @@ It supports the following environment variables:
 -   `MQTT_PORT` (optional, default = 1883)
 -   `HOME_ASSISTANT` (optional, default = false)
 -   `HOME_ASSISTANT_PREFIX` (optional, default = 'homeassistant')
+-   `STORAGE_POLL_INTERVAL` (optional, default = 3600) - how often to fetch storage data (in seconds)
 
 It exposes events to the following topics:
 

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.5

src/amcrest2mqtt.py

@@ -8,7 +8,6 @@ from json import dumps
 import signal
 from threading import Timer
 
-storage_sensors_interval = 60  # 1 hour
 is_exiting = False
 mqtt_client = None
 
@@ -17,6 +16,7 @@ amcrest_host = os.getenv("AMCREST_HOST")
 amcrest_port = int(os.getenv("AMCREST_PORT") or 80)
 amcrest_username = os.getenv("AMCREST_USERNAME") or "admin"
 amcrest_password = os.getenv("AMCREST_PASSWORD")
+storage_poll_interval = int(os.getenv("STORAGE_POLL_INTERVAL") or 3600)
 
 mqtt_host = os.getenv("MQTT_HOST") or "localhost"
 mqtt_qos = int(os.getenv("MQTT_QOS") or 0)
@@ -78,9 +78,9 @@ def exit_gracefully(rc, skip_mqtt=False):
     os._exit(rc)
 
 def refresh_storage_sensors():
-    global camera, topics, storage_sensors_interval
+    global camera, topics, storage_poll_interval
 
-    Timer(storage_sensors_interval, refresh_storage_sensors).start()
+    Timer(storage_poll_interval, refresh_storage_sensors).start()
     log("Fetching storage sensors...")
 
     try:
@@ -239,44 +239,45 @@ if home_assistant:
         json=True,
     )
 
-    mqtt_publish(
+    if storage_poll_interval > 0:
-        topics["home_assistant"]["storage_used_percent"],
+        mqtt_publish(
-        base_config
+            topics["home_assistant"]["storage_used_percent"],
-        | {
+            base_config
-            "state_topic": topics["storage_used_percent"],
+            | {
-            "unit_of_measurement": "%",
+                "state_topic": topics["storage_used_percent"],
-            "icon": "mdi:micro-sd",
+                "unit_of_measurement": "%",
-            "name": f"{device_name} Storage Used %",
+                "icon": "mdi:micro-sd",
-            "unique_id": f"{serial_number}.storage_used_percent",
+                "name": f"{device_name} Storage Used %",
-        },
+                "unique_id": f"{serial_number}.storage_used_percent",
-        json=True,
+            },
-    )
+            json=True,
+        )
 
-    mqtt_publish(
+        mqtt_publish(
-        topics["home_assistant"]["storage_used"],
+            topics["home_assistant"]["storage_used"],
-        base_config
+            base_config
-        | {
+            | {
-            "state_topic": topics["storage_used"],
+                "state_topic": topics["storage_used"],
-            "unit_of_measurement": "GB",
+                "unit_of_measurement": "GB",
-            "icon": "mdi:micro-sd",
+                "icon": "mdi:micro-sd",
-            "name": f"{device_name} Storage Used",
+                "name": f"{device_name} Storage Used",
-            "unique_id": f"{serial_number}.storage_used",
+                "unique_id": f"{serial_number}.storage_used",
-        },
+            },
-        json=True,
+            json=True,
-    )
+        )
 
-    mqtt_publish(
+        mqtt_publish(
-        topics["home_assistant"]["storage_total"],
+            topics["home_assistant"]["storage_total"],
-        base_config
+            base_config
-        | {
+            | {
-            "state_topic": topics["storage_total"],
+                "state_topic": topics["storage_total"],
-            "unit_of_measurement": "GB",
+                "unit_of_measurement": "GB",
-            "icon": "mdi:micro-sd",
+                "icon": "mdi:micro-sd",
-            "name": f"{device_name} Storage Total",
+                "name": f"{device_name} Storage Total",
-            "unique_id": f"{serial_number}.storage_total",
+                "unique_id": f"{serial_number}.storage_total",
-        },
+            },
-        json=True,
+            json=True,
-    )
+        )
 
 # Main loop
 mqtt_publish(topics["status"], "online")
@@ -288,7 +289,8 @@ mqtt_publish(topics["config"], {
     "serial_number": serial_number,
 }, json=True)
 
-refresh_storage_sensors()
+if storage_poll_interval > 0:
+    refresh_storage_sensors()
 
 log("Listening for events...")