From 73f0e90f7578862be1f9711c94f2d6adb92f8a6f Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Thu, 4 Jan 2024 01:06:34 -0700
Subject: [PATCH] Fix proto stuff

---
 Makefile                                      | 4 ++--
 pyproject.toml                                | 2 +-
 remarkable_update_fuse/{proto => }/.gitignore | 0
 remarkable_update_fuse/__init__.py            | 1 -
 remarkable_update_fuse/image.py               | 6 +++---
 remarkable_update_fuse/proto/__init__.py      | 0
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename remarkable_update_fuse/{proto => }/.gitignore (100%)
 delete mode 100644 remarkable_update_fuse/proto/__init__.py

diff --git a/Makefile b/Makefile
index 450b560..6b97fed 100644
--- a/Makefile
+++ b/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)
 
diff --git a/pyproject.toml b/pyproject.toml
index 6a77580..a179157 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "remarkable_update_fuse"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="Eeems", email="eeems@eeems.email" },
 ]
diff --git a/remarkable_update_fuse/proto/.gitignore b/remarkable_update_fuse/.gitignore
similarity index 100%
rename from remarkable_update_fuse/proto/.gitignore
rename to remarkable_update_fuse/.gitignore
diff --git a/remarkable_update_fuse/__init__.py b/remarkable_update_fuse/__init__.py
index 0740eb2..7a9f30b 100644
--- a/remarkable_update_fuse/__init__.py
+++ b/remarkable_update_fuse/__init__.py
@@ -1,4 +1,3 @@
-from . import proto
 from .fuse import ImageException
 from .fuse import UpdateFS
 from .image import UpdateImage
diff --git a/remarkable_update_fuse/image.py b/remarkable_update_fuse/image.py
index e7fbc97..d44c380 100644
--- a/remarkable_update_fuse/image.py
+++ b/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"):
diff --git a/remarkable_update_fuse/proto/__init__.py b/remarkable_update_fuse/proto/__init__.py
deleted file mode 100644
index e69de29..0000000