Merge pull request #9 from mx1up/feature/multiple_input_dirs

Feature/multiple input dirs

Author: mx1up

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0 - 2025-04-13
+
+* support multiple input directories
+
 ## 0.2.2 2025-04-13
 
 * add windows support 

README.md

@@ -17,20 +17,24 @@ Make sure the following prerequisites are met:
 
 ### Folder selection
 
-Specify initial folder to scan for duplicates, either:
-* Pass a parameter (full folder path) to the `fdupes_gui` executable
+Specify initial folders to scan for duplicates, either:
+* Pass parameters (full folder paths) to the `fdupes_gui` executable
 * Select a folder using the 'Select folder' button
 
 Change folder: press the 'Change folder' button on the top left.
 
+Add additional folders to scan for duplicates: press the + button on the top right.
+
+Remove a folder: click the - button on the right of the folder name.
+
 ### Dupe group selection
 
 Clicking on a dupe group will select it and show the duplicate instances on the right pane.
 
 ### Dupe instances
 
 A dupe instance shows its simple filename if all dupes are in the same folder, or includes
-its path relative to the selected dir (= base dir) otherwise.
+its path relative to its base dir otherwise.
 
 The following actions can be performed:
 

gfx/screenshot.png

@@ -12,13 +12,13 @@ part 'fdupes_event.dart';
 part 'fdupes_state.dart';
 
 class FdupesBloc extends Bloc<FdupesEvent, FdupesState> {
-  final String? initialDir;
+  final List<Directory>? initialDirs;
   String? fdupesLocation;
 
-  FdupesBloc({this.initialDir}) : super(FdupesStateInitial(initialDir)) {
+  FdupesBloc({this.initialDirs}) : super(FdupesStateInitial(initialDirs)) {
     on<FdupesEventCheckFdupesAvailability>(_onCheckFdupesAvailability);
     on<FdupesEventSelectFdupesLocation>(_onSelectFdupesLocation);
-    on<FdupesEventDirSelected>(_onDirSelected);
+    on<FdupesEventDirsSelected>(_onDirsSelected);
     on<FdupesEventDupeSelected>(_onDupeSelected);
     on<FdupesEventDeleteDupeInstance>(_onDeleteDupeInstance);
     on<FdupesEventRenameDupeInstance>(_onRenameDupeInstance);
@@ -43,10 +43,10 @@ class FdupesBloc extends Bloc<FdupesEvent, FdupesState> {
       emit(FdupesStateFdupesNotFound());
       return;
     }
-    if (initialDir != null) {
-      add(FdupesEventDirSelected(initialDir!));
+    if (initialDirs != null) {
+      add(FdupesEventDirsSelected(initialDirs!));
     } else {
-      emit(FdupesStateInitial(initialDir));
+      emit(FdupesStateInitial(initialDirs));
     }
   }
 
@@ -76,17 +76,17 @@ class FdupesBloc extends Bloc<FdupesEvent, FdupesState> {
     }
   }
 
-  FutureOr<void> _onDirSelected(FdupesEventDirSelected event, Emitter<FdupesState> emit) async {
+  FutureOr<void> _onDirsSelected(FdupesEventDirsSelected event, Emitter<FdupesState> emit) async {
     final s = state;
     if (s is FdupesStateInitial) {
-      emit(FdupesStateResult(dir: event.dir, dupeGroups: [], loading: true));
+      emit(FdupesStateResult(dirs: event.dirs, dupeGroups: [], loading: true));
     }
     if (s is FdupesStateResult) {
       emit(s.copyWith(loading: true));
     }
-    final dupes = await findDupes(event.dir, emit: emit);
+    final dupes = await findDupes(event.dirs, emit: emit);
 
-    emit(FdupesStateResult(dir: event.dir, dupeGroups: dupes));
+    emit(FdupesStateResult(dirs: event.dirs, dupeGroups: dupes));
   }
 
   void _onDupeSelected(FdupesEventDupeSelected event, Emitter<FdupesState> emit) {
@@ -156,10 +156,10 @@ class FdupesBloc extends Bloc<FdupesEvent, FdupesState> {
     }
   }
 
-  Future<List<List<String>>> findDupes(String dir, {required Emitter<FdupesState> emit}) async {
-    print("finding dupes in dir $dir");
+  Future<List<List<String>>> findDupes(List<Directory> dirs, {required Emitter<FdupesState> emit}) async {
+    print("finding dupes in dirs $dirs");
     List<List<String>> dupes = [];
-    Process process = await Process.start(fdupesLocation!, ['-r', dir]);
+    Process process = await Process.start(fdupesLocation!, ['-r', ...dirs.map((d) => d.path)]);
     // stdout.addStream(process.stdout);
     final regex = RegExp(r'\[(\d+)/(\d+)\]');
     final stderrBC = process.stderr.asBroadcastStream();

lib/domain/fdupes_bloc.dart

@@ -27,10 +27,10 @@ class FdupesEventRenameDupeInstance extends FdupesEvent {
   FdupesEventRenameDupeInstance(this.filename, this.newFilename);
 }
 
-class FdupesEventDirSelected extends FdupesEvent {
-  final String dir;
+class FdupesEventDirsSelected extends FdupesEvent {
+  final List<Directory> dirs;
 
-  FdupesEventDirSelected(this.dir);
+  FdupesEventDirsSelected(this.dirs);
 }
 
 class FdupesEventDupeSelected extends FdupesEvent {

lib/domain/fdupes_event.dart

@@ -4,12 +4,12 @@ part of 'fdupes_bloc.dart';
 abstract class FdupesState extends Equatable {}
 
 class FdupesStateInitial extends FdupesState {
-  final String? initialDir;
+  final List<Directory>? initialDirs;
 
-  FdupesStateInitial(this.initialDir);
+  FdupesStateInitial(this.initialDirs);
 
   @override
-  List<Object?> get props => [initialDir];
+  List<Object?> get props => [initialDirs];
 }
 
 class FdupesStateError extends FdupesState {
@@ -41,35 +41,35 @@ class FdupesStateLoading extends FdupesState {
 }
 
 class FdupesStateResult extends FdupesState {
-  final String dir;
+  final List<Directory> dirs;
   final List<List<String>> dupeGroups;
   //todo review nullability
   final int? selectedDupeGroup;
   final bool loading;
 
   @override
   List<Object?> get props => [
-        dir,
+        dirs,
         dupeGroups,
         selectedDupeGroup,
         loading,
       ];
 
   FdupesStateResult({
-    required this.dir,
+    required this.dirs,
     required this.dupeGroups,
     this.selectedDupeGroup,
     this.loading = false,
   });
 
   FdupesStateResult copyWith({
     bool? loading,
-    String? dir,
+    List<Directory>? dirs,
     List<List<String>>? dupes,
     int? selectedDupe,
   }) {
     return FdupesStateResult(
-      dir: dir ?? this.dir,
+      dirs: dirs ?? this.dirs,
       dupeGroups: dupes ?? this.dupeGroups,
       selectedDupeGroup: selectedDupe ?? this.selectedDupeGroup,
       loading: loading ?? this.loading,

lib/domain/fdupes_state.dart

@@ -1,6 +1,9 @@
+import 'dart:io';
+
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:fdupes_gui/domain/fdupes_bloc.dart';
 import 'package:fdupes_gui/presentation/dupe_screen.dart';
+import 'package:fdupes_gui/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -31,29 +34,32 @@ class MyBlocObserver extends BlocObserver {
 }
 
 void main(List<String> args) {
-  String? initialDir;
+  List<String>? initialDirsArg;
   if (args.length > 0) {
-    initialDir = args[0];
+    initialDirsArg = args;
   }
-  print('initialDir=$initialDir');
+  print('initialDirs=$initialDirsArg');
+  final initialDirs =
+      initialDirsArg?.map((e) => Directory(e)).where((element) => element.existsSync()).map((e) => e.absolute).toList();
+  print('valid initialDirs=$initialDirs');
   Bloc.observer = MyBlocObserver();
 
-  runApp(MyApp(initialDir));
+  runApp(MyApp(initialDirs));
 }
 
 class MyApp extends StatelessWidget {
-  final String? initialDir;
+  final List<Directory>? initialDirs;
 
-  MyApp(this.initialDir);
+  MyApp(this.initialDirs);
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider<FdupesBloc>(
-      create: (context) => FdupesBloc(initialDir: initialDir),
+      create: (context) => FdupesBloc(initialDirs: initialDirs),
       child: AdaptiveTheme(
         // debugShowFloatingThemeButton: true,
-        light: ThemeData.light(useMaterial3: true),
-        dark: ThemeData.dark(useMaterial3: true),
+        light: FdupesTheme.light(),
+        dark: FdupesTheme.dark(),
         initial: AdaptiveThemeMode.system,
         builder: (theme, darkTheme) => MaterialApp(
           title: 'Fdupes gui',

lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fdupes_gui/core/util.dart' as util;
 import 'package:fdupes_gui/domain/fdupes_bloc.dart';
 import 'package:fdupes_gui/presentation/dupes_body.dart';
@@ -14,7 +16,7 @@ class DupeScreen extends StatelessWidget {
           return Center(
             child: ElevatedButton(
               child: Text('Select folder'),
-              onPressed: () => _showSelectFolderDialog(context, null),
+              onPressed: () => _showSelectFolderDialog(context, initialDir: null, currentDirs: []),
             ),
           );
         }
@@ -61,25 +63,69 @@ class DupeScreen extends StatelessWidget {
             padding: EdgeInsets.all(8),
             child: Column(
               children: <Widget>[
-                Row(children: [
-                  ElevatedButton(
-                    child: Text('Change folder'),
-                    onPressed: () => _showSelectFolderDialog(context, state.dir),
-                  ),
-                  SizedBox(width: 8),
-                  Expanded(child: Text(state.dir)),
-                  SizedBox(width: 8),
-                  ElevatedButton(
-                    child: Icon(Icons.refresh),
-                    onPressed: () => BlocProvider.of<FdupesBloc>(context).add(FdupesEventDirSelected(state.dir)),
-                  ),
-                ]),
+                Row(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Column(
+                        children: state.dirs
+                            .map((dir) => [
+                                  Row(children: [
+                                    ElevatedButton(
+                                      child: Text('Change folder'),
+                                      onPressed: () => _showSelectFolderDialog(
+                                        context,
+                                        initialDir: dir,
+                                        currentDirs: state.dirs,
+                                      ),
+                                    ),
+                                    SizedBox(width: 8),
+                                    Text(dir.path),
+                                    IconButton(
+                                      icon: Icon(Icons.remove_circle),
+                                      visualDensity: VisualDensity.compact,
+                                      iconSize: 14,
+                                      onPressed: () => BlocProvider.of<FdupesBloc>(context)
+                                          .add(FdupesEventDirsSelected(state.dirs..remove(dir))),
+                                    ),
+                                  ]),
+                                  SizedBox(height: 8),
+                                ])
+                            .expand((e) => e)
+                            .toList(),
+                      ),
+                    ),
+                    SizedBox(width: 8),
+                    Column(
+                      children: [
+                        Tooltip(
+                          message: 'Find duplicates',
+                          child: ElevatedButton(
+                            child: Icon(Icons.refresh),
+                            onPressed: () =>
+                                BlocProvider.of<FdupesBloc>(context).add(FdupesEventDirsSelected(state.dirs)),
+                          ),
+                        ),
+                        SizedBox(height: 8),
+                        Tooltip(
+                          message: 'Add input folder',
+                          child: ElevatedButton(
+                            child: Icon(Icons.add),
+                            onPressed: () =>
+                                _showSelectFolderDialog(context, initialDir: null, currentDirs: state.dirs),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
                 SizedBox(height: 8),
                 if (state.dupeGroups.isEmpty)
                   Text('no dupes found')
                 else
                   DupesBody(
-                    baseDir: state.dir,
+                    baseDirs: state.dirs,
                     dupeGroups: state.dupeGroups,
                     selectedDupeGroup: state.selectedDupeGroup,
                   ),
@@ -92,11 +138,19 @@ class DupeScreen extends StatelessWidget {
     );
   }
 
-  Future<void> _showSelectFolderDialog(BuildContext context, String? initialDir) async {
+  Future<void> _showSelectFolderDialog(
+    BuildContext context, {
+    Directory? initialDir,
+    required List<Directory> currentDirs,
+  }) async {
     final dir = await FileSelectorPlatform.instance
-        .getDirectoryPath(initialDirectory: initialDir ?? util.userHome, confirmButtonText: 'Select');
+        .getDirectoryPath(initialDirectory: initialDir?.path ?? util.userHome, confirmButtonText: 'Select');
     if (dir != null) {
-      BlocProvider.of<FdupesBloc>(context).add(FdupesEventDirSelected(dir));
+      if (initialDir != null) {
+        currentDirs.remove(initialDir);
+      }
+      currentDirs.add(Directory(dir));
+      BlocProvider.of<FdupesBloc>(context).add(FdupesEventDirsSelected(currentDirs));
     }
   }