1
0
mirror of synced 2026-03-09 20:13:40 +00:00

Compare commits

8 Commits
1.0.1 ... 1.0.5

Author SHA1 Message Date
Daniel Chesterton
1b85a28e01 Fix workflow 2021-05-28 22:52:10 +01:00
bump_version
b6e6dc1eca Version 1.0.4 [skip ci] 2021-05-28 21:38:00 +00:00
Daniel Chesterton
2a683fefc8 Fix workflow 2021-05-28 22:37:36 +01:00
bump_version
a94b964f9f Version 1.0.3 [skip ci] 2021-05-28 10:45:07 +00:00
Daniel Chesterton
afb215850c Fix workflow 2021-05-28 11:44:43 +01:00
bump_version
c99b918e84 Version 1.0.2 [skip ci] 2021-05-28 10:20:20 +00:00
Daniel Chesterton
df45393453 Add config topic 2021-05-28 11:19:55 +01:00
bump_version
f5b655dbf1 Version 1.0.1 [skip ci] 2021-05-27 22:26:15 +00:00
4 changed files with 33 additions and 2 deletions

View File

@@ -21,6 +21,10 @@ 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
- name: Set up Docker Buildx
@@ -33,6 +37,7 @@ jobs:
- name: Build and push
uses: docker/build-push-action@v2.5.0
with:
context: .
push: true
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
tags: |

View File

@@ -5,11 +5,12 @@ 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
COPY src /app
COPY VERSION /app
WORKDIR /app
CMD [ "python", "-u", "/app/amcrest2mqtt.py" ]

View File

@@ -1 +1 @@
1.0.0
1.0.4

View File

@@ -27,6 +27,18 @@ mqtt_password = os.getenv("MQTT_PASSWORD") # can be None
home_assistant = os.getenv("HOME_ASSISTANT") == "true"
home_assistant_prefix = os.getenv("HOME_ASSISTANT_PREFIX") or "homeassistant"
def read_file(file_name):
with open(file_name, 'r') as file:
data = file.read().replace('\n', '')
return data
def read_version():
if os.path.isfile("./VERSION"):
return read_file("./VERSION")
return read_file("../VERSION")
# Helper functions and callbacks
def log(msg, level="INFO"):
ts = datetime.now(timezone.utc).strftime("%d/%m/%Y %H:%M:%S")
@@ -102,6 +114,10 @@ if mqtt_username is None:
log("Please set the MQTT_USERNAME environment variable", level="ERROR")
sys.exit(1)
version = read_version()
log(f"App Version: {version}")
# Handle interruptions
signal.signal(signal.SIGINT, signal_handler)
@@ -129,6 +145,7 @@ log(f"Device name: {device_name}")
# MQTT topics
topics = {
"config": f"amcrest2mqtt/{serial_number}/config",
"status": f"amcrest2mqtt/{serial_number}/status",
"event": f"amcrest2mqtt/{serial_number}/event",
"motion": f"amcrest2mqtt/{serial_number}/motion",
@@ -263,6 +280,14 @@ if home_assistant:
# Main loop
mqtt_publish(topics["status"], "online")
mqtt_publish(topics["config"], {
"version": version,
"device_type": device_type,
"device_name": device_name,
"sw_version": sw_version,
"serial_number": serial_number,
}, json=True)
refresh_storage_sensors()
log("Listening for events...")