From 252e5727f4aec6c30bafef0fd235ae7f0dd45b60 Mon Sep 17 00:00:00 2001
From: jisangs <jisangs@gmail.com>
Date: Fri, 15 May 2026 16:54:08 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EC=8B=A4=ED=96=89=20-=20=EC=A0=84=EC=B2=B4=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20/=20=EC=84=A0=ED=83=9D=EB=90=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=91=90=20=EC=83=81=ED=99=A9?=
 =?UTF-8?q?=EB=B3=84=EB=A1=9C=20=EB=8B=A4=EB=A5=B4=EA=B2=8C=20=EC=9E=91?=
 =?UTF-8?q?=EB=8F=99=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/index.html  | 10 ++++++++++
 src/renderer/renderer.js | 41 +++++++++++++++++++++++++++++++++++-----
 src/renderer/style.css   | 11 +++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/renderer/index.html b/src/renderer/index.html
index 4250979..3b55b14 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -89,6 +89,16 @@
   </div>
 </div>
 
+<div id="rename-conflict-modal" class="modal-overlay" style="display:none;">
+  <div class="modal-box">
+    <p class="modal-msg">변경할 이름의 파일이 이미 존재합니다.</p>
+    <ul id="rename-conflict-list" class="modal-conflict-list"></ul>
+    <div class="modal-actions">
+      <button id="rename-conflict-close" class="btn btn-ghost">닫기</button>
+    </div>
+  </div>
+</div>
+
 <div id="move-error-modal" class="modal-overlay" style="display:none;">
   <div class="modal-box">
     <p class="modal-msg">새로운 이름의 파일도 존재합니다.</p>
diff --git a/src/renderer/renderer.js b/src/renderer/renderer.js
index cb37057..3494466 100644
--- a/src/renderer/renderer.js
+++ b/src/renderer/renderer.js
@@ -36,7 +36,10 @@ const moveDigitsInput   = document.getElementById('move-digits');
 const moveCancelBtn     = document.getElementById('move-cancel');
 const moveConfirmBtn    = document.getElementById('move-confirm');
 const moveErrorModal    = document.getElementById('move-error-modal');
-const moveErrorCloseBtn = document.getElementById('move-error-close');
+const moveErrorCloseBtn        = document.getElementById('move-error-close');
+const renameConflictModal      = document.getElementById('rename-conflict-modal');
+const renameConflictCloseBtn   = document.getElementById('rename-conflict-close');
+const renameConflictList       = document.getElementById('rename-conflict-list');
 
 // ── 핸들러 초기화 ─────────────────────────────────
 const callbacks = {
@@ -248,18 +251,46 @@ function updatePreview() {
 }
 
 // ── 이름 변경 ────────────────────────────────────
+renameConflictCloseBtn.addEventListener('click', () => {
+  renameConflictModal.style.display = 'none';
+});
+
 async function doRename() {
   if (!state.files.length || !state.currentFolder) return;
   const prefix = inputPrefix.value.trim() || 'photo';
   const digits = Math.max(1, Math.min(6, parseInt(inputDigits.value) || 3));
 
-  const examples = state.files.slice(0, 3).map((f, i) => {
+  const selectedArr   = [...state.selectedIdxs].sort((a, b) => a - b);
+  const filesToRename = selectedArr.length > 0
+    ? selectedArr.map(i => state.files[i]).filter(Boolean)
+    : state.files;
+
+  if (!filesToRename.length) return;
+
+  // 선택된 파일이 있으면 변경될 이름이 미선택 파일 이름과 충돌하는지 확인
+  if (selectedArr.length > 0) {
+    const unselectedNames = new Set(
+      state.files.filter((_, i) => !state.selectedIdxs.has(i)).map(f => f.name)
+    );
+    const newNames = filesToRename.map((f, i) => {
+      const ext = f.name.split('.').pop().toLowerCase();
+      return `${prefix}_${String(i + 1).padStart(digits, '0')}.${ext}`;
+    });
+    const conflicting = newNames.filter(n => unselectedNames.has(n));
+    if (conflicting.length) {
+      renameConflictList.innerHTML = conflicting.map(n => `<li>${n}</li>`).join('');
+      renameConflictModal.style.display = 'flex';
+      return;
+    }
+  }
+
+  const examples = filesToRename.slice(0, 3).map((f, i) => {
     const ext = f.name.split('.').pop().toLowerCase();
     return `${f.name}  →  ${prefix}_${String(i + 1).padStart(digits, '0')}.${ext}`;
   }).join('\n');
-  const more = state.files.length > 3 ? `\n... 외 ${state.files.length - 3}개` : '';
+  const more = filesToRename.length > 3 ? `\n... 외 ${filesToRename.length - 3}개` : '';
 
-  if (!confirm(`📂 ${state.files.length}개 파일을 이름 변경합니다:\n\n${examples}${more}\n\n계속하시겠습니까?`)) return;
+  if (!confirm(`📂 ${filesToRename.length}개 파일을 이름 변경합니다:\n\n${examples}${more}\n\n계속하시겠습니까?`)) return;
 
   showLoading('파일 이름 변경 중...');
   setStatus('이름 변경 중...', false);
@@ -267,7 +298,7 @@ async function doRename() {
   try {
     const result = await window.api.renameFiles({
       folderPath: state.currentFolder,
-      files: state.files,
+      files: filesToRename,
       prefix,
       digits,
     });
diff --git a/src/renderer/style.css b/src/renderer/style.css
index f31dba0..bbf316d 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -517,6 +517,17 @@ footer span { font-size: 11px; color: var(--muted); }
 }
 .modal-fields input[type="number"] { width: 70px; text-align: center; }
 .modal-fields input:focus { border-color: var(--accent); }
+.modal-conflict-list {
+  list-style: none;
+  display: flex; flex-direction: column; gap: 4px;
+  max-height: 160px; overflow-y: auto;
+  background: var(--card); border: 1px solid var(--border);
+  border-radius: 8px; padding: 8px 12px;
+}
+.modal-conflict-list li {
+  font-family: 'JetBrains Mono', monospace;
+  font-size: 12px; color: var(--warning);
+}
 .modal-actions {
   display: flex; justify-content: flex-end; gap: 10px;
 }