Upload main.py

main.py

@@ -133,49 +133,78 @@ class CivitAICrawler:
             logger.error(f"[ERR] upload_folder: {e}")
 
     def encrypt_and_upload_folder(self, local_folder: str) -> Optional[str]:
-        """local_folder -> cryptLocal: => encrypted/??? => upload_folder => cleanup"""
+        """
+        1) subfolder_label = モデルフォルダ名 (local_folderのベース名)
+        2) rclone mkdir cryptLocal:subfolder_label
+        3) rclone copy local_folder => cryptLocal:subfolder_label
+        4) rclone copy cryptLocal:subfolder_label => encrypted/subfolder_label (差分検知やめる)
+        5) upload_folder(encrypted/subfolder_label, path_in_repo=subfolder_label)
+        6) cleanup
+        """
         if not os.path.isdir(local_folder):
             logger.error(f"[ERR] {local_folder} is not a directory.")
             return None
 
-        encrypted_dir = os.path.join(os.getcwd(), "encrypted")
-        os.makedirs(encrypted_dir, exist_ok=True)
+        subfolder_label = os.path.basename(local_folder)  # ★ モデル名 or ファイル名を取得
+        if not subfolder_label:
+            logger.error(f"[ERR] local_folder has empty basename: {local_folder}")
+            return None
 
-        before = set(os.listdir(encrypted_dir))
-        # rclone copy
-        cmd = ["rclone", "copy", local_folder, "cryptLocal:", "--create-empty-src-dirs"]
-        logger.info(f"[CMD] {' '.join(cmd)}")
+        # === 1) rclone mkdir
+        mkdir_cmd = ["rclone", "mkdir", f"cryptLocal:{subfolder_label}"]
+        logger.info(f"[CMD] {' '.join(mkdir_cmd)}")
         try:
-            subprocess.run(cmd, check=True)
-            logger.info(f"[OK] rclone copy => cryptLocal:")
+            subprocess.run(mkdir_cmd, check=True)
+            logger.info(f"[OK] rclone mkdir cryptLocal:{subfolder_label}")
         except subprocess.CalledProcessError as e:
-            logger.error(f"[ERR] rclone copy failed: {e}")
+            logger.error(f"[ERR] rclone mkdir => {e}")
             return None
 
-        after = set(os.listdir(encrypted_dir))
-        diff = after - before
-        if not diff:
-            logger.error("[ERR] no new directory in ./encrypted after copy")
+        # === 2) rclone copy local_folder => cryptLocal:subfolder_label
+        copy_cmd = ["rclone", "copy", local_folder, f"cryptLocal:{subfolder_label}", "--create-empty-src-dirs"]
+        logger.info(f"[CMD] {' '.join(copy_cmd)}")
+        try:
+            subprocess.run(copy_cmd, check=True)
+            logger.info(f"[OK] rclone copy => cryptLocal:{subfolder_label}")
+        except subprocess.CalledProcessError as e:
+            logger.error(f"[ERR] rclone copy => {e}")
             return None
-        if len(diff) > 1:
-            logger.warning(f"[WARN] multiple new dirs => {diff}")
-        enc_name = diff.pop()
-        enc_path = os.path.join(encrypted_dir, enc_name)
-        if not os.path.isdir(enc_path):
-            logger.error(f"[ERR] {enc_path} is not a directory.")
+
+        # === 3) ローカル "encrypted/subfolder_label" に復号ファイル(?) を落とすかどうか
+        #     → HFへのフォルダアップには「ローカルに暗号ファイル群」が必要
+        #     → しかし "directory_name_encryption=true" ならリモート名だけで復号されず、ランダム名かも
+        # 今回は「物理的に local へ落として upload_folder()」する想定にする
+        encrypted_base = os.path.join(os.getcwd(), "encrypted")
+        os.makedirs(encrypted_base, exist_ok=True)
+
+        # remove old if exist
+        local_enc_path = os.path.join(encrypted_base, subfolder_label)
+        if os.path.exists(local_enc_path):
+            shutil.rmtree(local_enc_path)
+
+        # rclone copy cryptLocal:subfolder_label => encrypted/subfolder_label
+        pull_cmd = ["rclone", "copy", f"cryptLocal:{subfolder_label}", local_enc_path, "--create-empty-src-dirs"]
+        logger.info(f"[CMD] {' '.join(pull_cmd)}")
+        try:
+            subprocess.run(pull_cmd, check=True)
+            logger.info(f"[OK] rclone copy => {local_enc_path}")
+        except subprocess.CalledProcessError as e:
+            logger.error(f"[ERR] rclone copy back => {e}")
             return None
 
-        # HF upload folder
+        # === 4) upload_folder(local_enc_path, path_in_repo=subfolder_label)
         try:
-            self.upload_folder(enc_path, path_in_repo=enc_name)
+            self.upload_folder(local_enc_path, path_in_repo=subfolder_label)
         except Exception as e:
             logger.error(f"[ERR] encrypt_and_upload_folder => upload_folder: {e}")
 
-        # cleanup
+        # === 5) cleanup
+        # remove local_folder & local_enc_path
         shutil.rmtree(local_folder, ignore_errors=True)
-        shutil.rmtree(enc_path, ignore_errors=True)
-        logger.info(f"[CLEANUP] removed {local_folder} & {enc_path}")
-        return enc_name
+        shutil.rmtree(local_enc_path, ignore_errors=True)
+        logger.info(f"[CLEANUP] removed {local_folder} & {local_enc_path}")
+
+        return subfolder_label
 
     # ここで「download_and_process_versions」(＝古いバージョン含めまとめてダウンロード) 定義
     #  => 今回は名前を合わせ「download_and_process_versions」に合わせる