From f56395704e650dea39c1ae3b4a1d7fe79c4db02b Mon Sep 17 00:00:00 2001 From: wood Date: Mon, 9 Sep 2024 20:12:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(migrate):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=81=E7=A7=BB=E9=AA=8C=E8=AF=81=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=94=AE=E8=AF=8D=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/migrate.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/migrate.py b/src/migrate.py index 2e7ef48..5e51545 100644 --- a/src/migrate.py +++ b/src/migrate.py @@ -19,22 +19,21 @@ def migrate_data(json_file, db_file): # 读取 JSON 文件 with open(json_file, 'r') as f: - data = json.load(f) + keywords = json.load(f) logger.info(f"JSON file loaded: {json_file}") + if not isinstance(keywords, list): + raise ValueError(f"Expected a list in JSON file, but got {type(keywords)}") + # 迁移关键词 - keywords = data.get('keywords', []) for keyword in keywords: db.add_keyword(keyword) - logger.info(f"Migrated {len(keywords)} keywords") + + logger.info(f"Migration complete. Migrated {len(keywords)} keywords.") - # 迁移白名单 - whitelist = data.get('whitelist', []) - for domain in whitelist: - db.add_whitelist(domain) - logger.info(f"Migrated {len(whitelist)} whitelist entries") - - logger.info(f"Migration complete. Keywords: {len(keywords)}, Whitelist: {len(whitelist)}") + # 验证迁移 + migrated_keywords = db.get_all_keywords() + logger.info(f"Verified {len(migrated_keywords)} keywords in the database.") except Exception as e: logger.error(f"An error occurred during migration: {str(e)}")