mirror/ usbrip
1
0
Fork 0
mirror of https://github.com/snovvcrash/usbrip.git synced 2024-06-01 19:56:09 +02:00
Code

Minor edits

This commit is contained in:
Sam Fre3side 2019-09-04 02:23:03 +03:00
parent 5472d8ad10
commit f31aeff6db
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usbrip/lib/core/usbevents.py
View File

@ -87,6 +87,8 @@ class USBEvents:
filtered_history.extend(_read_log_file(file))
else:
print_info('Trying to run journalctl...')
# child_env = os.environ.copy()
# child_env['LANG'] = 'en_US.utf-8'
# journalctl_out = check_output(['journalctl'], env=child_env).decode('utf-8')
@ -98,6 +100,8 @@ class USBEvents:
]).decode('utf-8')
if '-- Logs begin at' in journalctl_out:
print_info('Successfully runned journalctl')
filtered_history = _read_log_file(
None,
log=StringIO(journalctl_out),
@ -105,6 +109,7 @@ class USBEvents:
)
else:
print_warning('Failed to run journalctl')
filtered_history = _get_filtered_history()
except USBRipError as e:
@ -523,14 +528,14 @@ def _is_sorted(iterable, reverse=False):
def _filter_events(all_events, sieve):
# sieve = {
# default_sieve = {
# 'external': False,
# 'dates': [],
# 'fields': {},
# 'number': -1
# }
if sieve is None:
if sieve is None or sieve == {'external': False, 'dates': [], 'fields': {}, 'number': -1}:
return all_events
else: