Fix issue with fetching serial number (closes #35 )

Merge pull request #36 from dchesterton/dependabot/github_actions/docker/build-push-action-2.7.0
[ci skip]: Bump docker/build-push-action from 2.6.1 to 2.7.0
2026-03-09 20:13:40 +00:00 · 2021-10-26 21:38:19 +01:00 · 2021-10-26 21:25:18 +01:00 · 2021-10-26 21:25:03 +01:00 · 2021-10-26 20:13:44 +00:00 · 2021-10-26 21:13:17 +01:00
4 changed files with 14 additions and 9 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,9 +12,9 @@ jobs:
        runs-on: ubuntu-20.04
        steps:
            - name: Checkout code
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v2.3.5
            - name: Bump version
-              uses: remorses/bump-version@js
+              uses: chamini2/bump-version@js
              id: version
              with:
                  version_file: ./VERSION
@@ -22,7 +22,7 @@ jobs:
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
            - name: Checkout code
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v2.3.5
              with:
                  ref: main
            - name: Set up QEMU
@@ -30,14 +30,14 @@ jobs:
              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.5.1
+              uses: docker/setup-buildx-action@v1.6.0
            - name: Login to DockerHub
              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.6.1
+              uses: docker/build-push-action@v2.7.0
              with:
                  context: .
                  push: true
--- a/2
+++ b/2
@@ -1 +1 @@
-1.0.8
+1.0.10
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-amcrest==1.8.0
-paho-mqtt==1.5.1
+amcrest==1.9.3
+paho-mqtt==1.6.1
 python-slugify==5.0.2
--- a/src/amcrest2mqtt.py
+++ b/src/amcrest2mqtt.py
@@ -149,7 +149,12 @@ try:
    is_ad110 = device_type == "AD110"
    is_ad410 = device_type == "AD410"
    is_doorbell = is_ad110 or is_ad410
-    serial_number = camera.serial_number.strip()
+    serial_number = camera.serial_number
+
+    if not isinstance(serial_number, str):
+        log(f"Error fetching serial number", level="ERROR")
+        exit_gracefully(1)
+
    sw_version = camera.software_information[0].replace("version=", "").strip()
    device_name = camera.machine_name.replace("name=", "").strip()
    device_slug = slugify(device_name, separator="_")
Author	SHA1	Message	Date
Daniel Chesterton	594a42320f	Fix issue with fetching serial number (closes #35 )	2021-10-26 21:38:19 +01:00
Daniel Chesterton	2886e5c1ca	Merge pull request #36 from dchesterton/dependabot/github_actions/docker/build-push-action-2.7.0 [ci skip]: Bump docker/build-push-action from 2.6.1 to 2.7.0	2021-10-26 21:25:18 +01:00
Daniel Chesterton	9ba2544237	Merge pull request #39 from dchesterton/dependabot/github_actions/docker/setup-buildx-action-1.6.0 [ci skip]: Bump docker/setup-buildx-action from 1.5.1 to 1.6.0	2021-10-26 21:25:03 +01:00
bump_version	0ccdc6fe11	Version 1.0.10 [skip ci]	2021-10-26 20:13:44 +00:00
Daniel Chesterton	ed38b86eb6	Change bump-version	2021-10-26 21:13:17 +01:00
Daniel Chesterton	9d3d44f36b	Merge pull request #46 from dchesterton/dependabot/pip/paho-mqtt-1.6.1 Bump paho-mqtt from 1.5.1 to 1.6.1	2021-10-26 21:09:59 +01:00
dependabot[bot]	8cb2cc2327	Bump paho-mqtt from 1.5.1 to 1.6.1 Bumps [paho-mqtt](https://github.com/eclipse/paho.mqtt.python) from 1.5.1 to 1.6.1. - [Release notes](https://github.com/eclipse/paho.mqtt.python/releases) - [Changelog](https://github.com/eclipse/paho.mqtt.python/blob/master/ChangeLog.txt) - [Commits](https://github.com/eclipse/paho.mqtt.python/compare/v1.5.1...v1.6.1) --- updated-dependencies: - dependency-name: paho-mqtt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-10-26 20:07:01 +00:00
Daniel Chesterton	4d4961e842	Merge pull request #45 from dchesterton/dependabot/github_actions/actions/checkout-2.3.5 [ci skip]: Bump actions/checkout from 2.3.4 to 2.3.5	2021-10-26 21:06:39 +01:00
Daniel Chesterton	cbb1995deb	Merge pull request #42 from dchesterton/dependabot/pip/amcrest-1.9.3 Bump amcrest from 1.8.0 to 1.9.3	2021-10-26 21:06:20 +01:00
dependabot[bot]	781becf0d0	[ci skip]: Bump actions/checkout from 2.3.4 to 2.3.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-10-18 12:06:55 +00:00
dependabot[bot]	8a1b1945ff	Bump amcrest from 1.8.0 to 1.9.3 Bumps [amcrest](https://github.com/tchellomello/python-amcrest) from 1.8.0 to 1.9.3. - [Release notes](https://github.com/tchellomello/python-amcrest/releases) - [Commits](https://github.com/tchellomello/python-amcrest/compare/1.8.0...1.9.3) --- updated-dependencies: - dependency-name: amcrest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-20 12:03:25 +00:00
dependabot[bot]	65623b45a2	[ci skip]: Bump docker/setup-buildx-action from 1.5.1 to 1.6.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.5.1...v1.6.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-06 12:05:58 +00:00
dependabot[bot]	4af6eac710	[ci skip]: Bump docker/build-push-action from 2.6.1 to 2.7.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.6.1...v2.7.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-20 12:06:38 +00:00
bump_version	7bbe3cbcf4	Version 1.0.9 [skip ci]	2021-08-07 20:26:29 +00:00
@@ -1 +1 @@
 .0.8
 .0.10