mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-24 03:11:24 -07:00
adds simple installed packages parsing
This commit is contained in:
parent
25264203b1
commit
ec674cdcbb
2 changed files with 34 additions and 1 deletions
|
@ -14,6 +14,8 @@ def sdkmanager_runner(module, **kwargs):
|
||||||
arg_formats=dict(
|
arg_formats=dict(
|
||||||
state=cmd_runner_fmt.as_map(_state_map),
|
state=cmd_runner_fmt.as_map(_state_map),
|
||||||
name=cmd_runner_fmt.as_list(),
|
name=cmd_runner_fmt.as_list(),
|
||||||
update=cmd_runner_fmt.as_bool("--update")
|
update=cmd_runner_fmt.as_fixed("--update"),
|
||||||
|
installed=cmd_runner_fmt.as_fixed("--list_installed")
|
||||||
),
|
),
|
||||||
|
**kwargs
|
||||||
)
|
)
|
||||||
|
|
|
@ -5,6 +5,8 @@ from ansible_collections.community.general.plugins.module_utils.sdkmanager impor
|
||||||
|
|
||||||
|
|
||||||
class AndroidSdk(StateModuleHelper):
|
class AndroidSdk(StateModuleHelper):
|
||||||
|
_RE_INSTALLED_PACKAGES_HEADER = re.compile(r'^\s+Path\s+|\s+Version\s+|\s+Description\s+|\s+Location\s+$')
|
||||||
|
_RE_INSTALLED_PACKAGES = re.compile(r'^\s+(\S+)\s+\|\s+(\S+)\s+\|\s(.+)\s\|\s+(\S+)$')
|
||||||
module = dict(
|
module = dict(
|
||||||
argument_spec=dict(
|
argument_spec=dict(
|
||||||
state=dict(type='str', default='present', choices=['present', 'absent', 'latest']),
|
state=dict(type='str', default='present', choices=['present', 'absent', 'latest']),
|
||||||
|
@ -13,6 +15,7 @@ class AndroidSdk(StateModuleHelper):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
use_old_vardict = False
|
use_old_vardict = False
|
||||||
|
output_params = ('installed')
|
||||||
|
|
||||||
def _get_formatted_packages(self):
|
def _get_formatted_packages(self):
|
||||||
arg_pkgs = self.vars.package
|
arg_pkgs = self.vars.package
|
||||||
|
@ -23,8 +26,36 @@ class AndroidSdk(StateModuleHelper):
|
||||||
packages.append(fmt_pkg)
|
packages.append(fmt_pkg)
|
||||||
return packages
|
return packages
|
||||||
|
|
||||||
|
def _get_installed_packages(self):
|
||||||
|
with self.sdkmanager('installed') as ctx:
|
||||||
|
rc, stdout, stderr = ctx.run()
|
||||||
|
|
||||||
|
packages = []
|
||||||
|
data = stdout.split('\n')
|
||||||
|
|
||||||
|
lines_count = len(data)
|
||||||
|
|
||||||
|
i = 0
|
||||||
|
|
||||||
|
while i < lines_count:
|
||||||
|
line = data[i]
|
||||||
|
if self._RE_INSTALLED_PACKAGES_HEADER.match(line):
|
||||||
|
i += 1
|
||||||
|
else:
|
||||||
|
p = self._RE_INSTALLED_PACKAGES.search(line)
|
||||||
|
if p:
|
||||||
|
name = p.group(1)
|
||||||
|
version = p.group(2)
|
||||||
|
description = p.group(3)
|
||||||
|
packages.append((name, version, description))
|
||||||
|
i += 1
|
||||||
|
return packages
|
||||||
|
|
||||||
def __state_fallback__(self):
|
def __state_fallback__(self):
|
||||||
packages = self._get_formatted_packages()
|
packages = self._get_formatted_packages()
|
||||||
|
|
||||||
|
installed = self._get_installed_packages()
|
||||||
|
self.vars.installed = installed
|
||||||
with self.sdkmanager('state name') as ctx:
|
with self.sdkmanager('state name') as ctx:
|
||||||
ctx.run(name=packages)
|
ctx.run(name=packages)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue