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

Remove FFmpeg input tests (#18131)

Browse Source 
* Remove FFmpeg input tests

* Not needed here

* Removing tests for removed functionality

* Minor lint

* Fix tests to reflect removed config option

* Remove async service registration by request

* More lint

* Unused imports

* Make it a non-breaking change

* Update ffmpeg.py
This commit is contained in:
jjlawren
2018-11-03 06:36:22 -05:00
committed by Paulus Schoutsen
parent 782a90a535
commit 9807ba1a5d
7 changed files with 15 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/ffmpeg.py
View File

@@ -40,12 +40,11 @@ CONF_OUTPUT = 'output'
CONF_RUN_TEST = 'run_test'
DEFAULT_BINARY = 'ffmpeg'
DEFAULT_RUN_TEST = True
CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({
vol.Optional(CONF_FFMPEG_BIN, default=DEFAULT_BINARY): cv.string,
vol.Optional(CONF_RUN_TEST, default=DEFAULT_RUN_TEST): cv.boolean,
vol.Optional(CONF_RUN_TEST): cv.boolean,
}),
}, extra=vol.ALLOW_EXTRA)
@@ -60,8 +59,7 @@ async def async_setup(hass, config):
manager = FFmpegManager(
hass,
conf.get(CONF_FFMPEG_BIN, DEFAULT_BINARY),
conf.get(CONF_RUN_TEST, DEFAULT_RUN_TEST)
conf.get(CONF_FFMPEG_BIN, DEFAULT_BINARY)
)
# Register service
@@ -95,40 +93,17 @@ async def async_setup(hass, config):
class FFmpegManager:
"""Helper for ha-ffmpeg."""
def __init__(self, hass, ffmpeg_bin, run_test):
def __init__(self, hass, ffmpeg_bin):
"""Initialize helper."""
self.hass = hass
self._cache = {}
self._bin = ffmpeg_bin
self._run_test = run_test
@property
def binary(self):
"""Return ffmpeg binary from config."""
return self._bin
async def async_run_test(self, input_source):
"""Run test on this input. TRUE is deactivate or run correct.
This method must be run in the event loop.
"""
from haffmpeg import Test
if self._run_test:
# if in cache
if input_source in self._cache:
return self._cache[input_source]
# run test
ffmpeg_test = Test(self.binary, loop=self.hass.loop)
success = await ffmpeg_test.run_test(input_source)
if not success:
_LOGGER.error("FFmpeg '%s' test fails!", input_source)
self._cache[input_source] = False
return False
self._cache[input_source] = True
return True
class FFmpegBase(Entity):
"""Interface object for FFmpeg."""