Fix proto stuff

Makefile

@@ -7,7 +7,7 @@ FW_VERSION := 2.15.1.1189
 FW_DATA := wVbHkgKisg-
 
 PROTO_SOURCE := $(shell find protobuf -type f -name '*.proto')
-PROTO_OBJ := $(addprefix $(PACKAGE)/proto/,$(PROTO_SOURCE:%.proto=%_pb2.py))
+PROTO_OBJ := $(addprefix $(PACKAGE),$(PROTO_SOURCE:%.proto=%_pb2.py))
 
 OBJ := $(shell find ${PACKAGE} -type f)
 OBJ += requirements.txt
@@ -125,7 +125,7 @@ dist/rmufuse: dist .venv/bin/activate $(OBJ)
 
 $(PROTO_OBJ): $(PROTO_SOURCE)
 	protoc \
-	    --python_out=$(PACKAGE)/proto/ \
+	    --python_out=$(PACKAGE) \
 	    --proto_path=protobuf \
 	    $(PROTO_SOURCE)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "remarkable_update_fuse"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="Eeems", email="[email protected]" },
 ]

remarkable_update_fuse/__init__.py

@@ -1,4 +1,3 @@
-from . import proto
 from .fuse import ImageException
 from .fuse import UpdateFS
 from .image import UpdateImage

remarkable_update_fuse/image.py

@@ -11,9 +11,9 @@
 from cryptography.hazmat.primitives.serialization import load_pem_public_key
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
 from cryptography.hazmat.primitives.hashes import SHA256
-from .proto.update_metadata_pb2 import DeltaArchiveManifest
-from .proto.update_metadata_pb2 import InstallOperation
-from .proto.update_metadata_pb2 import Signatures
+from .update_metadata_pb2 import DeltaArchiveManifest
+from .update_metadata_pb2 import InstallOperation
+from .update_metadata_pb2 import Signatures
 
 
 def sizeof_fmt(num, suffix="B"):