MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-02-21 20:38:54 +00:00
Code Issues Releases Wiki Activity

#394: readlines isn't lazy

Browse Source
This commit is contained in:
nvbn 2015-10-29 22:51:30 +08:00
parent bd6ee68c03
commit 8c8abca8d5
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
thefuck/shells.py
View File

@ -52,37 +52,18 @@ class Generic(object):
with open(history_file_name, 'a') as history: with open(history_file_name, 'a') as history:
history.write(self._get_history_line(command_script)) history.write(self._get_history_line(command_script))
def _script_from_history(self, line):
"""Returns prepared history line.
Should return a blank line if history line is corrupted or empty.
"""
return ''
def _get_history_lines(self, history_file):
"""Returns all history lines.
If `settings.history_limit` defined, limits result to `settings.history_limit`.
"""
if not settings.history_limit:
return history_file.readlines()
buffer = []
for line in history_file.readlines():
if len(buffer) > settings.history_limit:
buffer.pop(0)
buffer.append(line)
return buffer
def get_history(self): def get_history(self):
"""Returns list of history entries.""" """Returns list of history entries."""
history_file_name = self._get_history_file_name() history_file_name = self._get_history_file_name()
if os.path.isfile(history_file_name): if os.path.isfile(history_file_name):
with io.open(history_file_name, 'r', with io.open(history_file_name, 'r',
encoding='utf-8', errors='ignore') as history_file: encoding='utf-8', errors='ignore') as history_file:
for line in self._get_history_lines(history_file):
lines = history_file.readlines()
if settings.history_limit:
lines = lines[-settings.history_limit:]
for line in lines:
prepared = self._script_from_history(line)\ prepared = self._script_from_history(line)\
.strip() .strip()
if prepared: if prepared: