Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions lib/web/screens/web_bucket_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ import 'package:fula_files/web/services/web_share_service.dart';
import 'package:fula_files/web/services/web_streaming_file.dart';
import 'package:fula_files/web/services/web_tag_service.dart';
import 'package:fula_files/web/services/web_text_viewer_logic.dart';
import 'package:fula_files/web/services/web_thumbnail_service.dart';
import 'package:fula_files/web/services/web_upload_manager.dart';
import 'package:fula_files/web/utils/cloud_folder_tree.dart';
import 'package:fula_files/web/widgets/media_preview_dialog.dart';
import 'package:fula_files/web/widgets/web_thumb.dart';
import 'package:fula_files/web/widgets/web_audio_player.dart';
import 'package:fula_files/web/widgets/web_create_share_dialog.dart';
import 'package:fula_files/web/widgets/web_tag_dialogs.dart';
Expand Down Expand Up @@ -724,6 +726,26 @@ class _WebBucketScreenState extends State<WebBucketScreen> {
);
}

/// Leading slot: a lazy thumbnail for images (fetched from the small sidecar,
/// never the full file), the type icon otherwise / as fallback.
Widget _leadingFor(FulaObject o) {
final icon = Icon(_isImage(o)
? Icons.image_outlined
: _isVideo(o)
? Icons.movie_outlined
: _isAudio(o)
? Icons.audiotrack_outlined
: _isText(o)
? Icons.article_outlined
: Icons.insert_drive_file_outlined);
if (!_isImage(o)) return icon;
return WebThumb(
bucket: o.sourceBucket ?? BucketVersionResolver.writeBucket(widget.base),
objectKey: o.key,
fallback: icon,
);
}

Future<void> _preview(FulaObject o) async {
if (_isVideo(o) || _isAudio(o)) {
await _previewMedia(o);
Expand All @@ -750,6 +772,7 @@ class _WebBucketScreenState extends State<WebBucketScreen> {
final future = FulaApiService.instance.downloadObject(bucket, o.key);
unawaited(future.then((bytes) {
_recordRecent(o, bucket, imageBytes: bytes);
WebThumbnailService.instance.backfillFromBytes(bucket, o.key, o.name, bytes);
}).catchError((_) {}));
showDialog<void>(
context: context,
Expand Down Expand Up @@ -1048,15 +1071,7 @@ class _WebBucketScreenState extends State<WebBucketScreen> {
final o = _objects![i];
final tags = _fileTags[o.key] ?? const <FileTag>[];
return ListTile(
leading: Icon(_isImage(o)
? Icons.image_outlined
: _isVideo(o)
? Icons.movie_outlined
: _isAudio(o)
? Icons.audiotrack_outlined
: _isText(o)
? Icons.article_outlined
: Icons.insert_drive_file_outlined),
leading: _leadingFor(o),
title: Text(_displayName(o),
overflow: TextOverflow.ellipsis),
subtitle: Column(
Expand Down
53 changes: 45 additions & 8 deletions lib/web/screens/web_cloud_files_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ import 'package:fula_files/core/services/ipfs_public_service.dart';
import 'package:fula_files/web/services/web_foreground_activity.dart';
import 'package:fula_files/web/services/web_save.dart';
import 'package:fula_files/web/services/web_streaming_file.dart';
import 'package:fula_files/web/services/web_thumbnail_service.dart';
import 'package:fula_files/web/services/web_upload_manager.dart';
import 'package:fula_files/web/utils/cloud_folder_tree.dart';
import 'package:fula_files/web/widgets/web_create_share_dialog.dart';
import 'package:fula_files/web/widgets/web_thumb.dart';

/// Raw cloud file manager ("Cloud Files"). Browses the user's buckets and the
/// virtual folder tree inside each one — the same encrypted data the category
Expand Down Expand Up @@ -80,7 +82,9 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
final r = await FulaApiService.instance.listBucketsCached();
if (!mounted) return;
setState(() {
_buckets = [...r.buckets]..sort();
// Hide the sidecar thumbnail buckets (e.g. images-v8-thumbs).
_buckets = [for (final b in r.buckets) if (!isThumbsBucket(b)) b]
..sort();
_bucketsStale = r.stale;
_loading = false;
});
Expand Down Expand Up @@ -238,13 +242,20 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {

Future<void> _previewImage(FulaObject o) async {
final bucket = o.sourceBucket ?? _bucket!;
final future = FulaApiService.instance.downloadObject(bucket, o.key);
// The full bytes download anyway — backfill a thumbnail (gated to the
// user's own writable bucket) so the grid shows it next time.
unawaited(future
.then((bytes) => WebThumbnailService.instance
.backfillFromBytes(bucket, o.key, o.name, bytes))
.catchError((_) {}));
showDialog<void>(
context: context,
builder: (ctx) => Dialog(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 900, maxHeight: 720),
child: FutureBuilder<Uint8List>(
future: FulaApiService.instance.downloadObject(bucket, o.key),
future: future,
builder: (ctx, snap) {
if (snap.connectionState != ConnectionState.done) {
return const SizedBox(
Expand Down Expand Up @@ -300,6 +311,7 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
setState(() =>
_objects = [for (final x in _objects) if (x.key != o.key) x]);
_snack('Deleted');
unawaited(WebThumbnailService.instance.deleteCloudThumb(bucket, o.key));
} catch (e) {
_snack('Delete failed: ${_clean(e)}');
}
Expand All @@ -324,6 +336,7 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
for (final o in inFolder) {
await WebForegroundActivity.instance
.run(() => FulaApiService.instance.deleteObject(bucket, o.key));
unawaited(WebThumbnailService.instance.deleteCloudThumb(bucket, o.key));
}
if (!mounted) return;
final deleted = inFolder.map((o) => o.key).toSet();
Expand Down Expand Up @@ -497,6 +510,8 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
setState(() =>
_objects = [for (final x in _objects) if (x.key != o.key) x]);
_snack(okWord);
unawaited(WebThumbnailService.instance
.moveCloudThumb(srcBucket, o.key, destBucket, destKey));
await _loadObjects(silent: true);
}

Expand Down Expand Up @@ -640,10 +655,7 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
if (s.isEmpty) return 'Enter a name.';
if (s.contains('/')) return 'No "/" in a file name.';
if (s == kFolderMarkerName) return 'Reserved name.';
final siblings = deriveCloudFolderView(_objects, _prefix)
.files
.map((f) => f.name)
.toSet();
final siblings = _view().files.map((f) => f.name).toSet();
if (s != exclude && siblings.contains(s)) {
return 'A file with this name already exists here.';
}
Expand Down Expand Up @@ -861,8 +873,27 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
);
}

// Memoized folder view: deriveCloudFolderView re-scans the whole flat list,
// so cache it and recompute only when the object-list identity or the prefix
// changes — not on every build or every rename-dialog keystroke.
({List<String> folders, List<FulaObject> files})? _viewCache;
int? _viewObjectsId;
String? _viewPrefix;

({List<String> folders, List<FulaObject> files}) _view() {
final id = identityHashCode(_objects);
if (_viewCache != null && _viewObjectsId == id && _viewPrefix == _prefix) {
return _viewCache!;
}
final v = deriveCloudFolderView(_objects, _prefix);
_viewCache = v;
_viewObjectsId = id;
_viewPrefix = _prefix;
return v;
}

Widget _folderView() {
final view = deriveCloudFolderView(_objects, _prefix);
final view = _view();
final empty = view.folders.isEmpty && view.files.isEmpty;
if (empty) {
return RefreshIndicator(
Expand Down Expand Up @@ -906,7 +937,13 @@ class _WebCloudFilesScreenState extends State<WebCloudFilesScreen> {
}
final o = view.files[i - view.folders.length];
return ListTile(
leading: Icon(_iconFor(o)),
leading: o.isImage
? WebThumb(
bucket: o.sourceBucket ?? _bucket!,
objectKey: o.key,
fallback: Icon(_iconFor(o)),
)
: Icon(_iconFor(o)),
title: Text(o.name),
subtitle: Text(o.sizeFormatted),
onTap: () => _open(o),
Expand Down
2 changes: 1 addition & 1 deletion lib/web/screens/web_settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'package:fula_files/web/services/web_session.dart';

/// App version label shown in About + the home footer. Kept in one place
/// so the two stay in sync (the home footer imports this).
const String kWebAppVersion = 'v1.11.4.16';
const String kWebAppVersion = 'v1.11.4.17';

/// In-app web Settings page. Replaces the old behavior where the gear icon
/// opened cloud.fx.land in a new tab. Mirrors the mobile Settings screen's
Expand Down
2 changes: 2 additions & 0 deletions lib/web/services/web_cache_sync.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:fula_files/web/services/web_audio_controller.dart';
import 'package:fula_files/web/services/web_listing_cache.dart';
import 'package:fula_files/web/services/web_prefetch_scheduler.dart';
import 'package:fula_files/web/services/web_recent_files_service.dart';
import 'package:fula_files/web/services/web_thumbnail_service.dart';

/// Cross-tab cache coherence (plan §8 multi-tab): a delete in tab A
/// must not survive in tab B, and a sign-out anywhere must drop every
Expand Down Expand Up @@ -59,6 +60,7 @@ class WebCacheSync {
// and no in-flight write can leak into the deleted box.
WebListingCache.instance.deactivate();
WebRecentFilesService.instance.deactivate();
WebThumbnailService.instance.deactivate();
WebPrefetchScheduler.instance.reset();
WebAudioController.instance.stopPlayback();
onRemoteSignOut?.call();
Expand Down
6 changes: 6 additions & 0 deletions lib/web/services/web_session.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import 'package:fula_files/web/services/web_cache_sync.dart';
import 'package:fula_files/web/services/web_listing_cache.dart';
import 'package:fula_files/web/services/web_prefetch_scheduler.dart';
import 'package:fula_files/web/services/web_recent_files_service.dart';
import 'package:fula_files/web/services/web_thumbnail_service.dart';
import 'package:fula_files/web/services/web_upload_manager.dart';

/// Signed-in identity as the web shell sees it.
Expand Down Expand Up @@ -462,6 +463,11 @@ class WebSession extends ChangeNotifier {
await WebRecentFilesService.instance.clearAll();
} catch (_) {}
}());
unawaited(() async {
try {
await WebThumbnailService.instance.clearAll();
} catch (_) {}
}());
// Stop background audio so the previous user's track doesn't keep playing
// into the next session (s2).
WebAudioController.instance.stopPlayback();
Expand Down
Loading