Update main.py

main.py

@@ -205,53 +205,53 @@ class CivitAICrawler:
                     fname = f_info["name"]
                     self.download_file(url, ov_folder, fname)
 
-    def get_model_info_json(self, model_info: dict, folder: str):
-        """model_info.jsonを保存"""
-        info_path = os.path.join(folder, "model_info.json")
+    def get_model_info(self, model_id: str) -> dict:
+        """モデルIDからCivitAIの情報を取得"""
         try:
-            with open(info_path, 'w', encoding='utf-8') as f:
-                json.dump(model_info, f, indent=2)
-            logger.info(f"[OK] saved model_info.json => {info_path}")
+            url = f"{self.config.URLS['modelId']}{model_id}"
+            resp = requests.get(url, headers=self.config.HEADERS)
+            resp.raise_for_status()
+            return resp.json()
         except Exception as e:
-            logger.error(f"[ERR] saving model_info.json: {e}")
+            logger.error(f"[ERR] get_model_info({model_id}): {e}")
+            return {}
 
     def process_model(self, model_id: str):
-        """本体処理: フォルダにまとめてDL => encrypt => upload"""
-        try:
-            info = self.get_model_info(model_id)
-            if not info or "modelVersions" not in info:
-                logger.error(f"[ERR] no modelVersions for {model_id}")
-                return
-            versions = info["modelVersions"]
-            folder_name = re.sub(r'[\\/*?:"<>|]', '_', info.get("name","UnknownModel"))
-            # local_folderベースに作りたいならこう↓
-            # local_folder = "local_folder"
-            # os.makedirs(local_folder, exist_ok=True)
-            # folder_path = os.path.join(local_folder, folder_name)
-            # ここでは、とりあえずapp直下に folder_name作成
-            folder_path = folder_name
-
-            if os.path.exists(folder_path):
-                shutil.rmtree(folder_path)
-            os.makedirs(folder_path, exist_ok=True)
-            logger.info(f"[OK] created folder => {folder_path}")
-
-            # ダウンロード
-            self.download_and_process_versions(versions, folder_path)
-
-            # 画像
-            self.download_images(versions, folder_path)
-
-            # model_info.json
-            self.get_model_info_json(info, folder_path)
-
-            # 暗号化アップ
-            enc_folder = self.encrypt_and_upload_folder(folder_path)
-            if enc_folder is None:
-                enc_folder = "[ENCRYPT_FAILED]"
-            # (Optional)  model_list.log に追記 など
-        except Exception as e:
-            logger.error(f"Error in process_model({model_id}): {e}")
+        info = self.get_model_info(model_id)
+        if not info or "modelVersions" not in info:
+            logger.error(f"[ERR] No modelVersions for {model_id}")
+            return
+        
+        versions = info["modelVersions"]
+
+        # ★ ここで固定フォルダ "local_models" を作る
+        base_dir = "local_models" 
+        os.makedirs(base_dir, exist_ok=True)
+
+        # サブフォルダ名 (model_id を使う or model名を使う)
+        folder_name = str(model_id)
+        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}")
+
+        # ここでダウンロード (最新&古いバージョン)
+        # 例: すべて 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)
 
     async def crawl(self):
         while True: