feat: Implement rMQR.fit

OUDON · OUDON · commit 945eeea59c40 · 2022-06-05T12:39:02.000+09:00
diff --git a/src/make_qr.py b/src/make_qr.py
@@ -1,44 +1,13 @@
 from enums.color import Color
-from enums.error_collection_level import ErrorCollectionLevel
-from rmqr.rmqr import rMQR
-from rmqr.rmqr import DataTooLongError
-from rmqr.data_capacities import data_capacities
+from rmqr import rMQR, ErrorCollectionLevel
 from encoder.byte_encoder import ByteEncoder
 from qr_image import QRImage
 
 
-def select_version(data, error_collection_level):
-    data_length = ByteEncoder.length(data)
-    ok_versions = []
-    for qr_version, capacity in data_capacities.items():
-        if data_length <= capacity['Byte'][error_collection_level]:
-            ok_versions.append({
-                'version': qr_version,
-                'diff': capacity['Byte'][error_collection_level] - data_length
-            })
-            print(f"ok: {qr_version}")
-
-    if len(ok_versions) == 0:
-        raise DataTooLongError("The data is too long.")
-
-    # とりあえず容量のあまりが最も少なくなるものを選ぶ
-    # TODO: 選び方をパラメータで変えられるようにしたい
-    selected = sorted(ok_versions, key=lambda x: x['diff'])[0]
-    return selected['version']
-
-
-def make_qr(data, version, error_collection_level):
-    qr = rMQR(version, error_collection_level)
-    qr.make(data)
-    return qr
-
-
 def main():
-    data = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. orem ipsum dolor sit amet, consectetur adipi"
+    data = "ABCdef123漢字あいうえお"
     error_collection_level = ErrorCollectionLevel.M
-    version = select_version(data, error_collection_level)
-    print(f"selected: {version}")
-    qr = make_qr(data, version, error_collection_level)
+    qr = rMQR.fit(data, error_collection_level)
     qr.dump()
 
     image = QRImage(qr)
diff --git a/src/rmqr/__init__.py b/src/rmqr/__init__.py
@@ -0,0 +1,2 @@
+from rmqr.rmqr import rMQR
+from enums.error_collection_level import ErrorCollectionLevel
diff --git a/src/rmqr/rmqr.py b/src/rmqr/rmqr.py
@@ -3,6 +3,7 @@
 from enums.alignment_pattern_coordinates import AlignmentPatternCoordinates
 from enums.generator_polynomials import GeneratorPolynomials
 from enums.error_collection_level import ErrorCollectionLevel
+from rmqr.data_capacities import data_capacities
 
 from .qr_versions import qr_versions
 from .mask import mask
@@ -12,6 +13,30 @@
 
 
 class rMQR:
+    @staticmethod
+    def fit(data, error_collection_level):
+        data_length = ByteEncoder.length(data)
+        ok_versions = []
+        for qr_version, capacity in data_capacities.items():
+            if data_length <= capacity['Byte'][error_collection_level]:
+                ok_versions.append({
+                    'version': qr_version,
+                    'diff': capacity['Byte'][error_collection_level] - data_length
+                })
+                print(f"ok: {qr_version}")
+
+        if len(ok_versions) == 0:
+            raise DataTooLongError("The data is too long.")
+
+        # とりあえず容量のあまりが最も少なくなるものを選ぶ
+        # TODO: 選び方をパラメータで変えられるようにしたい
+        selected = sorted(ok_versions, key=lambda x: x['diff'])[0]
+
+        qr = rMQR(selected['version'], error_collection_level)
+        qr.make(data)
+        return qr
+
+
     def __init__(self, version, error_collection_level):
         qr_version = qr_versions[version]
         self._height = qr_version['height']

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+from rmqr.rmqr import rMQR`
	`2`	`+from enums.error_collection_level import ErrorCollectionLevel`