1
0
mirror of https://github.com/gryf/gryf-overlay.git synced 2025-12-19 04:20:26 +01:00
Files
gryf-overlay/dev-python/pystardict/files/pystardict-0.8-multiple-defs.patch

57 lines
1.8 KiB
Diff

--- a/pystardict.py
+++ b/pystardict.py
@@ -1,3 +1,4 @@
+from collections import defaultdict
import gzip
import hashlib
import os
@@ -142,7 +143,7 @@ class _StarDictIdx(object):
file.close()
""" prepare main dict and parsing parameters """
- self._idx = {}
+ self._idx = defaultdict(list)
idx_offset_bytes_size = int(container.ifo.idxoffsetbits / 8)
idx_offset_format = {4: 'L', 8: 'Q', }[idx_offset_bytes_size]
idx_cords_bytes_size = idx_offset_bytes_size + 4
@@ -164,7 +165,7 @@ class _StarDictIdx(object):
record_tuple = unpack(
'!%sc%sL' % (c + 1, idx_offset_format), matched_record)
word, cords = record_tuple[:c], record_tuple[c + 1:]
- self._idx[b''.join(word)] = cords
+ self._idx[b''.join(word)].append(cords)
def __getitem__(self, word):
"""
@@ -382,13 +383,16 @@ class _StarDictDict(object):
cords = self._container.idx[word]
if self._in_memory:
- bytes_ = self._file[cords[0]: cords[0] + cords[1]]
+ bytes_ = b'\n\n'.join([self._file[c[0]: c[0] + c[1]]
+ for c in cords])
else:
# seeking in file for data
- self._file.seek(cords[0])
+ def _read(cord):
+ self._file.seek(cord[0])
+ return self._file.read(cord[1])
# reading data
- bytes_ = self._file.read(cords[1])
+ bytes_ = b'\n\n'.join([_read(c) for c in cords])
return bytes_.decode('utf-8')
--- a/tests/test_pystardict.py
+++ b/tests/test_pystardict.py
@@ -33,7 +33,7 @@ def fixture_in_memory_dict():
def test001Idx(fixture_dict):
- assert fixture_dict.idx['test'] == (581161, 16,)
+ assert fixture_dict.idx['test'] == [(581161, 16,)]
def test002Dict(fixture_dict):