Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 40 additions & 29 deletions maxminddb/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,35 +64,7 @@ def __init__(
a path. This mode implies MODE_MEMORY.

"""
filename: Any
if (mode == MODE_AUTO and mmap) or mode == MODE_MMAP:
with open(database, "rb") as db_file: # type: ignore[arg-type]
self._buffer = mmap.mmap(db_file.fileno(), 0, access=mmap.ACCESS_READ)
self._buffer_size = self._buffer.size()
filename = database
elif mode in (MODE_AUTO, MODE_FILE):
self._buffer = FileBuffer(database) # type: ignore[arg-type]
self._buffer_size = self._buffer.size()
filename = database
elif mode == MODE_MEMORY:
with open(database, "rb") as db_file: # type: ignore[arg-type]
buf = db_file.read()
self._buffer = buf
self._buffer_size = len(buf)
filename = database
elif mode == MODE_FD:
self._buffer = database.read() # type: ignore[union-attr]
self._buffer_size = len(self._buffer) # type: ignore[arg-type]
filename = database.name # type: ignore[union-attr]
else:
msg = (
f"Unsupported open mode ({mode}). Only MODE_AUTO, MODE_FILE, "
"MODE_MEMORY and MODE_FD are supported by the pure Python "
"Reader"
)
raise ValueError(
msg,
)
filename = self._load_buffer(database, mode)

metadata_start = self._buffer.rfind(
self._METADATA_START_MARKER,
Expand Down Expand Up @@ -276,6 +248,45 @@ def _resolve_data_pointer(self, pointer: int) -> Record:
(data, _) = self._decoder.decode(resolved)
return data

def _load_buffer(
self, database: AnyStr | int | PathLike | IO, mode: int = MODE_AUTO
) -> str:
filename: Any
if (mode == MODE_AUTO and mmap) or mode == MODE_MMAP:
with open(database, "rb") as db_file: # type: ignore[arg-type]
self._buffer = mmap.mmap(db_file.fileno(), 0, access=mmap.ACCESS_READ)
self._buffer_size = self._buffer.size()
filename = database
elif mode in (MODE_AUTO, MODE_FILE):
self._buffer = FileBuffer(database) # type: ignore[arg-type]
self._buffer_size = self._buffer.size()
filename = database
elif mode == MODE_MEMORY:
with open(database, "rb") as db_file: # type: ignore[arg-type]
buf = db_file.read()
self._buffer = buf
self._buffer_size = len(buf)
filename = database
elif mode == MODE_FD:
self._buffer = database.read() # type: ignore[union-attr]
self._buffer_size = len(self._buffer) # type: ignore[arg-type]
# io buffers are not guaranteed to have a name attribute
if hasattr(database, "name"):
filename = database.name # type: ignore[union-attr]
else:
filename = f"<{type(database)}>"
else:
msg = (
f"Unsupported open mode ({mode}). Only MODE_AUTO, MODE_FILE, "
"MODE_MEMORY and MODE_FD are supported by the pure Python "
"Reader"
)
raise ValueError(
msg,
)

return filename

def close(self) -> None:
"""Close the MaxMind DB file and returns the resources to the system."""
with contextlib.suppress(AttributeError):
Expand Down
11 changes: 11 additions & 0 deletions tests/reader_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import io
import ipaddress
import multiprocessing
import os
Expand Down Expand Up @@ -524,6 +525,16 @@ def test_closed_metadata(self) -> None:
else:
self.assertIsNotNone(metadata, "pure Python implementation returns value")

def test_reading_from_buffer(self) -> None:
filename = "tests/data/test-data/MaxMind-DB-test-ipv4-24.mmdb"
with open(filename, "rb") as f:
buf = io.BytesIO(f.read())
# we have to use unpatched open_database here because the patched version
# calls open() on our buffer
reader = maxminddb.open_database(buf, MODE_FD)
self._check_ip_v4(reader, filename)
reader.close()

if os.name != "nt":

def test_multiprocessing(self):
Expand Down
Loading