GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2018-06-28 23:18:53 +03:00
parent 23070a3d23
commit 9237bb020d
4 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kvmd/kvmd.yaml
View File

@ -27,18 +27,12 @@ kvmd:
video: video:
pinout: pinout:
cap: 21 cap: 21
vga: 25 conv: 25
sync_delay: 1.0 sync_delay: 1.0
shutdown_delay: 10.0 shutdown_delay: 10.0
mjpg_streamer: cmd: "/usr/bin/mjpg_streamer -i 'input_uvc.so -d /dev/video0 -e 2 -y -n -r 720x576' -o 'output_http.so -l localhost -p 8082'"
prog: /usr/bin/mjpg_streamer
device: /dev/video0
width: 720
height: 576
every: 2
host: localhost
port: 8082
logging: logging:
version: 1 version: 1
@ -46,7 +40,7 @@ logging:
formatters: formatters:
console: console:
(): contextlog.SmartFormatter (): logging.Formatter
style: "{" style: "{"
datefmt: "%H:%M:%S" datefmt: "%H:%M:%S"
format: "[{asctime}] {name:20.20} {levelname:>7} --- {message}" format: "[{asctime}] {name:20.20} {levelname:>7} --- {message}"

37
kvmd/kvmd/__init__.py
View File

@ -18,38 +18,39 @@ def main() -> None:
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
atx = Atx( atx = Atx(
power_led=config["atx"]["leds"]["pinout"]["power"], power_led=int(config["atx"]["leds"]["pinout"]["power"]),
hdd_led=config["atx"]["leds"]["pinout"]["hdd"], hdd_led=int(config["atx"]["leds"]["pinout"]["hdd"]),
power_switch=config["atx"]["switches"]["pinout"]["power"], power_switch=int(config["atx"]["switches"]["pinout"]["power"]),
reset_switch=config["atx"]["switches"]["pinout"]["reset"], reset_switch=int(config["atx"]["switches"]["pinout"]["reset"]),
click_delay=config["atx"]["switches"]["click_delay"], click_delay=float(config["atx"]["switches"]["click_delay"]),
long_click_delay=config["atx"]["switches"]["long_click_delay"], long_click_delay=float(config["atx"]["switches"]["long_click_delay"]),
) )
streamer = Streamer( streamer = Streamer(
cap_power=config["video"]["pinout"]["cap"], cap_power=int(config["video"]["pinout"]["cap"]),
vga_power=config["video"]["pinout"]["vga"], conv_power=int(config["video"]["pinout"]["conv"]),
sync_delay=config["video"]["sync_delay"], sync_delay=float(config["video"]["sync_delay"]),
mjpg_streamer=config["video"]["mjpg_streamer"], cmd=str(config["video"]["cmd"]),
loop=loop, loop=loop,
) )
keyboard = Ps2Keyboard( keyboard = Ps2Keyboard(
clock=config["keyboard"]["pinout"]["clock"], clock=int(config["keyboard"]["pinout"]["clock"]),
data=config["keyboard"]["pinout"]["data"], data=int(config["keyboard"]["pinout"]["data"]),
pulse=config["keyboard"]["pulse"], pulse=float(config["keyboard"]["pulse"]),
) )
Server( Server(
atx=atx, atx=atx,
streamer=streamer, streamer=streamer,
keyboard=keyboard, keyboard=keyboard,
heartbeat=config["server"]["heartbeat"], heartbeat=float(config["server"]["heartbeat"]),
atx_leds_poll=config["atx"]["leds"]["poll"], atx_leds_poll=float(config["atx"]["leds"]["poll"]),
video_shutdown_delay=config["video"]["shutdown_delay"], video_shutdown_delay=float(config["video"]["shutdown_delay"]),
loop=loop, loop=loop,
).run( ).run(
host=config["server"]["host"], host=str(config["server"]["host"]),
port=config["server"]["port"], port=int(config["server"]["port"]),
) )
get_logger().info("Bye-bye") get_logger().info("Bye-bye")

5
kvmd/kvmd/extras/cleanup/__init__.py
View File

@ -18,8 +18,9 @@ def main() -> None:
*config["atx"]["switches"]["pinout"].items(), *config["atx"]["switches"]["pinout"].items(),
*config["video"]["pinout"].items(), *config["video"]["pinout"].items(),
]: ]:
logger.info("Writing value=0 to pin=%d (%s)", pin, key) if pin > 0:
gpio.write(pin, False) logger.info("Writing value=0 to pin=%d (%s)", pin, key)
gpio.write(pin, False)
logger.info("Trying to find and kill mjpg_streamer ...") logger.info("Trying to find and kill mjpg_streamer ...")
try: try:

35
kvmd/kvmd/streamer.py
View File

@ -1,7 +1,6 @@
import asyncio import asyncio
import asyncio.subprocess import asyncio.subprocess
from typing import Dict
from typing import Optional from typing import Optional
from .logging import get_logger from .logging import get_logger
@ -14,21 +13,16 @@ class Streamer: # pylint: disable=too-many-instance-attributes
def __init__( def __init__(
self, self,
cap_power: int, cap_power: int,
vga_power: int, conv_power: int,
sync_delay: float, sync_delay: float,
mjpg_streamer: Dict, cmd: str,
loop: asyncio.AbstractEventLoop, loop: asyncio.AbstractEventLoop,
) -> None: ) -> None:
self.__cap_power = gpio.set_output(cap_power) self.__cap_power = gpio.set_output(cap_power)
self.__vga_power = gpio.set_output(vga_power) self.__conv_power = (gpio.set_output(conv_power) if conv_power > 0 else conv_power)
self.__sync_delay = sync_delay self.__sync_delay = sync_delay
self.__cmd = cmd
self.__cmd = (
"%(prog)s"
" -i 'input_uvc.so -d %(device)s -e %(every)s -y -n -r %(width)sx%(height)s'"
" -o 'output_http.so -p -l %(host)s %(port)s'"
) % (mjpg_streamer)
self.__loop = loop self.__loop = loop
@ -36,13 +30,13 @@ class Streamer: # pylint: disable=too-many-instance-attributes
async def start(self) -> None: async def start(self) -> None:
assert not self.__proc_task assert not self.__proc_task
get_logger().info("Starting mjpg_streamer ...") get_logger().info("Starting streamer ...")
await self.__set_hw_enabled(True) await self.__set_hw_enabled(True)
self.__proc_task = self.__loop.create_task(self.__process()) self.__proc_task = self.__loop.create_task(self.__process())
async def stop(self) -> None: async def stop(self) -> None:
assert self.__proc_task assert self.__proc_task
get_logger().info("Stopping mjpg_streamer ...") get_logger().info("Stopping streamer ...")
self.__proc_task.cancel() self.__proc_task.cancel()
await asyncio.gather(self.__proc_task, return_exceptions=True) await asyncio.gather(self.__proc_task, return_exceptions=True)
await self.__set_hw_enabled(False) await self.__set_hw_enabled(False)
@ -52,11 +46,12 @@ class Streamer: # pylint: disable=too-many-instance-attributes
return bool(self.__proc_task) return bool(self.__proc_task)
async def __set_hw_enabled(self, enabled: bool) -> None: async def __set_hw_enabled(self, enabled: bool) -> None:
# XXX: This sequence is very important for enable # XXX: This sequence is very important to enable converter and cap board
gpio.write(self.__cap_power, enabled) gpio.write(self.__cap_power, enabled)
if enabled: if self.__conv_power > 0:
await asyncio.sleep(self.__sync_delay) if enabled:
gpio.write(self.__vga_power, enabled) await asyncio.sleep(self.__sync_delay)
gpio.write(self.__conv_power, enabled)
await asyncio.sleep(self.__sync_delay) await asyncio.sleep(self.__sync_delay)
async def __process(self) -> None: async def __process(self) -> None:
@ -70,13 +65,13 @@ class Streamer: # pylint: disable=too-many-instance-attributes
stdout=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.STDOUT, stderr=asyncio.subprocess.STDOUT,
) )
logger.info("Started mjpg_streamer pid=%d: %s", proc.pid, self.__cmd) logger.info("Started streamer pid=%d: %s", proc.pid, self.__cmd)
empty = 0 empty = 0
while proc.returncode is None: while proc.returncode is None:
line = (await proc.stdout.readline()).decode(errors="ignore").strip() line = (await proc.stdout.readline()).decode(errors="ignore").strip()
if line: if line:
logger.info("mjpg_streamer: %s", line) logger.info("streamer: %s", line)
empty = 0 empty = 0
else: else:
empty += 1 empty += 1
@ -90,9 +85,9 @@ class Streamer: # pylint: disable=too-many-instance-attributes
break break
except Exception as err: except Exception as err:
if proc: if proc:
logger.exception("Unexpected finished mjpg_streamer pid=%d with retcode=%d", proc.pid, proc.returncode) logger.exception("Unexpected finished streamer pid=%d with retcode=%d", proc.pid, proc.returncode)
else: else:
logger.exception("Can't start mjpg_streamer: %s", err) logger.exception("Can't start streamer: %s", err)
await asyncio.sleep(1) await asyncio.sleep(1)
if proc: if proc: