Upload main.py

main.py

@@ -165,15 +165,12 @@ class CivitAICrawler:
         """画像を images フォルダにまとめてダウンロードする."""
         images_folder = os.path.join(folder, "images")
         os.makedirs(images_folder, exist_ok=True)
-
         images = []
         for version in model_versions:
             for img in version.get("images", []):
-                image_url = img["url"]
-                images.append(image_url)
-
+                images.append(img["url"])
         for image_url in images:
-            image_name = os.path.basename(image_url)  # ファイル名部分
+            image_name = os.path.basename(image_url)
             local_path = os.path.join(images_folder, image_name)
             try:
                 resp = requests.get(image_url, stream=True)
@@ -208,17 +205,17 @@ class CivitAICrawler:
             logger.error(f"Failed to save model info JSON: {e}")
 
 
-    # ======================================================
-    # 修正: rclone が生成した暗号フォルダ名をそのまま使う
-    # ======================================================
+    # =====================================================
+    # 必ずサブフォルダを作り、古いファイルやフォルダは削除してからコピー
+    # =====================================================
     def encrypt_and_upload_folder(self, local_folder: str) -> Optional[str]:
         """
-        1. rclone copy local_folder cryptLocal:
-           => /home/user/app/encrypted/xxxx というランダム暗号フォルダが生成される
-        2. 生成されたフォルダ名を特定 (new_folders)
-        3. それを upload_folder() でアップロード
-        4. 平文フォルダ & 暗号フォルダをローカル削除
-        5. 暗号フォルダ名を返す
+        1. /home/user/app/encrypted 配下の古いファイルやフォルダを消去（オプション）
+        2. rclone copy local_folder => cryptLocal:subfolder_label
+           → /home/user/app/encrypted/subfolder_label/ が必ずフォルダとして作られる
+        3. そのフォルダを upload_folder()
+        4. ローカル平文フォルダ & 暗号フォルダを削除
+        5. 最後に subfolder_label を return
         """
         if not os.path.exists(local_folder):
             logger.error(f"encrypt_and_upload_folder: folder not found: {local_folder}")
@@ -227,41 +224,54 @@ class CivitAICrawler:
         encrypted_base_dir = os.path.join(os.getcwd(), "encrypted")
         os.makedirs(encrypted_base_dir, exist_ok=True)
 
-        before_set = set(os.listdir(encrypted_base_dir))
+        # --- 古い暗号ファイルやフォルダを消す例 ---
+        # これにより "/home/user/app/encrypted" 配下を毎回スッキリさせる
+        for item in os.listdir(encrypted_base_dir):
+            item_path = os.path.join(encrypted_base_dir, item)
+            try:
+                if os.path.isfile(item_path) or os.path.islink(item_path):
+                    os.remove(item_path)
+                else:
+                    shutil.rmtree(item_path)
+                logger.info(f"[CLEANUP] Removed old encrypted item: {item_path}")
+            except Exception as e:
+                logger.warning(f"[CLEANUP] Failed to remove {item_path}: {e}")
+        # --------------------------------------
+
+        # 今回は "enc_{UUID}" のようなサブフォルダ名を決める
+        subfolder_label = "enc_" + str(uuid.uuid4())[:8]
 
-        # サブフォルダ名を指定しない => rclone が自動的に暗号フォルダを生成
+        # rclone で確実に "enc_XXXX" フォルダが生成される
         try:
-            subprocess.run(["rclone", "copy", local_folder, "cryptLocal:"], check=True)
+            subprocess.run(
+                ["rclone", "copy", local_folder, f"cryptLocal:{subfolder_label}"],
+                check=True
+            )
         except subprocess.CalledProcessError as e:
             logger.error(f"rclone copy failed: {e}")
             return None
 
-        after_set = set(os.listdir(encrypted_base_dir))
-        new_folders = list(after_set - before_set)
-        if not new_folders:
-            logger.error("No new encrypted folder found. Possibly an error.")
+        enc_folder_path = os.path.join(encrypted_base_dir, subfolder_label)
+        if not os.path.isdir(enc_folder_path):
+            logger.error(f"[ERROR] {enc_folder_path} is not a directory. Rclone must have produced a file instead.")
             return None
 
-        # 通常1個だけだが、複数できたら先頭を採用
-        enc_folder_name = new_folders[0]
-        enc_folder_path = os.path.join(encrypted_base_dir, enc_folder_name)
-
-        # アップロード (暗号化済フォルダをそのまま)
+        # フォルダをアップロード
         try:
-            self.upload_folder(enc_folder_path, path_in_repo=enc_folder_name)
-            logger.info(f"Uploaded encrypted folder to HF: {enc_folder_path}")
+            self.upload_folder(enc_folder_path, path_in_repo=subfolder_label)
+            logger.info(f"Uploaded encrypted folder: {enc_folder_path}")
         except Exception as e:
             logger.error(f"Failed to upload encrypted folder {enc_folder_path}: {e}")
 
-        # ローカル削除 (平文 & 暗号後)
+        # ローカル平文フォルダと暗号フォルダを削除
         try:
             shutil.rmtree(local_folder)
             shutil.rmtree(enc_folder_path)
-            logger.info(f"Removed local: {local_folder} and encrypted: {enc_folder_path}")
+            logger.info(f"Removed local folder: {local_folder} and {enc_folder_path}")
         except Exception as e:
             logger.error(f"Failed to remove local folders: {e}")
 
-        return enc_folder_name
+        return subfolder_label
 
     def upload_file(self, file_path: str, repo_id: Optional[str] = None, path_in_repo: Optional[str] = None):
         if repo_id is None:
@@ -413,14 +423,12 @@ class CivitAICrawler:
             # model_info.json保存
             self.save_model_info_json(model_info, folder_name)
 
-            # 暗号化→アップロード。rcloneが生成したフォルダ名を返す
-            enc_folder_name = self.encrypt_and_upload_folder(folder_name)
-            if enc_folder_name is None:
-                # 失敗時のフォルダ名
-                enc_folder_name = "[ENCRYPT_FAILED]"
+            # === フォルダごと暗号化 & アップロード
+            enc_subfolder = self.encrypt_and_upload_folder(folder_name)
+            if enc_subfolder is None:
+                enc_subfolder = "[ENCRYPT_FAILED]"
 
-            # 暗号後フォルダをHTTPS URLに組み立て
-            hf_enc_url = f"https://huggingface.co/{self.repo_ids['current']}/tree/main/{enc_folder_name}"
+            hf_enc_url = f"https://huggingface.co/{self.repo_ids['current']}/tree/main/{enc_subfolder}"
 
             # model_list.logに追記 (実際の暗号フォルダ名をそのまま書き込む)
             with open(self.config.LIST_FILE, "a", encoding="utf-8") as f: