fixed various type issues
This commit is contained in:
1 parent
838ed91c5f
commit
d40da248de
13 files changed
+83
-85
No files matched your search
@@ -1,44 +0,0 @@
|
||||
from pdfmajor.parser.xref import iter_over_xref
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
from pdfmajor.parser.objects.indirect import IndirectObject
|
||||
from pdfmajor.parser.xrefdb import XRefDB
|
||||
from datetime import datetime
|
||||
from typing import List, NamedTuple, Tuple
|
||||
|
||||
|
||||
class PDFDocumentMetadata(NamedTuple):
|
||||
version: str
|
||||
creator: str
|
||||
producer: str
|
||||
creation_date: datetime
|
||||
mediabox: Tuple[int, int, int, int]
|
||||
|
||||
|
||||
class PDFPage(IndirectObject):
|
||||
pass
|
||||
|
||||
|
||||
class PDFResoruce(IndirectObject):
|
||||
pass
|
||||
|
||||
|
||||
class PDFDocument:
|
||||
metadata: PDFDocumentMetadata
|
||||
_xrefdb: XRefDB
|
||||
_resources: List[PDFResoruce]
|
||||
_pages: List[PDFPage]
|
||||
|
||||
def __init__(self, buffer: BufferStream, strict: bool = False) -> None:
|
||||
self._xrefdb = XRefDB()
|
||||
self._xrefdb.update_from_xrefiter(iter_over_xref(buffer, strict))
|
||||
self.metadata = get_metadata_from_buffer(buffer, self._xrefdb)
|
||||
self._pages = get_pages_from_buffer(buffer, self._xrefdb)
|
||||
self._resources = get_resources_from_buffer(buffer, self._xrefdb)
|
||||
|
||||
def read_page(self, page_num: int) -> PDFPage:
|
||||
page_obj = self._pages[page_num]
|
||||
# for
|
||||
|
||||
|
||||
# pdf_doc = PDFDocument.from_path('path/to/file.pdf')
|
||||
# pdf_doc.metadata
|
||||
+9
-10
@@ -1,33 +1,32 @@
|
||||
import io
|
||||
|
||||
from decimal import Decimal
|
||||
from typing import List
|
||||
from unittest import TestCase
|
||||
|
||||
from pdfmajor.lexer import iter_tokens
|
||||
from pdfmajor.lexer.number import parse_number
|
||||
from pdfmajor.lexer.comment import parse_comment
|
||||
from pdfmajor.lexer.dict_and_hex import parse_double_angled_bracket, parse_hexstring
|
||||
from pdfmajor.lexer.string import parse_string
|
||||
from pdfmajor.lexer.name import parse_name
|
||||
from pdfmajor.lexer.keyword import parse_keyword
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
from pdfmajor.lexer.name import parse_name
|
||||
from pdfmajor.lexer.number import parse_number
|
||||
from pdfmajor.lexer.string import parse_string
|
||||
from pdfmajor.lexer.token import (
|
||||
TDictValue,
|
||||
TArrayValue,
|
||||
TDictValue,
|
||||
Token,
|
||||
TokenArray,
|
||||
TokenBoolean,
|
||||
TokenComment,
|
||||
TokenNull,
|
||||
TokenReal,
|
||||
TokenDictionary,
|
||||
TokenHexString,
|
||||
TokenInteger,
|
||||
TokenKeyword,
|
||||
TokenName,
|
||||
TokenArray,
|
||||
TokenNull,
|
||||
TokenReal,
|
||||
TokenString,
|
||||
)
|
||||
from pdfmajor.lexer.comment import parse_comment
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
|
||||
|
||||
def make_stream_iter(data: bytes, buf_size: int):
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
from pathlib import Path
|
||||
from pdfmajor.parser import iter_objects
|
||||
from pdfmajor.parser.objects.collections import PDFArray, PDFDictionary
|
||||
from pdfmajor.parser.objects.primitives import PDFHexString, PDFInteger, PDFString
|
||||
|
||||
from typing import Any, Callable, List, Optional
|
||||
from decimal import Decimal
|
||||
from pathlib import Path
|
||||
from typing import Any, Callable, List, Optional
|
||||
from unittest import TestCase
|
||||
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
from pdfmajor.parser.objects.indirect import IndirectObject, ObjectRef
|
||||
from pdfmajor.parser import iter_objects
|
||||
from pdfmajor.parser.objects.base import PDFObject
|
||||
from pdfmajor.parser.objects.collections import PDFArray, PDFDictionary
|
||||
from pdfmajor.parser.objects.comment import PDFComment
|
||||
from pdfmajor.parser.objects.indirect import IndirectObject, ObjectRef
|
||||
from pdfmajor.parser.objects.primitives import PDFHexString, PDFInteger, PDFString
|
||||
from pdfmajor.parser.stream.PDFStream import PDFStream
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
|
||||
CURRENT_FOLDER = Path(__file__).parent
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import io
|
||||
from unittest import TestCase
|
||||
from pdfmajor.streambuffer import StreamEOF, BufferStream
|
||||
|
||||
from pdfmajor.streambuffer import BufferStream, StreamEOF
|
||||
|
||||
|
||||
class UseCase(TestCase):
|
||||
|
||||
+39
-4
@@ -1,10 +1,10 @@
|
||||
from pathlib import Path
|
||||
from typing import Dict, Tuple
|
||||
from pdfmajor.xref.xrefdb import XRefDB
|
||||
from unittest import TestCase
|
||||
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
from pdfmajor.xref.xref import XRefRow, iter_over_xref
|
||||
from pdfmajor.xref.xref import XRefRow
|
||||
from pdfmajor.xref.xrefdb import XRefDB
|
||||
|
||||
CURRENT_FOLDER = Path(__file__).parent
|
||||
|
||||
@@ -689,6 +689,41 @@ class Standard(TestCase):
|
||||
},
|
||||
)
|
||||
|
||||
def test_colors(self):
|
||||
self.run_test(
|
||||
file_path=CURRENT_FOLDER / "samples" / "pdf" / "colors.pdf",
|
||||
expected_xrefs={
|
||||
(1, 0): XRefRow(offset=7435, obj_num=1, gen_num=0, use=b"n"),
|
||||
(2, 0): XRefRow(offset=19, obj_num=2, gen_num=0, use=b"n"),
|
||||
(3, 0): XRefRow(offset=316, obj_num=3, gen_num=0, use=b"n"),
|
||||
(4, 0): XRefRow(offset=7578, obj_num=4, gen_num=0, use=b"n"),
|
||||
(5, 0): XRefRow(offset=336, obj_num=5, gen_num=0, use=b"n"),
|
||||
(6, 0): XRefRow(offset=6576, obj_num=6, gen_num=0, use=b"n"),
|
||||
(7, 0): XRefRow(offset=6597, obj_num=7, gen_num=0, use=b"n"),
|
||||
(8, 0): XRefRow(offset=6792, obj_num=8, gen_num=0, use=b"n"),
|
||||
(9, 0): XRefRow(offset=7140, obj_num=9, gen_num=0, use=b"n"),
|
||||
(10, 0): XRefRow(offset=7348, obj_num=10, gen_num=0, use=b"n"),
|
||||
(11, 0): XRefRow(offset=7380, obj_num=11, gen_num=0, use=b"n"),
|
||||
(12, 0): XRefRow(offset=7677, obj_num=12, gen_num=0, use=b"n"),
|
||||
(13, 0): XRefRow(offset=7774, obj_num=13, gen_num=0, use=b"n"),
|
||||
},
|
||||
expected_types={
|
||||
(1, 0): "/Page",
|
||||
(2, 0): "{{PDFUnknownComplexType}}",
|
||||
(3, 0): "{{PDFPrimitive}}",
|
||||
(4, 0): "/Pages",
|
||||
(5, 0): "{{PDFUnknownComplexType}}",
|
||||
(6, 0): "{{PDFPrimitive}}",
|
||||
(7, 0): "/FontDescriptor",
|
||||
(8, 0): "{{PDFUnknownComplexType}}",
|
||||
(9, 0): "/Font",
|
||||
(10, 0): "{{PDFUnknownComplexType}}",
|
||||
(11, 0): "{{PDFUnknownComplexType}}",
|
||||
(12, 0): "/Catalog",
|
||||
(13, 0): "{{PDFUnknownComplexType}}",
|
||||
},
|
||||
)
|
||||
|
||||
def test_other_docs(self):
|
||||
for doc_path in (CURRENT_FOLDER / "samples" / "pdf").iterdir():
|
||||
with self.subTest(doc_path):
|
||||
@@ -704,9 +739,9 @@ class Standard(TestCase):
|
||||
}
|
||||
)
|
||||
print("=======", doc_path.name, "===== END")
|
||||
|
||||
|
||||
def test_bad_unicode(self):
|
||||
doc_path = (CURRENT_FOLDER / "samples" / "pdf" / "bad-unicode.pdf")
|
||||
doc_path = CURRENT_FOLDER / "samples" / "pdf" / "bad-unicode.pdf"
|
||||
with doc_path.open("rb") as fp:
|
||||
buffer = BufferStream(fp)
|
||||
db = XRefDB(buffer)
|
||||
|
||||
Reference in new issue
Block a user