Upload main.py

main.py

@@ -247,10 +247,10 @@ class CivitAICrawler:
                     single_file_folder = os.path.join(old_versions_folder, "temp_single")
                     os.makedirs(single_file_folder, exist_ok=True)
                     try:
-                        # 移動して「このファイルだけ」が入ったフォルダを作る
                         single_file_path = shutil.move(local_path, os.path.join(single_file_folder, file_name))
-                        # 暗号化アップロード
-                        self.encrypt_and_upload_folder(single_file_folder)
+
+                        # ★ここでファイルのみを暗号化したいので encrypt_and_upload_single_file() を使用
+                        self.encrypt_and_upload_single_file(os.path.join(single_file_folder, file_name))
                     except Exception as e:
                         logger.error(f"Failed to encrypt/upload old version file: {e}")
                     finally:
@@ -259,28 +259,27 @@ class CivitAICrawler:
                             shutil.rmtree(single_file_folder)
                             logger.info(f"Removed temp_single folder {single_file_folder}")
 
-    def encrypt_and_upload_folder(self, local_folder: str) -> Optional[str]:
+    def encrypt_and_upload_single_file(self, local_file: str) -> Optional[str]:
         """
-        1. /home/user/app/encrypted 配下の古いファイルやフォルダを消去（オプション）
-        2. rclone mkdir cryptLocal:subfolder_label  (空ディレクトリを必ず作る)
-        3. rclone copy local_folder => cryptLocal:subfolder_label
-        → /home/user/app/encrypted/<暗号フォルダ>/ にコピー
-        4. そのフォルダを self.upload_folder() (＝HFにアップロード)
-        5. ローカル(平文フォルダ & 暗号フォルダ)削除
-        6. 最後に subfolder_label（論理上のフォルダ名）を return
+        単一ファイルを暗号化→アップロード→ローカル削除する。
+          - rclone mkdir cryptLocal:enc_xxxx
+          - rclone copyto local_file => cryptLocal:enc_xxxx/filename
+          - 差分検知で作られた暗号フォルダを発見→upload_folder()→削除
         """
-        if not os.path.exists(local_folder):
-            logger.error(f"encrypt_and_upload_folder: folder not found: {local_folder}")
+        import uuid
+        if not os.path.isfile(local_file):
+            logger.error(f"[encrypt_and_upload_single_file] Not a file: {local_file}")
             return None
 
         encrypted_base_dir = os.path.join(os.getcwd(), "encrypted")
         os.makedirs(encrypted_base_dir, exist_ok=True)
 
-        # 1) 古い暗号ファイルやフォルダを削除
-        for item in os.listdir(encrypted_base_dir):
+        # 古い暗号物を削除
+        before_dirs = set(os.listdir(encrypted_base_dir))
+        for item in before_dirs:
             item_path = os.path.join(encrypted_base_dir, item)
             try:
-                if os.path.isfile(item_path) or os.path.islink(item_path):
+                if os.path.isfile(item_path):
                     os.remove(item_path)
                 else:
                     shutil.rmtree(item_path)
@@ -288,7 +287,7 @@ class CivitAICrawler:
             except Exception as e:
                 logger.warning(f"[CLEANUP] Failed to remove {item_path}: {e}")
 
-        # 2) まず mkdir で「暗号リモート上に空ディレクトリ」を作る
+        # 1) mkdir
         subfolder_label = "enc_" + str(uuid.uuid4())[:8]
         try:
             subprocess.run(
@@ -300,53 +299,128 @@ class CivitAICrawler:
             logger.error(f"rclone mkdir failed: {e}")
             return None
 
-        # 3) local_folder -> cryptLocal:subfolder_label にコピー
-        #    --create-empty-src-dirs: 空フォルダ構造も含めてコピー
+        # 2) copyto (ファイル) => cryptLocal:enc_xxx/filename
+        filename_in_repo = os.path.basename(local_file)
         try:
             subprocess.run(
                 [
-                    "rclone", "copy",
-                    local_folder,
-                    f"cryptLocal:{subfolder_label}",
+                    "rclone", "copyto",
+                    local_file,
+                    f"cryptLocal:{subfolder_label}/{filename_in_repo}",
                     "--create-empty-src-dirs"
                 ],
                 check=True
             )
-            logger.info(f"[OK] rclone copy {local_folder} => cryptLocal:{subfolder_label}")
+            logger.info(f"[OK] rclone copyto {local_file} => cryptLocal:{subfolder_label}/{filename_in_repo}")
         except subprocess.CalledProcessError as e:
-            logger.error(f"rclone copy failed: {e}")
+            logger.error(f"rclone copyto failed: {e}")
             return None
 
-        # cryptLocal:{subfolder_label} => 実際には /home/user/app/encrypted/<ランダム文字列> のフォルダになる
-        # それを差分検知で特定
-        before_dirs = set(os.listdir(encrypted_base_dir))
-        # mkdir/copy 直���に何らかのズレがあるかもしれないので再度 mkdir しなくてOK
-        # すでに上でやってるため、ここでやるなら:
-        # time.sleep(1) などで間を置いてみる手もある
-
+        # 3) 差分検知
         after_dirs = set(os.listdir(encrypted_base_dir))
         diff = after_dirs - before_dirs
-        #   もし diff が空なら既にあるフォルダに上書きコピーされた可能性
         if not diff:
-            logger.error("[ERROR] No new directory appeared in ./encrypted after rclone copy.")
+            logger.error("[ERROR] No new directory appeared in ./encrypted after rclone copyto.")
             return None
         if len(diff) > 1:
-            logger.warning(f"[WARN] Multiple new directories found: {diff}, picking the first one.")
-        enc_folder_name = diff.pop()
-        enc_folder_path = os.path.join(encrypted_base_dir, enc_folder_name)
+            logger.warning(f"[WARN] Multiple new directories found in ./encrypted: {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
 
-        # 4) アップロード (フォルダとして)
+        # 4) upload_folder
+        try:
+            self.upload_folder(enc_folder_path, path_in_repo=subfolder_label)
+            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}")
+
+        # 5) ローカル削除（暗号フォルダ + 元ファイル）
+        try:
+            if os.path.exists(local_file):
+                os.remove(local_file)
+            if os.path.isdir(enc_folder_path):
+                shutil.rmtree(enc_folder_path)
+            logger.info(f"[CLEANUP] Removed {local_file} and {enc_folder_path}")
+        except Exception as e:
+            logger.warning(f"[CLEANUP] Failed to remove local items: {e}")
+
+        return subfolder_label
+
+    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 --create-empty-src-dirs
+        3. そのフォルダを self.upload_folder() でアップ
+        4. ローカル平文フォルダ & 暗号フォルダを削除
+        5. subfolder_label を返す
+        """
+        if not os.path.exists(local_folder):
+            logger.error(f"encrypt_and_upload_folder: folder not found: {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):
+            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]
+
+        # ★ 追加: mkdir で先に空ディレクトリを作っておく
+        try:
+            subprocess.run(
+                ["rclone", "mkdir", f"cryptLocal:{subfolder_label}"],
+                check=True
+            )
+        except subprocess.CalledProcessError as e:
+            logger.error(f"rclone mkdir failed: {e}")
+            return None
+
+        # ★ --create-empty-src-dirs オプションを付けて copy
+        try:
+            subprocess.run(
+                [
+                    "rclone", 
+                    "copy", 
+                    local_folder, 
+                    f"cryptLocal:{subfolder_label}",
+                    "--create-empty-src-dirs"
+                ],
+                check=True
+            )
+        except subprocess.CalledProcessError as e:
+            logger.error(f"rclone copy failed: {e}")
+            return None
+
+        # 暗号フォルダのパス（必ずディレクトリができている前提）
+        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, something is still off.")
+            return None
+
+        # アップロード
         try:
             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}")
 
-        # 5) ローカル削除
+        # ローカル削除
         try:
             shutil.rmtree(local_folder)
             shutil.rmtree(enc_folder_path)
@@ -354,7 +428,6 @@ class CivitAICrawler:
         except Exception as e:
             logger.error(f"Failed to remove local folders: {e}")
 
-        # 6) 論理上のフォルダ名（rclone上の名称）を返す
         return subfolder_label
 
     def upload_file(self, file_path: str, repo_id: Optional[str] = None, path_in_repo: Optional[str] = None):