From bb2bb4857e9eaff0a89b3fa288947075ac4715f4 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 28 May 2025 13:14:47 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E5=B8=B8=E6=99=82=E3=81=AF?= =?UTF-8?q?=E3=81=82=E3=82=8A=E3=81=88=E3=81=AA=E3=81=84=E3=81=8C=E3=80=81?= =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E5=90=8D=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=A0=E3=81=A3=E3=81=9F=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AB=E6=AD=A3=E5=B8=B8=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92=E5=AF=BE=E5=87=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/ultmarc/import_ultmarc_process.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/import_ultmarc_process.py b/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/import_ultmarc_process.py index 572688c6..54111dff 100644 --- a/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/import_ultmarc_process.py +++ b/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/import_ultmarc_process.py @@ -1,6 +1,7 @@ """アルトマークデータ処理""" import json +from urllib.parse import unquote from src.aws.s3 import ConfigBucket, UltmarcBucket from src.batch.ultmarc.datfile import DatFile @@ -34,7 +35,9 @@ def exec_import(): # ファイルの件数は必ず1件になる dat_file_info = dat_file_list[0] dat_file_name = dat_file_info['filename'] - if environment.IMPORT_FILE_KEY != dat_file_name: + # ファイル名が日本語のとき、URLエンコードされるているため、デコードする + decoded_import_file_key = unquote(environment.IMPORT_FILE_KEY, encoding='utf-8', errors='replace') + if decoded_import_file_key != dat_file_name: raise BatchOperationException(f'取込対象のファイルが見つからないため、異常終了 ファイル名:{environment.IMPORT_FILE_KEY}') # 0Byteの場合、 if dat_file_info['size'] == 0: