Merge branch 'master' of http://10.0.1.27:3000/abel/ecb

.gitignore

@@ -0,0 +1 @@
+venv

Dockerfile

@@ -2,15 +2,17 @@ FROM ubuntu:20.04
 
 MAINTAINER Abel Fokkinga "abel@fokkinga.com"
 
-RUN apt-get update -y && \
-    apt-get install -y python-pip python-dev
+RUN apt-get update && apt-get upgrade -y && apt-get autoremove && apt-get autoclean
+RUN apt install git python3 python3-pip -y --no-install-recommends
+RUN apt install locales -y --no-install-recommends
+RUN locale-gen en_US.UTF-8
 
 WORKDIR /app
 
-RUN pip install flask, requests, wtforms, json
+RUN pip install flask requests wtforms 
 
 COPY . /app
 
-ENTRYPOINT [ "python" ]
+ENTRYPOINT [ "python3" ]
 
 CMD [ "main.py" ]

README.md

@@ -7,3 +7,11 @@ Go to https://gateway.edsn.nl/eancodeboek
 
 ## Update config.json
 Update the API key token in the config.json file
+
+
+## Docker
+For building and running the app via Docker
+```
+docker build -t ecb:latest .
+docker run -d -p 5000:5000 ecb
+```

main.py

@@ -40,16 +40,16 @@ def search_mp(product, postalcode, houseno, houseno_ext=''):
         print('Successfull GET Request')
     return response.json()
 
-
 def flash_results(results):
     for mp in results['meteringPoints']:
+        print(mp['specialMeteringPoint'])
         result = str(mp['ean']) + ';' + \
                  str(mp['product']) + ';' + \
                  str(mp['address']['street']) + ';' + \
                  str(mp['address']['streetNumber']) + ';' + \
-                 str(mp['address']['streetNumberAddition']) + ';' + \
+                 str(mp['address']['streetNumberAddition'] if 'streetNumberAddition' in mp['address'] else '') + ';' + \
                  str(mp['address']['city']) + ';' + \
-                 ('Nee' if mp['specialMeteringPoint'] == 'False' else 'Ja') + ';' + \
+                 ('Nee' if mp['specialMeteringPoint'] is False else 'Ja') + ';' + \
                  str(mp['organisation']) + ';' + \
                  str(mp['gridOperatorEan'])
         flash(result, 'results')
@@ -91,4 +91,4 @@ class ReusableForm(Form):
 if __name__ == '__main__':
     with open('config.json') as json_data:
         config = json.load(json_data)
-    app.run(debug=False, host='0.0.0.0')
+    app.run(debug=True, host='0.0.0.0')