jung-geun/NFD2NFC
1
0
Fork 0
mirror of https://github.com/jung-geun/NFD2NFC.git synced 2025-12-19 20:14:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

디렉토리 선택 및 제거 기능 추가: 선택된 디렉토리 목록 표시, 로그 기능 구현

Browse Source
This commit is contained in:
jung-geun
2024-12-16 23:28:06 +09:00
parent 776e2c9d82
commit d5544dbc87
20 changed files with 347 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/MacIcon-dev.icns Normal file
View File

Binary file not shown.

BIN
build/MacIcon-dev.iconset/icon_1024x1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 882 KiB

BIN
build/MacIcon-dev.iconset/icon_128x128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
build/MacIcon-dev.iconset/icon_16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
build/MacIcon-dev.iconset/icon_256x256.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 87 KiB

BIN
build/MacIcon-dev.iconset/icon_32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
build/MacIcon-dev.iconset/icon_512x512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 302 KiB

BIN
build/MacIcon-dev.iconset/icon_64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
build/Macicon.icns Normal file
View File

Binary file not shown.

BIN
build/Macicon.iconset/icon_1024x1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 917 KiB

BIN
build/Macicon.iconset/icon_128x128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
build/Macicon.iconset/icon_16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
build/Macicon.iconset/icon_256x256.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

BIN
build/Macicon.iconset/icon_32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
build/Macicon.iconset/icon_512x512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 KiB

BIN
build/Macicon.iconset/icon_64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

109
index.html
View File

@@ -9,18 +9,57 @@
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
text-align: center; text-align: center;
padding: 50px; padding: 20px;
} }
#selected-directory { #selected-directories {
margin-top: 20px; margin-top: 20px;
text-align: left;
max-width: 500px;
margin-left: auto;
margin-right: auto;
}
.directory-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px;
border-bottom: 1px solid #ccc;
}
.directory-path {
word-break: break-all; word-break: break-all;
} }
.remove-button {
background-color: #ff4d4d;
border: none;
color: white;
padding: 5px 10px;
border-radius: 3px;
cursor: pointer;
}
#log {
margin-top: 20px;
text-align: left;
white-space: pre-wrap;
background-color: #f0f0f0;
padding: 10px;
border-radius: 5px;
height: 200px;
overflow-y: scroll;
max-width: 500px;
margin-left: auto;
margin-right: auto;
}
button { button {
padding: 10px 20px; padding: 10px 20px;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
margin-bottom: 10px;
} }
</style> </style>
</head> </head>
@@ -28,20 +67,74 @@
<body> <body>
<h1>디렉토리 감시 애플리케이션</h1> <h1>디렉토리 감시 애플리케이션</h1>
<button id="select-directory">디렉토리 선택</button> <button id="select-directory">디렉토리 선택</button>
<div id="selected-directory">선택된 디렉토리 없음</div> <div id="selected-directories">
<h2>감시 중인 디렉토리</h2>
<div id="directories-list">
<!-- 선택된 디렉토리 목록이 여기에 표시됩니다 -->
</div>
</div>
<div id="log">
로그가 여기에 표시됩니다.
</div>
<script> <script>
const selectDirButton = document.getElementById('select-directory'); const selectDirButton = document.getElementById('select-directory');
const selectedDirDiv = document.getElementById('selected-directory'); const directoriesList = document.getElementById('directories-list');
const logDiv = document.getElementById('log');
// 디렉토리 선택 버튼 클릭 시
selectDirButton.addEventListener('click', async () => { selectDirButton.addEventListener('click', async () => {
const result = await window.electronAPI.selectDirectory(); const result = await window.electronAPI.selectDirectories();
if (!result.canceled) { if (!result.canceled) {
selectedDirDiv.textContent = `선택된 디렉토리: ${ result.path }`; for (const path of result.paths) {
} else { addDirectoryToList(path);
selectedDirDiv.textContent = '디렉토리 선택이 취소되었습니다.'; }
} }
}); });
// 디렉토리를 목록에 추가하는 함수
function addDirectoryToList(dirPath) {
// 이미 목록에 있는 경우 중복 추가 방지
if (document.querySelector(`[data-path="${ dirPath }"]`)) {
return;
}
const directoryItem = document.createElement('div');
directoryItem.className = 'directory-item';
directoryItem.setAttribute('data-path', dirPath);
const pathSpan = document.createElement('span');
pathSpan.className = 'directory-path';
pathSpan.textContent = dirPath;
const removeBtn = document.createElement('button');
removeBtn.className = 'remove-button';
removeBtn.textContent = '제거';
removeBtn.addEventListener('click', async () => {
const response = await window.electronAPI.removeDirectory(dirPath);
if (response.success) {
directoriesList.removeChild(directoryItem);
appendLog(`디렉토리 감시 중지: "${ dirPath }"`);
} else {
appendLog(`디렉토리 제거 실패: "${ response.message }"`);
}
});
directoryItem.appendChild(pathSpan);
directoryItem.appendChild(removeBtn);
directoriesList.appendChild(directoryItem);
}
// 로그 메시지를 로그 섹션에 추가하는 함수
function appendLog(message) {
logDiv.textContent += `${ message }\n`;
logDiv.scrollTop = logDiv.scrollHeight; // 자동 스크롤
}
// 로그 메시지 수신 시
window.electronAPI.onLog((message) => {
appendLog(message);
});
</script> </script>
</body> </body>

