Skip to content

Added better Loader support for long-running sync reqs #1

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

Closed
wants to merge 2 commits into from
Closed

Added better Loader support for long-running sync reqs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c065ab
Added better Loader support for long-running sync reqs
nmiculinic May 16, 2018
7f8bfee
Bug fix (1)
nmiculinic May 16, 2018
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@

.idea
.pytest_cache
.venv
venv
10 changes: 9 additions & 1 deletion ranger/core/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import select
import sys
import errno
import concurrent.futures

try:
import chardet # pylint: disable=import-error
Expand Down Expand Up @@ -284,6 +285,7 @@ class Loader(FileManagerAware):
throbber_chars = r'/-\|'
throbber_paused = '#'
paused = False
executor = concurrent.futures.ThreadPoolExecutor()

def __init__(self):
self.queue = deque()
Expand All @@ -293,6 +295,7 @@ def __init__(self):
self.rotate()
self.old_item = None
self.status = None
self.pending_future = None

def rotate(self):
"""Rotate the throbber"""
Expand Down Expand Up @@ -408,7 +411,12 @@ def work(self):

while time() < end_time:
try:
next(item.load_generator)
if self.pending_future is None:
self.pending_future = Loader.executor.submit(next, item.load_generator)
self.pending_future.result(timeout=self.seconds_of_work_time)
self.pending_future = None
except concurrent.futures.TimeoutError:
break
except StopIteration:
self._remove_current_process(item)
break
Expand Down