Merge pull request #7 from OUDON/fix/raise-too-long-error

OUDON · web-flow · commit a52fe90eb6f2 · 2022-06-13T19:53:51.000+09:00
fix: Raise too long error
diff --git a/src/rmqrcode/console.py b/src/rmqrcode/console.py
@@ -53,12 +53,15 @@ def main():
     elif args.fit_strategy == 'min_height':
         fit_strategy = FitStrategy.MINIMIZE_HEIGHT
 
-    qr = _make_qr(
-        args.DATA,
-        ecc=ecc,
-        version=args.version,
-        fit_strategy=fit_strategy
-    )
+    try:
+        qr = _make_qr(
+            args.DATA,
+            ecc=ecc,
+            version=args.version,
+            fit_strategy=fit_strategy
+        )
+    except DataTooLongError:
+        _show_error_and_exit("Error: The data is too long.")
 
     _save_image(qr, args.OUTPUT)
 
diff --git a/src/rmqrcode/rmqrcode.py b/src/rmqrcode/rmqrcode.py
@@ -265,6 +265,9 @@ def _put_data(self, data):
         encoded_data = self._convert_to_bites_data(data, character_count_length, codewords_total)
         codewords = split_into_8bits(encoded_data)
 
+        if len(codewords) > codewords_total:
+            raise DataTooLongError("The data is too long.")
+
         # codeword数に満たない場合は規定の文字列を付与する
         while True:
             if len(codewords) >= codewords_total:
