Update main.py

main.py

@@ -168,32 +168,44 @@ class CivitAICrawler:
 
         return enc_folder_name
 
-    def process_model(self, model_id: str):
-        # ダウンロード + 暗号化 + アップ
+    def process_model(self, model_url: str):
         try:
-            minfo = self.get_model_info(model_id)
-            if not minfo or "modelVersions" not in minfo:
-                logger.error(f"[ERR] No modelVersions for {model_id}")
+            model_id = model_url.rstrip("/").split("/")[-1]
+            model_info = self.get_model_info(model_id)
+            if not model_info or "modelVersions" not in model_info:
+                logger.error(f"No valid model info for ID {model_id}. Skipping.")
                 return
 
-            versions = minfo["modelVersions"]
-            # local folder
-            folder_name = re.sub(r'[\\/*?:"<>|]', '_', minfo.get("name", "UnknownModel"))
-            folder_name += f"_{uuid.uuid4()[:8]}"
+            versions = model_info["modelVersions"]
+            if not versions:
+                logger.warning(f"No modelVersions found for ID {model_id}.")
+                return
+
+            # 1) 単にモデル名をサニタイズしたディレクトリにまとめる
+            folder_name = re.sub(r'[\\/*?:"<>|]', '_', model_info.get("name", "UnknownModel"))
+
+            # フォルダが既にあれば削除し、新規に作り直す (上書き)
+            if os.path.exists(folder_name):
+                shutil.rmtree(folder_name)
             os.makedirs(folder_name, exist_ok=True)
 
-            # ダウンロード (最新/古い) => まとめて folder_name
-            # 画像 => folder_name/images
-            # etc...
-            self.download_versions(versions, folder_name)
+            # ダウンロード (最新/old_versions), 画像, HTML, model_info.json など
+            self.download_and_process_versions(versions, folder_name)
             self.download_images(versions, folder_name)
-            # ここでHTMLや model_info.json 保存もやるなら追加:
-            # ...
-            enc_f = self.encrypt_and_upload_folder(folder_name)
-            # => HF upload + cleanup
+            self.save_html_content(f"{self.config.URLS['modelPage']}{model_id}", folder_name)
+            self.save_model_info_json(model_info, folder_name)
+
+            # 暗号化アップロード
+            enc_subfolder = self.encrypt_and_upload_folder(folder_name)
+            if enc_subfolder is None:
+                enc_subfolder = "[ENCRYPT_FAILED]"
+
+            hf_enc_url = f"https://huggingface.co/{self.repo_ids['current']}/tree/main/{enc_subfolder}"
+            with open(self.config.LIST_FILE, "a", encoding="utf-8") as f:
+                f.write(f"{model_info.get('name', 'UnnamedModel')} (ID:{model_id}): {hf_enc_url}\n")
 
         except Exception as e:
-            logger.error(f"[ERR] process_model({model_id}) => {e}")
+            logger.error(f"Error in process_model({model_url}): {e}")
 
     def download_versions(self, model_versions: list, folder: str):
         # すべて folder/ にまとめる or old_versions subfolder