joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more details about dream; prevent X11 windows during feature

Browse Source 
detection
This commit is contained in:
Jakob Ketterl 2020-09-20 12:41:11 +02:00
parent e3e94ad14e
commit eaaa214dc9
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
owrx/feature.py
View File

@ -6,6 +6,7 @@ from distutils.version import LooseVersion
import inspect import inspect
from owrx.config import Config from owrx.config import Config
import shlex import shlex
import os
import logging import logging
@ -102,12 +103,19 @@ class FeatureDetector(object):
def get_requirement_description(self, requirement): def get_requirement_description(self, requirement):
return inspect.getdoc(self._get_requirement_method(requirement)) return inspect.getdoc(self._get_requirement_method(requirement))
def command_is_runnable(self, command): def command_is_runnable(self, command, expected_result=None):
tmp_dir = Config.get()["temporary_directory"] tmp_dir = Config.get()["temporary_directory"]
cmd = shlex.split(command) cmd = shlex.split(command)
env = os.environ.copy()
# prevent X11 programs from opening windows if called from a GUI shell
env.pop("DISPLAY", None)
try: try:
process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=tmp_dir) process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=tmp_dir, env=env)
return process.wait() != 32512 rc = process.wait()
if expected_result is None:
return rc != 32512
else:
return rc == expected_result
except FileNotFoundError: except FileNotFoundError:
return False return False
@ -442,6 +450,9 @@ class FeatureDetector(object):
In order to be able to decode DRM broadcasts, OpenWebRX needs the "dream" DRM decoder. You can get it In order to be able to decode DRM broadcasts, OpenWebRX needs the "dream" DRM decoder. You can get it
[here](https://sourceforge.net/projects/drm/files/dream/). [here](https://sourceforge.net/projects/drm/files/dream/).
Note: Please use version 2.1.1, the latest version (2.2 at the time of writing) has been reported to cause
problems.
The version supplied by most distributions will not work properly on the command line, so compiling from source The version supplied by most distributions will not work properly on the command line, so compiling from source
with a custom set of commands is recommended: with a custom set of commands is recommended:
@ -451,4 +462,4 @@ class FeatureDetector(object):
sudo make install sudo make install
``` ```
""" """
return self.command_is_runnable("dream --help") return self.command_is_runnable("dream --help", 0)