297
main.js
View File

@@ -1,15 +1,40 @@
// main.js // main.js
const { app, BrowserWindow, dialog, ipcMain } = require("electron"); const {
app,
BrowserWindow,
dialog,
ipcMain,
Notification,
Tray,
Menu,
} = require("electron");
const path = require("path"); const path = require("path");
const chokidar = require("chokidar"); const chokidar = require("chokidar");
const fs = require("fs").promises; const fs = require("fs").promises;
let tray = null;
let mainWindow = null;
// 로그 파일 경로 지정
const logFilePath = path.join(app.getPath("userData"), "watcher.log");
// 로그 기록 함수
async function log(message) {
const timestamp = new Date().toISOString();
const logMessage = `[${timestamp}] ${message}\n`;
await fs.appendFile(logFilePath, logMessage);
}
// 무시할 파일/디렉토리를 결정하는 함수 // 무시할 파일/디렉토리를 결정하는 함수
function shouldIgnore(itemName) { function shouldIgnore(itemName) {
const ignoredItems = [".git", "node_modules", ".env"]; const ignoredItems = [".git", "node_modules", ".env"];
return ignoredItems.includes(itemName); return ignoredItems.includes(itemName);
} }
// 현재 감시 중인 디렉토리 목록
let watchedDirectories = [];
let watchers = {};
// 파일 이름을 정규화하는 함수 // 파일 이름을 정규화하는 함수
async function normalizeFileName(filePath) { async function normalizeFileName(filePath) {
const dir = path.dirname(filePath); const dir = path.dirname(filePath);
@@ -20,19 +45,49 @@ async function normalizeFileName(filePath) {
const newPath = path.join(dir, newName); const newPath = path.join(dir, newName);
try { try {
await fs.rename(filePath, newPath); await fs.rename(filePath, newPath);
console.log(`이름 변경: "${oldName}" -> "${newName}"`); await log(`이름 변경: "${oldName}" -> "${newName}"`);
// 알림 생성
new Notification({
title: "이름 변경 완료",
body: `"${oldName}"이 "${newName}"으로 변경되었습니다.`,
}).show();
// 렌더러 프로세스로 알림 전송
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`이름 변경: "${oldName}" -> "${newName}"`
);
}
return newPath; return newPath;
} catch (error) { } catch (error) {
console.error(`이름 변경 실패 ("${oldName}"):`, error); await log(`이름 변경 실패 ("${oldName}"): ${error}`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`이름 변경 실패 ("${oldName}"): ${error}`
);
}
return filePath; return filePath;
} }
} }
return filePath; return filePath;
} }
// 디렉토리를 재귀적으로 처리하는 함수 // 디렉토리를 재귀적으로 처리하는 함수
async function processDirectory(dirPath) { async function processDirectory(dirPath) {
try { try {
await log(`디렉토리 처리 시작: "${dirPath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 처리 시작: "${dirPath}"`
);
}
const entries = await fs.readdir(dirPath, { withFileTypes: true }); const entries = await fs.readdir(dirPath, { withFileTypes: true });
for (const entry of entries) { for (const entry of entries) {
@@ -47,16 +102,29 @@ async function processDirectory(dirPath) {
} }
} }
await normalizeFileName(dirPath); await normalizeFileName(dirPath);
await log(`디렉토리 처리 완료: "${dirPath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 처리 완료: "${dirPath}"`
);
}
} catch (error) { } catch (error) {
console.error(`디렉토리 처리 중 오류 발생 ("${dirPath}"):`, error); await log(`디렉토리 처리 중 오류 발생 ("${dirPath}"): ${error}`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 처리 중 오류 발생 ("${dirPath}"): ${error}`
);
}
} }
} }
// 창을 생성하는 함수 // 창을 생성하는 함수
function createWindow() { function createWindow() {
const win = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 600, width: 600,
height: 400, height: 500,
webPreferences: { webPreferences: {
preload: path.join(__dirname, "preload.js"), // 보안상 추천 preload: path.join(__dirname, "preload.js"), // 보안상 추천
nodeIntegration: false, nodeIntegration: false,
@@ -64,15 +132,56 @@ function createWindow() {
}, },
}); });
win.loadFile("index.html"); mainWindow.loadFile("index.html");
// 개발자 도구 열기 (배포 시 제거 권장) // 개발자 도구 열기 (배포 시 제거 권장)
// win.webContents.openDevTools(); // mainWindow.webContents.openDevTools();
mainWindow.on("closed", function () {
mainWindow = null;
});
} }
// 애플리케이션 준비 시 창 생성 // 트레이 메뉴 설정
function setTray() {
tray = new Tray(path.join(__dirname, "icon.png")); // 메뉴 바 아이콘 경로 (.png 또는 .icns)
const contextMenu = Menu.buildFromTemplate([
{
label: "열기",
click: () => {
if (mainWindow === null) {
createWindow();
} else {
mainWindow.show();
}
},
},
{
label: "종료",
click: () => {
app.quit();
},
},
]);
tray.setToolTip("Directory Watcher App");
tray.setContextMenu(contextMenu);
// 더블 클릭 시 창 열기
tray.on("double-click", () => {
if (mainWindow === null) {
createWindow();
} else {
mainWindow.show();
}
});
}
// 애플리케이션 준비 시 창 및 트레이 설정
app.whenReady().then(() => { app.whenReady().then(() => {
createWindow(); createWindow();
setTray();
app.on("activate", function () { app.on("activate", function () {
if (BrowserWindow.getAllWindows().length === 0) createWindow(); if (BrowserWindow.getAllWindows().length === 0) createWindow();
@@ -85,64 +194,138 @@ app.on("window-all-closed", function () {
}); });
// 디렉토리 감시 로직 처리 // 디렉토리 감시 로직 처리
ipcMain.handle("select-directory", async () => { ipcMain.handle("select-directories", async () => {
const result = await dialog.showOpenDialog({ const result = await dialog.showOpenDialog({
properties: ["openDirectory"], properties: ["openDirectory", "multiSelections"],
}); });
if (result.canceled) { if (result.canceled) {
return { canceled: true }; return { canceled: true };
} else { } else {
const selectedPath = result.filePaths[0]; const selectedPaths = result.filePaths;
console.log(`선택된 디렉토리: ${selectedPath}`); console.log(`선택된 디렉토리: ${selectedPaths.join(", ")}`);
await log(`선택된 디렉토리: "${selectedPaths.join('", "')}"`);
// 기존 감시자 종료 (필요 시) if (mainWindow) {
if (global.watcher) { mainWindow.webContents.send(
global.watcher.close(); "log-message",
`선택된 디렉토리: "${selectedPaths.join('", "')}"`
);
} }
// 디렉토리 초기 처리 for (const selectedPath of selectedPaths) {
await processDirectory(selectedPath); if (!watchedDirectories.includes(selectedPath)) {
watchedDirectories.push(selectedPath);
await processDirectory(selectedPath);
// 디렉토리 감시 시작 // chokidar watcher 설정
global.watcher = chokidar.watch(selectedPath, { const watcher = chokidar.watch(selectedPath, {
ignored: (pathStr) => { ignored: (pathStr) => {
const baseName = path.basename(pathStr); const baseName = path.basename(pathStr);
return shouldIgnore(baseName); return shouldIgnore(baseName);
}, },
persistent: true, persistent: true,
ignoreInitial: false, ignoreInitial: false,
awaitWriteFinish: { awaitWriteFinish: {
stabilityThreshold: 200, stabilityThreshold: 200,
pollInterval: 100, pollInterval: 100,
}, },
depth: Infinity, depth: Infinity,
}); });
global.watcher watchers[selectedPath] = watcher;
.on("add", async (filePath) => {
console.log(`파일 추가됨: "${filePath}"`);
await normalizeFileName(filePath);
})
.on("change", async (filePath) => {
console.log(`파일 변경됨: "${filePath}"`);
await normalizeFileName(filePath);
})
.on("unlink", (filePath) => {
console.log(`파일 삭제됨: "${filePath}"`);
})
.on("addDir", async (dirPath) => {
console.log(`디렉토리 추가됨: "${dirPath}"`);
await processDirectory(dirPath);
})
.on("unlinkDir", (dirPath) => {
console.log(`디렉토리 삭제됨: "${dirPath}"`);
})
.on("error", (error) => console.error(`Watcher error: ${error}`))
.on("ready", () => {
console.log("초기 스캔 완료. 변경 감시 중...");
});
return { canceled: false, path: selectedPath }; watcher
.on("add", async (filePath) => {
await log(`파일 추가됨: "${filePath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`파일 추가됨: "${filePath}"`
);
}
await normalizeFileName(filePath);
})
.on("change", async (filePath) => {
await log(`파일 변경됨: "${filePath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`파일 변경됨: "${filePath}"`
);
}
await normalizeFileName(filePath);
})
.on("unlink", async (filePath) => {
await log(`파일 삭제됨: "${filePath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`파일 삭제됨: "${filePath}"`
);
}
})
.on("addDir", async (dirPath) => {
await log(`디렉토리 추가됨: "${dirPath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 추가됨: "${dirPath}"`
);
}
await processDirectory(dirPath);
})
.on("unlinkDir", async (dirPath) => {
await log(`디렉토리 삭제됨: "${dirPath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 삭제됨: "${dirPath}"`
);
}
})
.on("error", async (error) => {
await log(`Watcher error: ${error}`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`Watcher error: ${error}`
);
}
})
.on("ready", () => {
log("초기 스캔 완료. 변경 감시 중...");
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
"초기 스캔 완료. 변경 감시 중..."
);
}
});
}
}
// 반환값으로 선택된 경로들을 전달
return { canceled: false, paths: selectedPaths };
}
});
// 디렉토리 제거 핸들러
ipcMain.handle("remove-directory", async (event, dirPath) => {
if (watchedDirectories.includes(dirPath)) {
watchedDirectories = watchedDirectories.filter((path) => path !== dirPath);
if (watchers[dirPath]) {
await watchers[dirPath].close();
delete watchers[dirPath];
await log(`디렉토리 감시 중지: "${dirPath}"`);
if (mainWindow) {
mainWindow.webContents.send(
"log-message",
`디렉토리 감시 중지: "${dirPath}"`
);
}
}
return { success: true };
} else {
return { success: false, message: "디렉토리가 감시 목록에 없습니다." };
} }
}); });

