jeena/hass-configurator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #66 from danielperna84/dev

Browse source 
Version 0.2.4
This commit is contained in:
Daniel Perna 2018-01-02 20:57:07 +01:00 • committed by GitHub
commit 56c77a5e9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 172 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -37,7 +37,7 @@ Near the top of the py-file you'll find some global variables you can change to
To keep your setting across updates it is also possible to save settings in an external file. In that case copy [settings.conf](https://github.com/danielperna84/hass-poc-configurator/blob/master/settings.conf) whereever you like and append the full path to the file to the command when starting the configurator. E.g. `sudo .configurator.py /home/hass/.homeassistant/mysettings.conf`. This file is in JSON format. So make sure it has a valid syntax (you can set the editor to JSON to get syntax highlighting for the settings). The major difference to the settings in the py-file is, that `None` becomes `null`. To keep your setting across updates it is also possible to save settings in an external file. In that case copy [settings.conf](https://github.com/danielperna84/hass-poc-configurator/blob/master/settings.conf) whereever you like and append the full path to the file to the command when starting the configurator. E.g. `sudo .configurator.py /home/hass/.homeassistant/mysettings.conf`. This file is in JSON format. So make sure it has a valid syntax (you can set the editor to JSON to get syntax highlighting for the settings). The major difference to the settings in the py-file is, that `None` becomes `null`.
#### LISTENIP (string) #### LISTENIP (string)
The IP the service is listening on. By default it's binding to `0.0.0.0`, which is every interface on the system. The IP address the service is listening on. By default it is binding to `0.0.0.0`, which is every IPv4 interface on the system. When using `::`, all available IPv6- and IPv4-addresses will be used.
#### LISTENPORT (integer) #### LISTENPORT (integer)
The port the service is listening on. By default it's using 3218, but you can change this if you need to. The port the service is listening on. By default it's using 3218, but you can change this if you need to.
#### BASEPATH (string) #### BASEPATH (string)

5
changelog.txt
View file

@ -1,9 +1,10 @@
Version 0.2.4 (2018-01-02) Version 0.2.4 (2018-01-02)
- Added YAML linting @AtoxIO - Added YAML linting @AtoxIO
- Added IPv6 support @danielperna84
Version 0.2.3 (2017-11-12) Version 0.2.3 (2017-11-12)
- Switched away from removed bootstrap API - Switched away from removed bootstrap API @danielperna84
- Added homeassistant-trigger - Added homeassistant-trigger @danielperna84
Version 0.2.2 (2017-11-01) Version 0.2.2 (2017-11-01)
- Added option to list directories first @dimagoltsman - Added option to list directories first @dimagoltsman

92
configurator.py
View file

@ -8,6 +8,7 @@ import os
import sys import sys
import json import json
import ssl import ssl
import socket
import socketserver import socketserver
import base64 import base64
import ipaddress import ipaddress
@ -18,7 +19,7 @@ import subprocess
import logging import logging
import fnmatch import fnmatch
from string import Template from string import Template
from http.server import BaseHTTPRequestHandler, HTTPServer from http.server import BaseHTTPRequestHandler
import urllib.request import urllib.request
from urllib.parse import urlparse, parse_qs, unquote from urllib.parse import urlparse, parse_qs, unquote
@ -520,6 +521,24 @@ INDEX = Template(r"""<!DOCTYPE html>
100% { background-color: #f5f5f5; } 100% { background-color: #f5f5f5; }
} }
#lint-status {
position: absolute;
top: 0.75rem;
right: 10px;
}
.cursor-pointer {
cursor: pointer;
}
#modal_lint.modal {
width: 80%;
}
#modal_lint textarea {
resize: none;
height: auto;
}
</style> </style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
@ -1467,6 +1486,14 @@ INDEX = Template(r"""<!DOCTYPE html>
<a class=" modal-action modal-close waves-effect btn-flat light-blue-text">OK</a> <a class=" modal-action modal-close waves-effect btn-flat light-blue-text">OK</a>
</div> </div>
</div> </div>
<div id="modal_lint" class="modal">
<div class="modal-content">
<textarea rows="8" readonly></textarea>
</div>
<div class="modal-footer">
<a class="modal-action modal-close waves-effect btn-flat light-blue-text">OK</a>
</div>
</div>
<!-- Main Editor Area --> <!-- Main Editor Area -->
<div class="row"> <div class="row">
<div class="col m4 l3 hide-on-small-only"> <div class="col m4 l3 hide-on-small-only">
@ -1514,6 +1541,7 @@ INDEX = Template(r"""<!DOCTYPE html>
<div class="col s12 m8 l9"> <div class="col s12 m8 l9">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip"> <div class="card input-field col s12 grey lighten-4 hoverable pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text"> <input class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div> </div>
</div> </div>
<div class="col s12 m8 l9 z-depth-2" id="editor"></div> <div class="col s12 m8 l9 z-depth-2" id="editor"></div>
@ -2287,6 +2315,7 @@ INDEX = Template(r"""<!DOCTYPE html>
editor.session.getUndoManager().markClean(); editor.session.getUndoManager().markClean();
$('.markdirty').each(function(i, o){o.classList.remove('red');}); $('.markdirty').each(function(i, o){o.classList.remove('red');});
$('.hidesave').css('opacity', 0); $('.hidesave').css('opacity', 0);
check_lint();
}); });
} }
} }
@ -2731,6 +2760,58 @@ INDEX = Template(r"""<!DOCTYPE html>
foldstatus = !foldstatus; foldstatus = !foldstatus;
} }
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.10.0/js-yaml.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript">
var lint_timeout;
var lint_status = $('#lint-status'); // speed optimization
var lint_error = "";
function check_lint()
{
if (document.getElementById('currentfile').value.match(".yaml$")) {
try {
var text = editor.getValue().replace(/!(include|secret)/g,".$1"); // hack because js-yaml does not like !include/!secret
jsyaml.safeLoad(text);
lint_status.text("check_circle");
lint_status.removeClass("cursor-pointer red-text grey-text");
lint_status.addClass("green-text");
lint_error = "";
} catch (err) {
lint_status.text("error");
lint_status.removeClass("green-text grey-text");
lint_status.addClass("cursor-pointer red-text");
lint_error = err.message;
}
} else {
lint_status.empty();
}
}
function queue_lint(e)
{
if (document.getElementById('currentfile').value.match(".yaml$")) {
clearTimeout(lint_timeout);
lint_timeout = setTimeout(check_lint, 500);
if (lint_status.text() != "cached") {
lint_status.text("cached");
lint_status.removeClass("cursor-pointer red-text green-text");
lint_status.addClass("grey-text");
}
} else {
lint_status.empty();
}
}
function show_lint_error()
{
if(lint_error) {
$("#modal_lint textarea").val(lint_error);
$("#modal_lint").modal('open');
}
}
editor.on('change', queue_lint);
</script> </script>
</body> </body>
</html>""") </html>""")
@ -3633,16 +3714,17 @@ def main(args):
if args: if args:
load_settings(args[0]) load_settings(args[0])
LOG.info("Starting server") LOG.info("Starting server")
CustomServer = socketserver.TCPServer
if ':' in LISTENIP:
CustomServer.address_family = socket.AF_INET6
server_address = (LISTENIP, LISTENPORT) server_address = (LISTENIP, LISTENPORT)
if CREDENTIALS: if CREDENTIALS:
CREDENTIALS = base64.b64encode(bytes(CREDENTIALS, "utf-8")) CREDENTIALS = base64.b64encode(bytes(CREDENTIALS, "utf-8"))
Handler = AuthHandler Handler = AuthHandler
else: else:
Handler = RequestHandler Handler = RequestHandler
if not SSL_CERTIFICATE: HTTPD = CustomServer(server_address, Handler)
HTTPD = HTTPServer(server_address, Handler) if SSL_CERTIFICATE:
else:
HTTPD = socketserver.TCPServer(server_address, Handler)
HTTPD.socket = ssl.wrap_socket(HTTPD.socket, HTTPD.socket = ssl.wrap_socket(HTTPD.socket,
certfile=SSL_CERTIFICATE, certfile=SSL_CERTIFICATE,
keyfile=SSL_KEY, keyfile=SSL_KEY,

82
dev.html
View file

@ -442,6 +442,24 @@
100% { background-color: #f5f5f5; } 100% { background-color: #f5f5f5; }
} }
#lint-status {
position: absolute;
top: 0.75rem;
right: 10px;
}
.cursor-pointer {
cursor: pointer;
}
#modal_lint.modal {
width: 80%;
}
#modal_lint textarea {
resize: none;
height: auto;
}
</style> </style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
@ -1389,6 +1407,14 @@
<a class=" modal-action modal-close waves-effect btn-flat light-blue-text">OK</a> <a class=" modal-action modal-close waves-effect btn-flat light-blue-text">OK</a>
</div> </div>
</div> </div>
<div id="modal_lint" class="modal">
<div class="modal-content">
<textarea rows="8" readonly></textarea>
</div>
<div class="modal-footer">
<a class="modal-action modal-close waves-effect btn-flat light-blue-text">OK</a>
</div>
</div>
<!-- Main Editor Area --> <!-- Main Editor Area -->
<div class="row"> <div class="row">
<div class="col m4 l3 hide-on-small-only"> <div class="col m4 l3 hide-on-small-only">
@ -1436,6 +1462,7 @@
<div class="col s12 m8 l9"> <div class="col s12 m8 l9">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip"> <div class="card input-field col s12 grey lighten-4 hoverable pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text"> <input class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div> </div>
</div> </div>
<div class="col s12 m8 l9 z-depth-2" id="editor"></div> <div class="col s12 m8 l9 z-depth-2" id="editor"></div>
@ -2209,6 +2236,7 @@
editor.session.getUndoManager().markClean(); editor.session.getUndoManager().markClean();
$('.markdirty').each(function(i, o){o.classList.remove('red');}); $('.markdirty').each(function(i, o){o.classList.remove('red');});
$('.hidesave').css('opacity', 0); $('.hidesave').css('opacity', 0);
check_lint();
}); });
} }
} }
@ -2653,6 +2681,58 @@
foldstatus = !foldstatus; foldstatus = !foldstatus;
} }
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.10.0/js-yaml.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript">
var lint_timeout;
var lint_status = $('#lint-status'); // speed optimization
var lint_error = "";
function check_lint()
{
if (document.getElementById('currentfile').value.match(".yaml$")) {
try {
var text = editor.getValue().replace(/!(include|secret)/g,".$1"); // hack because js-yaml does not like !include/!secret
jsyaml.safeLoad(text);
lint_status.text("check_circle");
lint_status.removeClass("cursor-pointer red-text grey-text");
lint_status.addClass("green-text");
lint_error = "";
} catch (err) {
lint_status.text("error");
lint_status.removeClass("green-text grey-text");
lint_status.addClass("cursor-pointer red-text");
lint_error = err.message;
}
} else {
lint_status.empty();
}
}
function queue_lint(e)
{
if (document.getElementById('currentfile').value.match(".yaml$")) {
clearTimeout(lint_timeout);
lint_timeout = setTimeout(check_lint, 500);
if (lint_status.text() != "cached") {
lint_status.text("cached");
lint_status.removeClass("cursor-pointer red-text green-text");
lint_status.addClass("grey-text");
}
} else {
lint_status.empty();
}
}
function show_lint_error()
{
if(lint_error) {
$("#modal_lint textarea").val(lint_error);
$("#modal_lint").modal('open');
}
}
editor.on('change', queue_lint);
</script> </script>
</body> </body>
</html> </html>