Skip to content

feat: disable showing sdk manager progress #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkg20001 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: disable showing sdk manager progress #838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e957e48
feat: disable showing sdk manager progress
mkg20001 Feb 26, 2019
1348197
fix: "Downloading platform api target if necessary" call not using _a…
mkg20001 Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion buildozer/targets/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ def _sdkmanager(self, *args, **kwargs):
"""Call the sdkmanager in our Android SDK with the given arguments."""
# Use the android-sdk dir as cwd by default
kwargs['cwd'] = kwargs.get('cwd', self.android_sdk_dir)
if "CI" in environ and ">/dev/null" not in args:
args = list(args)
args.insert(len(args), ' | grep -v "^\\["')
args = tuple(args)
command = self.sdkmanager_path + ' ' + ' '.join(args)

@AndreMiras AndreMiras Mar 29, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead if this 4 lines of code "adding" the grep o the args. I think it would be more simple to go after the command = self.sdkmanager_path + ' ' + ' '.join(args) line and to do something like:

if 'CI' in environ:
    # hide download lines which look like "[=          ] 10% Downloading platform-tools"
    command += r' | grep -v "^\["'

Also note that I've used a raw-string to make the grep expression more readable (by skipping the double escaping of the \).
Last I've added a little code comment because it's not super obvious what we are doing

return_child = kwargs.pop('return_child', False)
if return_child:
Expand Down Expand Up @@ -467,6 +471,10 @@ def _android_update_sdk(self, *sdkmanager_commands):
command = '{} | {} --licenses'.format(
yes_command, self.sdkmanager_path)
self.buildozer.cmd(command, cwd=self.android_sdk_dir)
if "CI" in environ:
sdkmanager_commands = list(sdkmanager_commands)
sdkmanager_commands.insert(len(sdkmanager_commands), '>/dev/null') # mute stdout, important stuff goes to stderr anyways
sdkmanager_commands = tuple(sdkmanager_commands)

@AndreMiras AndreMiras Mar 29, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not skipping this whole part since you already introduced the grep -v "^\\[" fix in the _sdkmanager() method above?

self._sdkmanager(*sdkmanager_commands)

def _read_version_subdir(self, *args):
Expand Down Expand Up @@ -553,7 +561,7 @@ def _install_android_packages(self):
android_platform = join(self.android_sdk_dir, 'platforms', 'android-{}'.format(self.android_api))
if not self.buildozer.file_exists(android_platform):
if not skip_upd:
self._sdkmanager('"platforms;android-{}"'.format(self.android_api))
self._android_update_sdk('"platforms;android-{}"'.format(self.android_api))
else:
self.buildozer.info(
'Skipping install API {} platform tools due to spec setting'.format(
Expand Down