teaching/xopp2py
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Got rid of 'Header' class in abstract syntax (moved its attributes right into XournalFile)

Browse source
This commit is contained in:
Joeri Exelmans 2023-03-02 15:46:34 +01:00
parent ceb1c2ffed
commit a84f473feb
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/xopp2py/abstract_syntax.py
View file

@ -3,11 +3,6 @@
from dataclasses import dataclass from dataclasses import dataclass
from decimal import Decimal from decimal import Decimal
@dataclass
class Header:
creator: str # e.g., "Xournal++ 1.1.2"
fileversion: int # e.g., 4
@dataclass @dataclass
class Background: class Background:
type: str # could be enum type: str # could be enum
@ -37,7 +32,8 @@ class Page:
@dataclass @dataclass
class XournalFile: class XournalFile:
header: Header creator: str # e.g., "Xournal++ 1.1.2"
title: str # obscure feature fileversion: int # e.g., 4
preview: bytes # PNG-encoded preview of the (first page) of the file title: str # obscure feature
preview: bytes # PNG-encoded preview of the (first page) of the file
pages: list[Page] pages: list[Page]

9
src/xopp2py/parser.py
View file

@ -50,10 +50,8 @@ def parseFile(path) -> abstract_syntax.XournalFile:
for (event, element) in context: for (event, element) in context:
if event == "start": if event == "start":
if element.tag == "xournal": if element.tag == "xournal":
header = abstract_syntax.Header( creator=element.get("creator")
creator=element.get("creator"), fileversion=int(element.get("fileversion"))
fileversion=int(element.get("fileversion")),
)
elif element.tag == "title": elif element.tag == "title":
title = element.text title = element.text
elif element.tag == "preview": elif element.tag == "preview":
@ -65,7 +63,8 @@ def parseFile(path) -> abstract_syntax.XournalFile:
raise Error("Unsupported tag:" + element.tag) raise Error("Unsupported tag:" + element.tag)
return abstract_syntax.XournalFile( return abstract_syntax.XournalFile(
header=header, creator=creator,
fileversion=fileversion,
title=title, title=title,
preview=preview, preview=preview,
pages=pages) pages=pages)