Upload main.py

main.py

@@ -201,19 +201,22 @@ class CivitAICrawler:
 
     def encrypt_and_upload_folder(self, local_folder: str) -> Optional[str]:
         """
-        1. rclone mkdir cryptLocal:subfolder_label
-        2. rclone copy local_folder => cryptLocal:subfolder_label
-        3. upload_folder() → ローカル削除
+        1. rclone copy local_folder => cryptLocal:   (フォルダ名はrcloneが勝手に暗号化生成)
+        2. 差分検知で "./encrypted" に作られた暗号フォルダ名を取得
+        3. そのフォルダ名を path_in_repo として Hugging Face にアップロード
+        4. ローカル(平文+暗号)フォルダ削除
+        5. 戻り値は "実際に作られた暗号フォルダ名"
         """
         if not os.path.isdir(local_folder):
-            logger.error(f"encrypt_and_upload_folder: {local_folder} is not a directory.")
+            logger.error(f"[encrypt_and_upload_folder] Not a directory: {local_folder}")
             return None
 
         encrypted_base_dir = os.path.join(os.getcwd(), "encrypted")
         os.makedirs(encrypted_base_dir, exist_ok=True)
 
-        # 既存の暗号物を削除
-        for item in os.listdir(encrypted_base_dir):
+        # 既存の暗号フォルダを削除
+        before_set = set(os.listdir(encrypted_base_dir))
+        for item in before_set:
             item_path = os.path.join(encrypted_base_dir, item)
             try:
                 if os.path.isfile(item_path):
@@ -224,52 +227,43 @@ class CivitAICrawler:
             except Exception as e:
                 logger.warning(f"[CLEANUP] Failed to remove {item_path}: {e}")
 
-        subfolder_label = "enc_" + str(uuid.uuid4())[:8]
-
-        # mkdir
-        try:
-            subprocess.run(["rclone", "mkdir", f"cryptLocal:{subfolder_label}"], check=True)
-            logger.info(f"[OK] rclone mkdir cryptLocal:{subfolder_label}")
-        except subprocess.CalledProcessError as e:
-            logger.error(f"rclone mkdir failed: {e}")
-            return None
-
-        # copy
+        # === (1) rclone copy local_folder => cryptLocal: ===
+        #     これにより /home/user/app/encrypted/<ランダム暗号フォルダ> が作成される
         try:
             subprocess.run(
-                [
-                    "rclone", "copy",
-                    local_folder,
-                    f"cryptLocal:{subfolder_label}",
-                    "--create-empty-src-dirs"
-                ],
+                ["rclone", "copy", local_folder, "cryptLocal:", "--create-empty-src-dirs"],
                 check=True
             )
-            logger.info(f"[OK] rclone copy {local_folder} => cryptLocal:{subfolder_label}")
+            logger.info(f"[OK] rclone copy {local_folder} => cryptLocal:")
         except subprocess.CalledProcessError as e:
             logger.error(f"rclone copy failed: {e}")
             return None
 
-        # 差分検知
-        after_list = os.listdir(encrypted_base_dir)
-        if not after_list:
-            logger.error("[ERROR] No new directory in ./encrypted after rclone copy.")
+        # === (2) 差分検知: 新しく生成された暗号フォルダ名を取得 ===
+        after_set = set(os.listdir(encrypted_base_dir))
+        diff = after_set - before_set
+        if not diff:
+            logger.error("[ERROR] No new directory appeared in ./encrypted after rclone copy.")
             return None
-        enc_folder_name = after_list[0]  # 先頭を使う
+        if len(diff) > 1:
+            logger.warning(f"[WARN] Multiple new directories created: {diff}")
+
+        enc_folder_name = diff.pop()  # 1個だけ取り出す
         enc_folder_path = os.path.join(encrypted_base_dir, enc_folder_name)
 
         if not os.path.isdir(enc_folder_path):
             logger.error(f"[ERROR] {enc_folder_path} is not a directory.")
             return None
 
-        # upload_folder
+        # === (3) Hugging Face にアップロード ===
+        #     path_in_repo も "enc_folder_name" をそのまま使う
         try:
-            self.upload_folder(enc_folder_path, path_in_repo=subfolder_label)
+            self.upload_folder(enc_folder_path, path_in_repo=enc_folder_name)
             logger.info(f"[OK] Uploaded encrypted folder: {enc_folder_path}")
         except Exception as e:
             logger.error(f"Failed to upload encrypted folder {enc_folder_path}: {e}")
 
-        # ローカル削除
+        # === (4) ローカル削除 (平文フォルダ + 暗号化フォルダ)
         try:
             shutil.rmtree(local_folder)
             shutil.rmtree(enc_folder_path)
@@ -277,7 +271,8 @@ class CivitAICrawler:
         except Exception as e:
             logger.warning(f"[CLEANUP] Could not remove local folders: {e}")
 
-        return subfolder_label
+        # === (5) 実際の暗号フォルダ名を返す
+        return enc_folder_name
 
     def upload_file(self, file_path: str, repo_id: Optional[str] = None, path_in_repo: Optional[str] = None):
         if repo_id is None: