claude refactorings, flutter best practices, platform dependent changes, general cleanup

2026-05-06 11:58:50 +02:00
parent 4b1d4379a0
commit 4e1272aba9
281 changed files with 1948 additions and 1041 deletions
@@ -1,21 +1,26 @@
-import 'dart:io';
+import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:nextcloud/nextcloud.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';

-import '../../../api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart';
-import '../../../state/app/infrastructure/loadableState/loadable_state.dart';
-import '../../../state/app/infrastructure/loadableState/view/loadable_state_consumer.dart';
-import '../../../state/app/infrastructure/utilityWidgets/bloc_module.dart';
+import '../../../api/marianumcloud/webdav/queries/list_files/cacheable_file.dart';
+import '../../../api/marianumcloud/webdav/queries/list_files/list_files_cache.dart';
+import '../../../api/marianumcloud/webdav/webdav_api.dart';
+import '../../../state/app/infrastructure/loadable_state/loadable_state.dart';
+import '../../../state/app/infrastructure/loadable_state/view/loadable_state_consumer.dart';
+import '../../../state/app/infrastructure/utility_widgets/bloc_module.dart';
 import '../../../state/app/modules/files/bloc/files_bloc.dart';
 import '../../../state/app/modules/files/bloc/files_state.dart';
 import '../../../state/app/modules/settings/bloc/settings_cubit.dart';
+import '../../../utils/cache_invalidation_bus.dart';
+import '../../../utils/file_clipboard.dart';
 import '../../../widget/async_action_button.dart';
 import '../../../widget/file_pick.dart';
 import '../../../widget/placeholder_view.dart';
-import 'widgets/file_element.dart';
 import 'files_upload_dialog.dart';
+import 'widgets/file_element.dart';

 class BetterSortOption {
  String displayName;
@@ -78,6 +83,11 @@ class _FilesViewState extends State<_FilesView> {
  late final SettingsCubit settings;
  late SortOption currentSort;
  late bool currentSortDirection;
+  late final StreamSubscription<String> _invalidationSub;
+
+  // Cache key in FilesBloc's pathString format: '/' for root, otherwise
+  // segments joined without leading/trailing slash.
+  String get _myPathString => widget.path.isEmpty ? '/' : widget.path.join('/');

  @override
  void initState() {
@@ -85,12 +95,25 @@ class _FilesViewState extends State<_FilesView> {
    settings = context.read<SettingsCubit>();
    currentSort = settings.val().fileSettings.sortBy;
    currentSortDirection = settings.val().fileSettings.ascending;
+    _invalidationSub = CacheInvalidationBus.listFilesStream.listen(_onInvalidation);
+  }
+
+  void _onInvalidation(String invalidatedPath) {
+    if (!mounted) return;
+    if (invalidatedPath != _myPathString) return;
+    context.read<FilesBloc>().refresh();
+  }
+
+  @override
+  void dispose() {
+    _invalidationSub.cancel();
+    super.dispose();
  }

  Future<void> mediaUpload(List<String>? paths) async {
    if (paths == null) return;
    final bloc = context.read<FilesBloc>();
-    pushScreen(
+    unawaited(pushScreen(
      context,
      withNavBar: false,
      screen: FilesUploadDialog(
@@ -98,7 +121,7 @@ class _FilesViewState extends State<_FilesView> {
        remotePath: widget.path.join('/'),
        onUploadFinished: (_) => bloc.refresh(),
      ),
-    );
+    ));
  }

  @override
@@ -163,28 +186,39 @@ class _FilesViewState extends State<_FilesView> {
        onPressed: () => _showAddDialog(context, bloc),
        child: const Icon(Icons.add),
      ),
-      body: LoadableStateConsumer<FilesBloc, FilesState>(
-        isReady: (state) => state.listing != null,
-        child: (state, _) {
-          final listing = state.listing!;
-          if (listing.files.isEmpty) {
-            return const PlaceholderView(icon: Icons.folder_off_rounded, text: 'Der Ordner ist leer');
-          }
-          final files = listing.sortBy(
-            sortOption: currentSort,
-            foldersToTop: context.watch<SettingsCubit>().val().fileSettings.sortFoldersToTop,
-            reversed: currentSortDirection,
-          );
-          return ListView.builder(
-            padding: EdgeInsets.zero,
-            itemCount: files.length,
-            itemBuilder: (context, index) => FileElement(files[index], widget.path, bloc.refresh),
-          );
-        },
+      body: Column(
+        children: [
+          _ClipboardBanner(currentFolder: _currentFolderPath, onPasteDone: bloc.refresh),
+          Expanded(
+            child: LoadableStateConsumer<FilesBloc, FilesState>(
+              isReady: (state) => state.listing != null,
+              child: (state, _) {
+                final listing = state.listing!;
+                if (listing.files.isEmpty) {
+                  return const PlaceholderView(icon: Icons.folder_off_rounded, text: 'Der Ordner ist leer');
+                }
+                final files = listing.sortBy(
+                  sortOption: currentSort,
+                  foldersToTop: context.watch<SettingsCubit>().val().fileSettings.sortFoldersToTop,
+                  reversed: currentSortDirection,
+                );
+                return ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: files.length,
+                  itemBuilder: (context, index) => FileElement(files[index], widget.path, bloc.refresh),
+                );
+              },
+            ),
+          ),
+        ],
      ),
    );
  }

+  // Relative folder path matching the WebDAV format used by `CacheableFile.path`
+  // (no leading slash; trailing slash for non-root). Empty string means root.
+  String get _currentFolderPath => widget.path.isEmpty ? '' : '${widget.path.join('/')}/';
+
  void _showAddDialog(BuildContext context, FilesBloc bloc) {
    showDialog(
      context: context,
@@ -205,18 +239,25 @@ class _FilesViewState extends State<_FilesView> {
            Navigator.of(dialogCtx).pop();
          },
        ),
-        Visibility(
-          visible: !Platform.isIOS,
-          child: ListTile(
-            leading: const Icon(Icons.add_a_photo_outlined),
-            title: const Text('Aus Gallerie hochladen'),
-            onTap: () {
-              FilePick.multipleGalleryPick().then((value) {
-                if (value != null) mediaUpload(value.map((e) => e.path).toList());
-              });
-              Navigator.of(dialogCtx).pop();
-            },
-          ),
+        ListTile(
+          leading: const Icon(Icons.add_a_photo_outlined),
+          title: const Text('Aus Galerie hochladen'),
+          onTap: () {
+            FilePick.multipleGalleryPick().then((value) {
+              if (value != null) mediaUpload(value.map((e) => e.path).toList());
+            });
+            Navigator.of(dialogCtx).pop();
+          },
+        ),
+        ListTile(
+          leading: const Icon(Icons.camera_alt_outlined),
+          title: const Text('Foto aufnehmen'),
+          onTap: () {
+            FilePick.cameraPick().then((image) {
+              if (image != null) mediaUpload([image.path]);
+            });
+            Navigator.of(dialogCtx).pop();
+          },
        ),
      ]),
    );
@@ -248,3 +289,142 @@ class _FilesViewState extends State<_FilesView> {
    );
  }
 }
