From 68ac9cbe2697d04c6f4dbdf75f5ae33c0ec5b6e4 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Tue, 19 Nov 2024 13:42:18 +0530 Subject: [PATCH 1/3] fix: remove unwanted code --- .../ui/viewer/file/preview_video_widget.dart | 36 ++----------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart index d8ce9cb790..16b8b9c406 100644 --- a/mobile/lib/ui/viewer/file/preview_video_widget.dart +++ b/mobile/lib/ui/viewer/file/preview_video_widget.dart @@ -8,7 +8,6 @@ import 'package:logging/logging.dart'; import 'package:photos/core/constants.dart'; import "package:photos/core/event_bus.dart"; import "package:photos/events/guest_view_event.dart"; -import "package:photos/generated/l10n.dart"; import "package:photos/models/file/extensions/file_props.dart"; import 'package:photos/models/file/file.dart'; import "package:photos/service_locator.dart"; @@ -79,35 +78,6 @@ class _PreviewVideoWidgetState extends State { } } - void _loadNetworkVideo() { - getFileFromServer( - widget.file, - progressCallback: (count, total) { - if (!mounted) { - return; - } - _progressNotifier.value = count / (widget.file.fileSize ?? total); - if (_progressNotifier.value == 1) { - if (mounted) { - showShortToast(context, S.of(context).decryptingVideo); - } - } - }, - ).then((file) { - if (file != null && mounted) { - _setVideoPlayerController(file: file); - } - }).onError((error, stackTrace) { - if (mounted) { - showErrorDialog( - context, - "Error", - S.of(context).failedToDownloadVideo, - ); - } - }); - } - @override void dispose() { _fileSwipeLockEventSubscription.cancel(); @@ -119,9 +89,7 @@ class _PreviewVideoWidgetState extends State { super.dispose(); } - void _setVideoPlayerController({ - File? file, - }) { + void _setVideoPlayerController() { if (!mounted) { // Note: Do not initiale video player if widget is not mounted. // On Android, if multiple instance of ExoPlayer is created, it will start @@ -129,7 +97,7 @@ class _PreviewVideoWidgetState extends State { return; } VideoPlayerController videoPlayerController; - videoPlayerController = VideoPlayerController.file(file ?? widget.preview); + videoPlayerController = VideoPlayerController.file(widget.preview); debugPrint("videoPlayerController: $videoPlayerController"); _videoPlayerController = videoPlayerController From 1fa3d873697b899e611c3a418187fa58044b8417 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Mon, 25 Nov 2024 02:24:32 +0530 Subject: [PATCH 2/3] fix: show toast about video is playing --- mobile/lib/ui/viewer/file/video_view_widget.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/lib/ui/viewer/file/video_view_widget.dart b/mobile/lib/ui/viewer/file/video_view_widget.dart index a9dbd0b385..1a37e30086 100644 --- a/mobile/lib/ui/viewer/file/video_view_widget.dart +++ b/mobile/lib/ui/viewer/file/video_view_widget.dart @@ -7,6 +7,7 @@ import 'package:chewie/chewie.dart'; import 'package:flutter/cupertino.dart'; import "package:flutter/foundation.dart"; import 'package:flutter/material.dart'; +import "package:fluttertoast/fluttertoast.dart"; import 'package:logging/logging.dart'; import 'package:photos/core/constants.dart'; import "package:photos/core/event_bus.dart"; @@ -93,6 +94,7 @@ class _VideoViewWidgetState extends State { } if (previewFile != null) { + Fluttertoast.showToast(msg: "Playing preview video"); return PreviewVideoWidget( widget.file, preview: previewFile!, From 426cd70c31051405d6207aec31076769ffb8a333 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Mon, 25 Nov 2024 02:24:40 +0530 Subject: [PATCH 3/3] refactor: simplify error handling and remove unused imports in preview video components --- mobile/lib/services/preview_video_store.dart | 2 +- .../ui/viewer/file/preview_video_widget.dart | 17 ----------------- web/apps/photos/thirdparty/ffmpeg-wasm | 1 + 3 files changed, 2 insertions(+), 18 deletions(-) create mode 160000 web/apps/photos/thirdparty/ffmpeg-wasm diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart index 3fd3c416c7..02a39cf058 100644 --- a/mobile/lib/services/preview_video_store.dart +++ b/mobile/lib/services/preview_video_store.dart @@ -190,7 +190,7 @@ class PreviewVideoStore { _logger.info("Writing playlist to ${playlistFile.path}"); return playlistFile; - } catch (e, s) { + } catch (_) { rethrow; } } diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart index 16b8b9c406..bb660b2fcb 100644 --- a/mobile/lib/ui/viewer/file/preview_video_widget.dart +++ b/mobile/lib/ui/viewer/file/preview_video_widget.dart @@ -4,14 +4,11 @@ import 'dart:io'; import 'package:chewie/chewie.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:logging/logging.dart'; import 'package:photos/core/constants.dart'; import "package:photos/core/event_bus.dart"; import "package:photos/events/guest_view_event.dart"; -import "package:photos/models/file/extensions/file_props.dart"; import 'package:photos/models/file/file.dart'; import "package:photos/service_locator.dart"; -import 'package:photos/services/files_service.dart'; import "package:photos/ui/actions/file/file_actions.dart"; import 'package:photos/ui/viewer/file/thumbnail_widget.dart'; import 'package:photos/ui/viewer/file/video_controls.dart'; @@ -43,7 +40,6 @@ class PreviewVideoWidget extends StatefulWidget { } class _PreviewVideoWidgetState extends State { - final _logger = Logger("VideoWidget"); VideoPlayerController? _videoPlayerController; ChewieController? _chewieController; final _progressNotifier = ValueNotifier(null); @@ -65,19 +61,6 @@ class _PreviewVideoWidgetState extends State { }); } - void _setFileSizeIfNull() { - if (widget.file.fileSize == null && widget.file.canEditMetaInfo) { - FilesService.instance - .getFileSize(widget.file.uploadedFileID!) - .then((value) { - widget.file.fileSize = value; - if (mounted) { - setState(() {}); - } - }); - } - } - @override void dispose() { _fileSwipeLockEventSubscription.cancel(); diff --git a/web/apps/photos/thirdparty/ffmpeg-wasm b/web/apps/photos/thirdparty/ffmpeg-wasm new file mode 160000 index 0000000000..8493ad48b1 --- /dev/null +++ b/web/apps/photos/thirdparty/ffmpeg-wasm @@ -0,0 +1 @@ +Subproject commit 8493ad48b12f83f881a59b84b003974ef23f9e96