Update main.py

main.py

@@ -224,34 +224,42 @@ class CivitAICrawler:
         
         versions = info["modelVersions"]
 
-        # ★ ここで固定フォルダ "local_models" を作る
         base_dir = "local_models" 
         os.makedirs(base_dir, exist_ok=True)
 
-        # サブフォルダ名 (model_id を使う or model名を使う)
+        # フォルダ名はモデル名にする場合: 
+        # name = info.get("name","UnknownModel")
+        # folder_name = re.sub(r'[\\/*?:"<>|]', '_', name)
+        # ただし今はIDが使われているので:
         folder_name = str(model_id)
-        folder_path = os.path.join(base_dir, folder_name)
 
-        # 古いものがあれば消す
+        folder_path = os.path.join(base_dir, folder_name)
         if os.path.exists(folder_path):
             shutil.rmtree(folder_path)
         os.makedirs(folder_path, exist_ok=True)
 
-        logger.info(f"[OK] created local folder => {folder_path}")
+        logger.info(f"[OK] Created local folder => {folder_path}")
 
-        # ここでダウンロード (最新&古いバージョン)
-        # 例: すべて folder_path に保存 
+        # ダウンロード
         for v in versions:
             for f_info in v.get("files", []):
                 dl_url = f_info["downloadUrl"]
                 fname = f_info["name"]
                 self.download_file(dl_url, folder_path, fname)
         
-        # 画像もダウンロード (folder_path/images に)
+        # 画像
         self.download_images(versions, folder_path)
 
-        # ここで暗号化→アップロードするなら
-        self.encrypt_and_upload_folder(folder_path)
+        # OPTIONAL: save model_info.json or HTML
+        # self.save_model_info(info, folder_path)
+
+        # === 暗号化＆アップロード ===
+        logger.info(f"[DEBUG] Calling encrypt_and_upload_folder => {folder_path}")
+        enc_folder = self.encrypt_and_upload_folder(folder_path)
+        if enc_folder is None:
+            logger.warning("[WARN] Encryption/Upload returned None.")
+        else:
+            logger.info(f"[OK] Encrypted & uploaded folder => {enc_folder}")
 
     async def crawl(self):
         while True: