jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-27 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix version conflicts

Browse Source
This commit is contained in:
Pascal Vizeli 2018-05-29 00:18:08 +02:00
commit dc341c8af8
12 changed files with 41 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hassio/api/__init__.py
View File

@ -185,10 +185,11 @@ class RestAPI(CoreSysAttributes):
def _register_panel(self): def _register_panel(self):
"""Register panel for homeassistant.""" """Register panel for homeassistant."""
def create_response(build_type): panel_dir = Path(__file__).parent.joinpath("panel")
def create_response(panel_file):
"""Create a function to generate a response.""" """Create a function to generate a response."""
path = Path(__file__).parent.joinpath( path = panel_dir.joinpath(f"{panel_file!s}.html")
f"panel/{build_type}.html")
return lambda request: web.FileResponse(path) return lambda request: web.FileResponse(path)
# This route is for backwards compatibility with HA < 0.58 # This route is for backwards compatibility with HA < 0.58
@ -202,10 +203,7 @@ class RestAPI(CoreSysAttributes):
]) ])
# This route is for HA > 0.61 # This route is for HA > 0.61
self.webapp.add_routes([ self.webapp.add_routes([web.static('/app-es5', panel_dir)])
web.get('/app-es5/index.html', create_response('index')),
web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
])
async def start(self): async def start(self):
"""Run rest api webserver.""" """Run rest api webserver."""

93
hassio/api/panel/hassio-app.html
View File

File diff suppressed because one or more lines are too long

BIN
hassio/api/panel/hassio-app.html.gz
View File

Binary file not shown.

33
hassio/api/panel/index.html
View File

@ -11,27 +11,28 @@
padding: 0; padding: 0;
} }
</style> </style>
<script src='/frontend_es5/custom-elements-es5-adapter.js'></script>
</head> </head>
<body> <body>
<hassio-app></hassio-app> <hassio-app></hassio-app>
<script> <script>
function addScript(src) { function addScript(src) {
var e = document.createElement('script'); var e = document.createElement('script');
e.src = src; e.src = src;
document.head.appendChild(e); document.write(e.outerHTML);
} }
if (!window.parent.HASS_DEV) { var webComponentsSupported = (
addScript('/frontend_es5/custom-elements-es5-adapter.js'); 'customElements' in window &&
} 'import' in document.createElement('link') &&
var webComponentsSupported = ( 'content' in document.createElement('template'));
'customElements' in window && if (!webComponentsSupported) {
'import' in document.createElement('link') && addScript('/static/webcomponents-bundle.js');
'content' in document.createElement('template')); }
if (!webComponentsSupported) {
addScript('/static/webcomponents-lite.js');
}
</script> </script>
<!--
Disabled while we make Home Assistant able to serve the right files.
<script src="./app.js"></script>
-->
<link rel='import' href='./hassio-app.html'> <link rel='import' href='./hassio-app.html'>
<link rel='import' href='/static/mdi.html' async>
</body> </body>
</html> </html>

BIN
hassio/api/panel/index.html.gz
View File

Binary file not shown.

2
hassio/api/proxy.py
View File

@ -34,7 +34,7 @@ class APIProxy(CoreSysAttributes):
try: try:
data = None data = None
headers = {} headers = {}
method = getattr(self._websession_ssl, request.method.lower()) method = getattr(self.sys_websession_ssl, request.method.lower())
params = request.query or None params = request.query or None
# read data # read data

5
hassio/api/security.py
View File

@ -35,11 +35,10 @@ class SecurityMiddleware(CoreSysAttributes):
_LOGGER.debug("Passthrough %s", request.path) _LOGGER.debug("Passthrough %s", request.path)
return await handler(request) return await handler(request)
# Need to be removed later # Unknown API access
if not hassio_token: if not hassio_token:
_LOGGER.warning("Invalid token for access %s", request.path) _LOGGER.warning("Invalid token for access %s", request.path)
request[REQUEST_FROM] = 'UNKNOWN' raise HTTPUnauthorized()
return await handler(request)
# Home-Assistant # Home-Assistant
if hassio_token == self.sys_homeassistant.uuid: if hassio_token == self.sys_homeassistant.uuid:

2
hassio/const.py
View File

@ -2,7 +2,7 @@
from pathlib import Path from pathlib import Path
from ipaddress import ip_network from ipaddress import ip_network
HASSIO_VERSION = '103' HASSIO_VERSION = '104'
URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/' URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
'hassio/{}/version.json') 'hassio/{}/version.json')

4
hassio/misc/hardware.py
View File

@ -63,6 +63,10 @@ class Hardware:
@property @property
def audio_devices(self): def audio_devices(self):
"""Return all available audio interfaces.""" """Return all available audio interfaces."""
if not ASOUND_CARDS.exists():
_LOGGER.info("No audio devices found")
return {}
try: try:
with ASOUND_CARDS.open('r') as cards_file: with ASOUND_CARDS.open('r') as cards_file:
cards = cards_file.read() cards = cards_file.read()

2
home-assistant-polymer

@ -1 +1 @@
Subproject commit 38e1b16031c397dda15399c63bfa40c40a5d0351 Subproject commit e158709b1e13a5af867c6c5436e881839dffa476

11
setup.py
View File

@ -40,13 +40,14 @@ setup(
], ],
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'async_timeout==2.0.1', 'attr==0.3.1',
'aiohttp==3.1.2', 'async_timeout==3.0.0',
'docker==3.2.0', 'aiohttp==3.2.1',
'docker==3.3.0',
'colorlog==3.1.2', 'colorlog==3.1.2',
'voluptuous==0.11.1', 'voluptuous==0.11.1',
'gitpython==2.1.8', 'gitpython==2.1.10',
'pytz==2018.3', 'pytz==2018.4',
'pyudev==0.21.0', 'pyudev==0.21.0',
'pycryptodome==3.4.11' 'pycryptodome==3.4.11'
] ]

2
version.json
View File

@ -1,5 +1,5 @@
{ {
"hassio": "103.3", "hassio": "104",
"homeassistant": "0.70.0", "homeassistant": "0.70.0",
"resinos": "1.3", "resinos": "1.3",
"resinhup": "0.3", "resinhup": "0.3",