ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
- Let PagedList open func be specified outside.
This commit is contained in:
Andrew Hamilton 2019-08-30 14:17:09 +10:00
parent cfb5c44554
commit 408f2de098
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
eris/paged_list.py
View file

@ -3,7 +3,6 @@
import functools import functools
import gzip
import os import os
import pickle import pickle
import shutil import shutil
@ -11,10 +10,12 @@ import shutil
class PagedList: class PagedList:
def __init__(self, list_, pages_dir, page_size, cache_size, exist_ok=False): def __init__(self, list_, pages_dir, page_size, cache_size, exist_ok=False,
open_func=open):
self.pages_dir = pages_dir # An empty or non-existant directory. self.pages_dir = pages_dir # An empty or non-existant directory.
self.page_size = page_size self.page_size = page_size
self.cache_size = cache_size self.cache_size = cache_size
self.open_func = open_func
self._len = len(list_) self._len = len(list_)
tmp_dir = pages_dir + ".tmp" tmp_dir = pages_dir + ".tmp"
if exist_ok: if exist_ok:
@ -26,7 +27,7 @@ class PagedList:
for start in range(0, len(list_), self.page_size))) for start in range(0, len(list_), self.page_size)))
for index, page in enumerate(pages): for index, page in enumerate(pages):
pickle_path = os.path.join(tmp_dir, str(index)) pickle_path = os.path.join(tmp_dir, str(index))
with gzip.open(pickle_path, "wb") as file_: with self.open_func(pickle_path, "wb") as file_:
pickle.dump(page, file_, protocol=pickle.HIGHEST_PROTOCOL) pickle.dump(page, file_, protocol=pickle.HIGHEST_PROTOCOL)
self.page_count = index + 1 self.page_count = index + 1
os.rename(tmp_dir, self.pages_dir) os.rename(tmp_dir, self.pages_dir)
@ -37,7 +38,7 @@ class PagedList:
def _get_page(self, index): # This is cached, see setup_page_cache. def _get_page(self, index): # This is cached, see setup_page_cache.
pickle_path = os.path.join(self.pages_dir, str(index)) pickle_path = os.path.join(self.pages_dir, str(index))
with gzip.open(pickle_path, "rb") as file_: with self.open_func(pickle_path, "rb") as file_:
return pickle.load(file_) return pickle.load(file_)
def __getitem__(self, index): def __getitem__(self, index):

3
eris/worker.py
View file

@ -4,6 +4,7 @@
# Licensed under the Artistic License 2.0. # Licensed under the Artistic License 2.0.
import asyncio import asyncio
import gzip
import os import os
import shutil import shutil
import signal import signal
@ -88,7 +89,7 @@ def make_result_widget(text, result):
if len(appearance) > page_size: if len(appearance) > page_size:
appearance = eris.paged_list.PagedList( appearance = eris.paged_list.PagedList(
appearance, result.get_pages_dir(), page_size, cache_size=2, appearance, result.get_pages_dir(), page_size, cache_size=2,
exist_ok=True) exist_ok=True, open_func=gzip.open)
return fill3.Fixed(appearance) return fill3.Fixed(appearance)