Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #325 from DewGew/beta
Browse files Browse the repository at this point in the history
Merge Beta
  • Loading branch information
DewGew authored May 16, 2023
2 parents 2b2de51 + f6366af commit 6e3c1d7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Dockerfile for Domoticz-Google-Assistant

# Install minimal Python 3.
FROM jfloff/alpine-python:3.7-slim
FROM python:3-alpine

RUN mkdir -p config

COPY *.py /
COPY templates/ /templates/
COPY static/ /static/
COPY requirements/pip-requirements.txt /requirements.txt
RUN pip install --no-cache-dir -r /requirements.txt

# Create volume
VOLUME /config

# Configure Services and Port
CMD ["python3 /__main__.py"]
CMD ["python3", "/__main__.py"]

EXPOSE 3030
2 changes: 1 addition & 1 deletion const.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

"""Constants for Google Assistant."""
VERSION = '1.23.6'
VERSION = '1.23.7'
PUBLIC_URL = 'https://[your public url]'
CONFIGFILE = 'config/config.yaml'
LOGFILE = 'dzga.log'
Expand Down
5 changes: 3 additions & 2 deletions smarthome.py
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ def syncDevices_post(self, s):
raise SmartHomeError(ERR_PROTOCOL_ERROR, 'not authorized access!!')

r = self.forceDevicesSync()
s.send_message(200, 'Synchronization request sent, status_code: ' + st(r))
s.send_message(200, 'Synchronization request sent, status_code: ' + str(r))

def notification_post(self, s):
logger.debug(s.headers)
Expand Down Expand Up @@ -851,7 +851,8 @@ def forceDevicesSync(self):
userAgent = self.getUserAgent()
enableReport = ReportState.enable_report_state()
if userAgent is None:
return 500 # internal error
# return 500 # internal error
userAgent = "1234"

data = {"agentUserId": userAgent}
if enableReport:
Expand Down

0 comments on commit 6e3c1d7

Please sign in to comment.