+
+class _ClipboardBanner extends StatefulWidget {
+  const _ClipboardBanner({required this.currentFolder, required this.onPasteDone});
+  final String currentFolder;
+  final void Function() onPasteDone;
+
+  @override
+  State<_ClipboardBanner> createState() => _ClipboardBannerState();
+}
+
+class _ClipboardBannerState extends State<_ClipboardBanner> {
+  bool _busy = false;
+
+  // All paths here are relative to the WebDAV root (matching `CacheableFile.path`).
+  // Root is the empty string ''. Folders end with '/'.
+  String _normalised(String path) {
+    final stripped = path.replaceAll(RegExp(r'^/+|/+$'), '');
+    return stripped.isEmpty ? '' : '$stripped/';
+  }
+
+  String _joinPath(String folder, String name, {required bool isDirectory}) =>
+      isDirectory ? '$folder$name/' : '$folder$name';
+
+  // Disabled when:
+  // - clipboard is empty
+  // - we'd be pasting a folder into itself or one of its descendants
+  // - every entry already lives in the current folder (paste would be a no-op)
+  bool get _canPaste {
+    final cb = FileClipboard.instance;
+    if (cb.isEmpty) return false;
+    final dst = _normalised(widget.currentFolder);
+    var atLeastOneActionable = false;
+    for (final f in cb.files) {
+      if (f.isDirectory) {
+        final src = _normalised(f.path);
+        if (dst == src || dst.startsWith(src)) return false;
+      }
+      final destination = _joinPath(widget.currentFolder, f.name, isDirectory: f.isDirectory);
+      if (destination != f.path) atLeastOneActionable = true;
+    }
+    return atLeastOneActionable;
+  }
+
+  // Cache key format used by ListFilesCache (matches FilesBloc's pathString:
+  // relative, no leading or trailing slash; root is '/').
+  String _parentCacheKey(String relativePath) {
+    final stripped = relativePath.replaceAll(RegExp(r'^/+|/+$'), '');
+    if (!stripped.contains('/')) return '/';
+    final parts = stripped.split('/')..removeLast();
+    return parts.isEmpty ? '/' : parts.join('/');
+  }
+
+  Future<void> _paste() async {
+    final cb = FileClipboard.instance;
+    if (_busy || !_canPaste) return;
+    setState(() => _busy = true);
+    final operation = cb.operation;
+    final errors = <String>[];
+    final invalidatedSourceFolders = <String>{};
+    try {
+      final webdav = await WebdavApi.webdav;
+      for (final file in cb.files) {
+        final destination = _joinPath(widget.currentFolder, file.name, isDirectory: file.isDirectory);
+        if (destination == file.path) continue;
+        try {
+          if (operation == FileClipboardOperation.cut) {
+            await webdav.move(PathUri.parse(file.path), PathUri.parse(destination));
+            invalidatedSourceFolders.add(_parentCacheKey(file.path));
+          } else {
+            await webdav.copy(PathUri.parse(file.path), PathUri.parse(destination));
+          }
+        } on Object catch (e) {
+          errors.add('${file.name}: $e');
+        }
+      }
+      // After cut, the source folders no longer contain the moved files. Drop
+      // their cached listings so the next visit fetches fresh data instead of
+      // briefly showing the moved file as still present.
+      for (final folder in invalidatedSourceFolders) {
+        await ListFilesCache.invalidate(folder);
+      }
+      if (operation == FileClipboardOperation.cut) cb.clear();
+      widget.onPasteDone();
+    } finally {
+      if (mounted) setState(() => _busy = false);
+    }
+    if (errors.isNotEmpty && mounted) {
+      await showDialog<void>(
+        context: context,
+        builder: (ctx) => AlertDialog(
+          title: const Text('Einfügen teilweise fehlgeschlagen'),
+          content: SingleChildScrollView(child: Text(errors.join('\n\n'))),
+          actions: [TextButton(onPressed: () => Navigator.of(ctx).pop(), child: const Text('OK'))],
+        ),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) => ListenableBuilder(
+        listenable: FileClipboard.instance,
+        builder: (context, _) {
+          final cb = FileClipboard.instance;
+          if (cb.isEmpty) return const SizedBox.shrink();
+          final cut = cb.operation == FileClipboardOperation.cut;
+          final count = cb.files.length;
+          final label = count == 1 ? '"${cb.files.first.name}"' : '$count Elemente';
+          return Material(
+            color: Theme.of(context).colorScheme.secondaryContainer,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+              child: Row(
+                children: [
+                  Icon(cut ? Icons.drive_file_move_outline : Icons.copy_outlined, size: 20),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Text(
+                      cut ? '$label verschieben' : '$label kopieren',
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  TextButton(
+                    onPressed: _busy || !_canPaste ? null : _paste,
+                    child: _busy
+                        ? const SizedBox(width: 14, height: 14, child: CircularProgressIndicator(strokeWidth: 2))
+                        : const Text('Hier einfügen'),
+                  ),
+                  IconButton(
+                    tooltip: 'Verwerfen',
+                    icon: const Icon(Icons.close, size: 20),
+                    onPressed: _busy ? null : cb.clear,
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      );
+}