-
-
+
+
+
+
Folders
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/public/style.css b/public/style.css
index 8495e0b..b224e1b 100644
--- a/public/style.css
+++ b/public/style.css
@@ -276,6 +276,26 @@ main {
line-height: 1.5;
}
+/* ─── Setup sub-sections ─────────────────────────────────────────────────── */
+.setup-section {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.section-label {
+ font-size: 0.7rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.6px;
+ color: var(--muted);
+}
+
+.setup-divider {
+ border: none;
+ border-top: 1px solid var(--border);
+}
+
/* ─── File type buttons ──────────────────────────────────────────────────── */
.type-buttons {
display: flex;
diff --git a/src/routes/transfer.ts b/src/routes/transfer.ts
index 3398ba1..5e9294f 100644
--- a/src/routes/transfer.ts
+++ b/src/routes/transfer.ts
@@ -1,6 +1,6 @@
import { Router } from 'express';
import WebSocket from 'ws';
-import { TransferService, TransferOptions, ConflictAction } from '../services/TransferService';
+import { TransferService, TransferOptions, ConflictAction, FolderMode } from '../services/TransferService';
import { AdbService } from '../services/AdbService';
import { ExifService } from '../services/ExifService';
import { FileService } from '../services/FileService';
@@ -26,7 +26,7 @@ export function createTransferRouter(getWs: () => WebSocket | null) {
}
router.post('/start', (req, res) => {
- const { sourceDir, destDir, fileType, dateFrom, dateTo } = req.body as TransferOptions & { dateFrom?: string; dateTo?: string };
+ const { sourceDir, destDir, fileType, dateFrom, dateTo, folderMode } = req.body as TransferOptions & { dateFrom?: string; dateTo?: string };
if (!sourceDir || !destDir || !fileType) {
res.status(400).json({ error: 'sourceDir, destDir, and fileType are required' });
@@ -50,6 +50,12 @@ export function createTransferRouter(getWs: () => WebSocket | null) {
}
}
+ const VALID_FOLDER_MODES = new Set
(['filesOnly', 'keepFolders']);
+ if (folderMode != null && !VALID_FOLDER_MODES.has(folderMode as string)) {
+ res.status(400).json({ error: 'folderMode must be "filesOnly" or "keepFolders"' });
+ return;
+ }
+
// Cancel any running transfer before starting a new one
activeTransfer?.cancel();
@@ -67,6 +73,7 @@ export function createTransferRouter(getWs: () => WebSocket | null) {
const options: TransferOptions = {
sourceDir, destDir, fileType,
...(dateFrom && dateTo ? { dateFrom, dateTo } : {}),
+ ...(folderMode ? { folderMode: folderMode as FolderMode } : {}),
};
activeTransfer.start(options).catch(err => {
send({ type: 'error', message: String(err) });
diff --git a/src/services/TransferService.ts b/src/services/TransferService.ts
index 38b0865..58e47d8 100644
--- a/src/services/TransferService.ts
+++ b/src/services/TransferService.ts
@@ -7,6 +7,7 @@ import { FileService } from './FileService';
export type FileType = 'images' | 'videos' | 'allTypes' | 'files' | 'music';
export type ConflictAction = 'skip' | 'overwrite' | 'skip-all' | 'overwrite-all';
+export type FolderMode = 'filesOnly' | 'keepFolders';
export interface TransferOptions {
sourceDir: string;
@@ -14,6 +15,7 @@ export interface TransferOptions {
fileType: FileType;
dateFrom?: string;
dateTo?: string;
+ folderMode?: FolderMode;
}
export interface ProgressEvent {
@@ -96,6 +98,7 @@ export class TransferService extends EventEmitter {
this.cancelled = false;
const { sourceDir, destDir, fileType } = options;
+ const folderMode = options.folderMode ?? 'filesOnly';
const tempDir = this.files.getTempDir();
await this.files.ensureDir(tempDir);
@@ -141,7 +144,12 @@ export class TransferService extends EventEmitter {
const ext = path.extname(phonePath).toLowerCase();
let destFolder: string;
- if (FILE_EXTENSIONS.has(ext)) {
+ if (folderMode === 'keepFolders') {
+ // Preserve phone folder hierarchy relative to sourceDir.
+ // path.posix.relative handles forward-slash phone paths correctly on Windows.
+ const relDir = path.dirname(path.posix.relative(sourceDir, phonePath));
+ destFolder = path.join(destDir, relDir);
+ } else if (FILE_EXTENSIONS.has(ext)) {
destFolder = path.join(destDir, 'files');
} else if (MUSIC_EXTENSIONS.has(ext)) {
destFolder = path.join(destDir, 'music');