3
package.json
View File

@@ -10,7 +10,8 @@
}, },
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"package": "electron-packager . NFD2NF --platform=darwin --arch=x64 --icon=build/icons/MacIcon.icns --overwrite --prune=true --out=dist", "package": "electron-packager . NFD2NF --platform=darwin --arch=arm64,x64 --icon=build/icons/MacIcon.icns --overwrite --prune=true --out=dist",
"package dev": "electron-packager . NFD2NF --platform=darwin --arch=arm64,x64 --icon=build/icons/MacIcon-dev.icns --overwrite --prune=true --out=dist --asar --app-bundle-id=com.pieroot.nfd2nfc",
"pkg": "pkg normalize.js --target node16-macos-x64,node16-linux-x64,node16-win-x64 --output ./dist/NFD2NFC" "pkg": "pkg normalize.js --target node16-macos-x64,node16-linux-x64,node16-win-x64 --output ./dist/NFD2NFC"
}, },
"directories": { "directories": {

5
preload.js
View File

@@ -2,5 +2,8 @@
const { contextBridge, ipcRenderer } = require("electron"); const { contextBridge, ipcRenderer } = require("electron");
contextBridge.exposeInMainWorld("electronAPI", { contextBridge.exposeInMainWorld("electronAPI", {
selectDirectory: () => ipcRenderer.invoke("select-directory"), selectDirectories: () => ipcRenderer.invoke("select-directories"),
removeDirectory: (dirPath) => ipcRenderer.invoke("remove-directory", dirPath),
onLog: (callback) =>
ipcRenderer.on("log-message", (event, message) => callback(message)),
}); });