Merge pull request #17 from ueckoken/flat-layout

flat layout
ueckoken · Aug 21, 2023 · 7292a1c · 7292a1c
2 parents c437d3e + 22c1a63
commit 7292a1c
Show file tree

Hide file tree

Showing 16 changed files with 191 additions and 184 deletions.
diff --git a/Register.sh b/Register.sh
diff --git a/Reset.py b/Reset.py
diff --git a/Unregister.sh b/Unregister.sh
diff --git a/km4k2/__init__.py b/km4k2/__init__.py
diff --git a/km4k2/__main__.py b/km4k2/__main__.py
@@ -0,0 +1,47 @@
+import os
+from datetime import timedelta
+
+import redis
+from RPi import GPIO
+
+import km4k2.rb303 as servo
+from km4k2.card_sdk import CardSDK
+from km4k2.km4k import start_system
+from km4k2.redis_cache_aside_card_verifier import RedisCacheAsideCardVerifier
+
+
+def main():
+    isopen = False
+    okled_pin = 19
+    ngled_pin = 26
+    # 有効期間1週間
+    cache_expires_delta = timedelta(weeks=1)
+
+    # Redisに接続
+    conn = redis.StrictRedis(
+        host=os.environ["REDIS_HOST"],
+        port=os.environ["REDIS_PORT"],
+        db=os.environ["REDIS_DB"],
+    )
+    api_verifier = CardSDK("https://card.ueckoken.club", os.environ["API_KEY"])
+    redis_cached_api_verifier = RedisCacheAsideCardVerifier(
+        api_verifier,
+        conn,
+        cache_expires_delta,
+    )
+
+    servo.reset()
+    GPIO.setmode(GPIO.BCM)
+    GPIO.setup(okled_pin, GPIO.OUT)
+    GPIO.setup(ngled_pin, GPIO.OUT)
+
+    try:
+        print("Welcome to Koken Kagi System")
+        start_system(isopen, okled_pin, ngled_pin, redis_cached_api_verifier)
+    except Exception as e:  # noqa: BLE001
+        print("An error has occured!")
+        print(e)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/card_sdk.py → km4k2/card_sdk.py b/card_sdk.py → km4k2/card_sdk.py
diff --git a/card_verifier_interface.py → km4k2/card_verifier_interface.py b/card_verifier_interface.py → km4k2/card_verifier_interface.py
@@ -1,6 +1,6 @@
-from typing_extensions import Protocol
-
-
-class CardVerifierInterface(Protocol):
-    def verify(self, idm: str) -> bool:
-        ...
+from typing_extensions import Protocol
+
+
+class CardVerifierInterface(Protocol):
+    def verify(self, idm: str) -> bool:
+        ...
diff --git a/KM4K.py → km4k2/km4k.py b/KM4K.py → km4k2/km4k.py
@@ -1,19 +1,11 @@
-#!/usr/bin/python3
-
 import binascii
-import os
-import sys
 import time
-from datetime import timedelta
 
 import nfc
-import redis
 from RPi import GPIO
 
-import rb303 as servo
-from card_sdk import CardSDK
-from card_verifier_interface import CardVerifierInterface
-from redis_cache_aside_card_verifier import RedisCacheAsideCardVerifier
+import km4k2.rb303 as servo
+from km4k2.card_verifier_interface import CardVerifierInterface
 
 suica = nfc.clf.RemoteTarget("212F")
 suica.sensf_req = bytearray.fromhex("0000030000")
@@ -65,40 +57,3 @@ def start_system(isopen, okled_pin, ngled_pin, verifier: CardVerifierInterface):
                 time.sleep(0.1)
                 GPIO.output(ngled_pin, GPIO.LOW)
                 time.sleep(1.7)
-
-
-def main(_):
-    isopen = False
-    okled_pin = 19
-    ngled_pin = 26
-    # 有効期間1週間
-    cache_expires_delta = timedelta(weeks=1)
-
-    # Redisに接続
-    conn = redis.StrictRedis(
-        host=os.environ["REDIS_HOST"],
-        port=os.environ["REDIS_PORT"],
-        db=os.environ["REDIS_DB"],
-    )
-    api_verifier = CardSDK("https://card.ueckoken.club", os.environ["API_KEY"])
-    redis_cached_api_verifier = RedisCacheAsideCardVerifier(
-        api_verifier,
-        conn,
-        cache_expires_delta,
-    )
-
-    servo.reset()
-    GPIO.setmode(GPIO.BCM)
-    GPIO.setup(okled_pin, GPIO.OUT)
-    GPIO.setup(ngled_pin, GPIO.OUT)
-
-    try:
-        print("Welcome to Koken Kagi System")
-        start_system(isopen, okled_pin, ngled_pin, redis_cached_api_verifier)
-    except Exception as e:  # noqa: BLE001
-        print("An error has occured!")
-        print(e)
-
-
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/rb303.py → km4k2/rb303.py b/rb303.py → km4k2/rb303.py
diff --git a/redis_cache_aside_card_verifier.py → km4k2/redis_cache_aside_card_verifier.py b/redis_cache_aside_card_verifier.py → km4k2/redis_cache_aside_card_verifier.py
@@ -2,7 +2,7 @@
 
 from redis import Redis
 
-from card_verifier_interface import CardVerifierInterface
+from km4k2.card_verifier_interface import CardVerifierInterface
 
 
 class RedisCacheAsideCardVerifier:

diff --git a/km4k2/reset.py b/km4k2/reset.py
@@ -0,0 +1,4 @@
+from km4k2.rb303 import lock
+
+if __name__ == "__main__":
+    lock()
diff --git a/test_KM4K.py b/test_KM4K.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/test_card_sdk.py → tests/test_card_sdk.py b/test_card_sdk.py → tests/test_card_sdk.py
@@ -3,7 +3,7 @@
 
 import requests_mock
 
-from card_sdk import CardSDK
+from km4k2.card_sdk import CardSDK
 
 
 class TestCardSDK(TestCase):