diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json index 8b51059..4793594 100644 --- a/assets/translations/en-US.json +++ b/assets/translations/en-US.json @@ -298,6 +298,18 @@ "attachmentInputDialog": "Upload attachments", "attachmentInputUseRandomId": "Use Random ID", "attachmentInputNew": "New Upload", + "waitingForUpload": "Waiting for upload", + "attachmentVideoCompressHint": "Compress a copy of this video", + "attachmentVideoCompressHintDescription": "Do you want to upload a compress copy of video {}? It will help your audience to preview this video faster and they still can watch the original video. It will take some while to process the video on your device, so please be patient.", + "attachmentCompressQuality": "Compress quality", + "attachmentCompressQualityHighest": "Highest", + "attachmentCompressQualityDefault": "Default", + "attachmentCompressQualityMedium": "Medium", + "attachmentCompressQualityLow": "Low", + "attachmentCompressQualityHint": "Solar Network doesn't prevent you from uploading large files, high resolution, high bitrate videos. But for your network conditions, we suggest you choose a suitable compression quality.", + "attachmentUploaded": "Uploaded", + "attachmentPending": "Pending", + "attachmentCopyCompressed": "Has compressed copy", "notification": "Notification", "notificationUnreadCount": { "zero": "All notifications read", @@ -489,7 +501,7 @@ "appInitializing": "Initializing", "poweredBy": "Powered by {}", "shareIntent": "Share", - "shareIntentDescription": "What do you want to do with the content you are sharing?", + "shareIntentDescription": "What do you want to do with the content you are sharing?", "shareIntentPostStory": "Post a Story", "updateAvailable": "Update Available", "updateOngoing": "Updating, please wait...", @@ -513,12 +525,5 @@ "postCategoryKnowledge": "Knowledge", "postCategoryLiterature": "Literature", "postCategoryFunny": "Funny", - "postCategoryUncategorized": "Uncategorized", - "waitingForUpload": "Waiting for upload", - "attachmentCompressQuality": "Compress quality", - "attachmentCompressQualityHighest": "Highest", - "attachmentCompressQualityDefault": "Default", - "attachmentCompressQualityMedium": "Medium", - "attachmentCompressQualityLow": "Low", - "attachmentCompressQualityHint": "Solar Network doesn't prevent you from uploading large files, high resolution, high bitrate videos. But for your network conditions, we suggest you choose a suitable compression quality." + "postCategoryUncategorized": "Uncategorized" } diff --git a/assets/translations/zh-CN.json b/assets/translations/zh-CN.json index d3c62e0..1a02e0b 100644 --- a/assets/translations/zh-CN.json +++ b/assets/translations/zh-CN.json @@ -296,6 +296,18 @@ "attachmentInputDialog": "上传附件", "attachmentInputUseRandomId": "使用访问 ID", "attachmentInputNew": "新上传附件", + "waitingForUpload": "等待上传", + "attachmentVideoCompressHint": "压缩一份视频的副本", + "attachmentVideoCompressHintDescription": "你想上传压缩视频 {} 的副本吗？它将帮助你的观众快速预览视频，并且他们仍然可以观看原始视频。这将会在在你的设备上处理视频，所以需要一些时间，所以请耐心等待。", + "attachmentCompressQuality": "压缩质量", + "attachmentCompressQualityHighest": "最高", + "attachmentCompressQualityDefault": "默认", + "attachmentCompressQualityMedium": "中等", + "attachmentCompressQualityLow": "低", + "attachmentCompressQualityHint": "Solar Network 并没有阻止你上传大文件、高分辨率、高码率的视频，但是为了你的网络情况观众考虑，我们建议你选择一个合适的压缩质量。", + "attachmentUploaded": "已上传", + "attachmentPending": "未上传", + "attachmentCopyCompressed": "有压缩副本", "notification": "通知", "notificationUnreadCount": { "zero": "无未读通知", @@ -511,12 +523,5 @@ "postCategoryKnowledge": "知识", "postCategoryLiterature": "文学", "postCategoryFunny": "搞笑", - "postCategoryUncategorized": "未分类", - "waitingForUpload": "等待上传", - "attachmentCompressQuality": "压缩质量", - "attachmentCompressQualityHighest": "最高", - "attachmentCompressQualityDefault": "默认", - "attachmentCompressQualityMedium": "中等", - "attachmentCompressQualityLow": "低", - "attachmentCompressQualityHint": "Solar Network 并没有阻止你上传大文件、高分辨率、高码率的视频，但是为了你的网络情况观众考虑，我们建议你选择一个合适的压缩质量。" + "postCategoryUncategorized": "未分类" } diff --git a/assets/translations/zh-HK.json b/assets/translations/zh-HK.json index 9b23ec6..31979a9 100644 --- a/assets/translations/zh-HK.json +++ b/assets/translations/zh-HK.json @@ -296,6 +296,18 @@ "attachmentInputDialog": "上傳附件", "attachmentInputUseRandomId": "使用訪問 ID", "attachmentInputNew": "新上傳附件", + "waitingForUpload": "等待上傳", + "attachmentVideoCompressHint": "壓縮一份視頻的副本", + "attachmentVideoCompressHintDescription": "你想上傳壓縮視頻 {} 的副本嗎？它將幫助你的觀眾快速預覽視頻，並且他們仍然可以觀看原始視頻。這將會在在你的設備上處理視頻，所以需要一些時間，所以請耐心等待。", + "attachmentCompressQuality": "壓縮質量", + "attachmentCompressQualityHighest": "最高", + "attachmentCompressQualityDefault": "默認", + "attachmentCompressQualityMedium": "中等", + "attachmentCompressQualityLow": "低", + "attachmentCompressQualityHint": "Solar Network 並沒有阻止你上傳大文件、高分辨率、高碼率的視頻，但是為了你的網絡情況觀眾考慮，我們建議你選擇一個合適的壓縮質量。", + "attachmentUploaded": "已上傳", + "attachmentPending": "未上傳", + "attachmentCopyCompressed": "有壓縮副本", "notification": "通知", "notificationUnreadCount": { "zero": "無未讀通知", @@ -511,12 +523,5 @@ "postCategoryKnowledge": "知識", "postCategoryLiterature": "文學", "postCategoryFunny": "搞笑", - "postCategoryUncategorized": "未分類", - "waitingForUpload": "等待上傳", - "attachmentCompressQuality": "壓縮質量", - "attachmentCompressQualityHighest": "最高", - "attachmentCompressQualityDefault": "默認", - "attachmentCompressQualityMedium": "中等", - "attachmentCompressQualityLow": "低", - "attachmentCompressQualityHint": "Solar Network 並沒有阻止你上傳大文件、高分辨率、高碼率的視頻，但是為了你的網絡情況觀眾考慮，我們建議你選擇一個合適的壓縮質量。" + "postCategoryUncategorized": "未分類" } diff --git a/assets/translations/zh-TW.json b/assets/translations/zh-TW.json index b040503..5f5a99c 100644 --- a/assets/translations/zh-TW.json +++ b/assets/translations/zh-TW.json @@ -296,6 +296,18 @@ "attachmentInputDialog": "上傳附件", "attachmentInputUseRandomId": "使用訪問 ID", "attachmentInputNew": "新上傳附件", + "waitingForUpload": "等待上傳", + "attachmentVideoCompressHint": "壓縮一份視頻的副本", + "attachmentVideoCompressHintDescription": "你想上傳壓縮視頻 {} 的副本嗎？它將幫助你的觀眾快速預覽視頻，並且他們仍然可以觀看原始視頻。這將會在在你的設備上處理視頻，所以需要一些時間，所以請耐心等待。", + "attachmentCompressQuality": "壓縮質量", + "attachmentCompressQualityHighest": "最高", + "attachmentCompressQualityDefault": "默認", + "attachmentCompressQualityMedium": "中等", + "attachmentCompressQualityLow": "低", + "attachmentCompressQualityHint": "Solar Network 並沒有阻止你上傳大文件、高分辨率、高碼率的視頻，但是為了你的網絡情況觀眾考慮，我們建議你選擇一個合適的壓縮質量。", + "attachmentUploaded": "已上傳", + "attachmentPending": "未上傳", + "attachmentCopyCompressed": "有壓縮副本", "notification": "通知", "notificationUnreadCount": { "zero": "無未讀通知", @@ -511,12 +523,5 @@ "postCategoryKnowledge": "知識", "postCategoryLiterature": "文學", "postCategoryFunny": "搞笑", - "postCategoryUncategorized": "未分類", - "waitingForUpload": "等待上傳", - "attachmentCompressQuality": "壓縮質量", - "attachmentCompressQualityHighest": "最高", - "attachmentCompressQualityDefault": "默認", - "attachmentCompressQualityMedium": "中等", - "attachmentCompressQualityLow": "低", - "attachmentCompressQualityHint": "Solar Network 並沒有阻止你上傳大文件、高分辨率、高碼率的視頻，但是為了你的網絡情況觀眾考慮，我們建議你選擇一個合適的壓縮質量。" + "postCategoryUncategorized": "未分類" } diff --git a/lib/controllers/post_write_controller.dart b/lib/controllers/post_write_controller.dart index 7a98ba7..bd95ad1 100644 --- a/lib/controllers/post_write_controller.dart +++ b/lib/controllers/post_write_controller.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'dart:math' as math; import 'package:dio/dio.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; @@ -14,6 +15,7 @@ import 'package:surface/types/attachment.dart'; import 'package:surface/types/post.dart'; import 'package:surface/widgets/dialog.dart'; import 'package:surface/widgets/universal_image.dart'; +import 'package:video_compress/video_compress.dart'; class PostWriteMedia { late String name; @@ -229,7 +231,7 @@ class PostWriteController extends ChangeNotifier { } } - Future _uploadAttachment(BuildContext context, PostWriteMedia media) async { + Future _uploadAttachment(BuildContext context, PostWriteMedia media, {bool isCompressed = false}) async { final attach = context.read(); final place = await attach.chunkedUploadInitialize( @@ -244,15 +246,52 @@ class PostWriteController extends ChangeNotifier { media.toFile()!, place.$1, place.$2, - onProgress: (progress) { - progress = progress; + onProgress: (value) { + progress = value; notifyListeners(); }, ); + if (media.type == SnMediaType.video && !isCompressed && context.mounted) { + final compressedAttachment = await _tryCompressVideoCopy(context, media); + if (compressedAttachment != null) { + await attach.updateOne(item, compressedId: compressedAttachment.id); + } + } + return item; } + Future _tryCompressVideoCopy(BuildContext context, PostWriteMedia media) async { + if (kIsWeb || !(Platform.isAndroid || Platform.isIOS || Platform.isMacOS)) return null; + if (media.type != SnMediaType.video) return null; + if (media.file == null) return null; + if (VideoCompress.isCompressing) return null; + + final confirm = await context.showConfirmDialog( + 'attachmentVideoCompressHint'.tr(), + 'attachmentVideoCompressHintDescription'.tr(args: [media.file!.name]), + ); + if (!confirm) return null; + + progress = null; + notifyListeners(); + + final mediaInfo = await VideoCompress.compressVideo( + media.file!.path, + quality: VideoQuality.LowQuality, + frameRate: 30, + deleteOrigin: false, + ); + if (mediaInfo == null) return null; + if (!context.mounted) return null; + + final compressedMedia = PostWriteMedia.fromFile(XFile(mediaInfo.path!)); + final compressedAttachment = await _uploadAttachment(context, compressedMedia, isCompressed: true); + + return compressedAttachment; + } + Future uploadSingleAttachment(BuildContext context, int idx) async { if (isBusy) return; @@ -301,13 +340,20 @@ class PostWriteController extends ChangeNotifier { media.toFile()!, place.$1, place.$2, - onProgress: (progress) { + onProgress: (value) { // Calculate overall progress for attachments - progress = math.max(((i + progress) / attachments.length) * kAttachmentProgressWeight, progress); + progress = math.max(((i + value) / attachments.length) * kAttachmentProgressWeight, value); notifyListeners(); }, ); + if (media.type == SnMediaType.video && context.mounted) { + final compressedAttachment = await _tryCompressVideoCopy(context, media); + if (compressedAttachment != null) { + await attach.updateOne(item, compressedId: compressedAttachment.id); + } + } + progress = (i + 1) / attachments.length * kAttachmentProgressWeight; attachments[i] = PostWriteMedia(item); notifyListeners(); diff --git a/lib/providers/sn_attachment.dart b/lib/providers/sn_attachment.dart index 4856bc3..cfc0a5e 100644 --- a/lib/providers/sn_attachment.dart +++ b/lib/providers/sn_attachment.dart @@ -178,7 +178,7 @@ class SnAttachmentProvider { Function(double progress)? onProgress, }) async { final Map chunks = place.fileChunks; - var currentTask = 0; + var completedTasks = 0; final queue = Queue>(); final activeTasks = >[]; @@ -199,13 +199,13 @@ class SnAttachmentProvider { place.rid, entry.key, onProgress: (progress) { - final overallProgress = (currentTask + progress) / chunks.length; + final overallProgress = (completedTasks + progress) / chunks.length; onProgress?.call(overallProgress); }, ); - currentTask++; - final overallProgress = currentTask / chunks.length; + completedTasks++; + final overallProgress = completedTasks / chunks.length; onProgress?.call(overallProgress); if (result is SnAttachmentFragment) { diff --git a/lib/widgets/post/post_media_pending_list.dart b/lib/widgets/post/post_media_pending_list.dart index a3ae432..5cd2855 100644 --- a/lib/widgets/post/post_media_pending_list.dart +++ b/lib/widgets/post/post_media_pending_list.dart @@ -9,6 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_context_menu/flutter_context_menu.dart'; import 'package:gap/gap.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:image_picker/image_picker.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:pasteboard/pasteboard.dart'; @@ -293,64 +294,129 @@ class _PostMediaPendingItem extends StatelessWidget { width: 1, ), borderRadius: BorderRadius.circular(8), + color: Theme.of(context).colorScheme.surfaceContainer, ), child: ClipRRect( borderRadius: const BorderRadius.all(Radius.circular(8)), - child: AspectRatio( - aspectRatio: 1, - child: switch (media.type) { - SnMediaType.image => Container( - color: Theme.of(context).colorScheme.surfaceContainer, - child: LayoutBuilder(builder: (context, constraints) { - return Image( - image: media.getImageProvider( - context, - width: (constraints.maxWidth * devicePixelRatio).round(), - height: (constraints.maxHeight * devicePixelRatio).round(), - )!, - fit: BoxFit.contain, - ); - }), - ), - SnMediaType.video => Container( - color: Theme.of(context).colorScheme.surfaceContainer, - child: Stack( - fit: StackFit.expand, + child: Row( + children: [ + AspectRatio( + aspectRatio: 1, + child: switch (media.type) { + SnMediaType.image => LayoutBuilder(builder: (context, constraints) { + return Image( + image: media.getImageProvider( + context, + width: (constraints.maxWidth * devicePixelRatio).round(), + height: (constraints.maxHeight * devicePixelRatio).round(), + )!, + fit: BoxFit.contain, + ); + }), + SnMediaType.video => Stack( + fit: StackFit.expand, + children: [ + if (media.attachment?.thumbnail != null) + AutoResizeUniversalImage(sn.getAttachmentUrl(media.attachment!.thumbnail!.rid)), + const Icon(Symbols.videocam, color: Colors.white, shadows: [ + Shadow( + offset: Offset(1, 1), + blurRadius: 8.0, + color: Color.fromARGB(255, 0, 0, 0), + ), + ]), + ], + ), + SnMediaType.audio => Stack( + fit: StackFit.expand, + children: [ + if (media.attachment?.thumbnail != null) + AutoResizeUniversalImage(sn.getAttachmentUrl(media.attachment!.thumbnail!.rid)), + const Icon(Symbols.audio_file, color: Colors.white, shadows: [ + Shadow( + offset: Offset(1, 1), + blurRadius: 8.0, + color: Color.fromARGB(255, 0, 0, 0), + ), + ]), + ], + ), + _ => Container( + color: Theme.of(context).colorScheme.surfaceContainer, + child: const Icon(Symbols.docs).center(), + ), + }, + ), + if (media.type != SnMediaType.image) const VerticalDivider(width: 1, thickness: 1), + if (media.type != SnMediaType.image) + SizedBox( + width: 160, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - if (media.attachment?.thumbnail != null) - AutoResizeUniversalImage(sn.getAttachmentUrl(media.attachment!.thumbnail!.rid)), - const Icon(Symbols.videocam, color: Colors.white, shadows: [ - Shadow( - offset: Offset(1, 1), - blurRadius: 8.0, - color: Color.fromARGB(255, 0, 0, 0), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (media.attachment != null) + Text( + media.attachment!.alt, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ) + else if (media.file != null) + Text(media.file!.name, maxLines: 1, overflow: TextOverflow.ellipsis) + else + Text('unknown'.tr()), + if (media.attachment != null) + Text( + media.attachment!.size.formatBytes(), + style: GoogleFonts.robotoMono(fontSize: 13), + maxLines: 1, + ) + else if (media.file != null) + FutureBuilder( + future: media.length(), + builder: (context, snapshot) { + if (!snapshot.hasData) return const SizedBox.shrink(); + return Text( + snapshot.data!.formatBytes(), + style: GoogleFonts.robotoMono(fontSize: 13), + maxLines: 1, + ); + }, + ), + ], + ), + ), + if (media.attachment != null && media.attachment!.compressedId != null) + Row( + children: [ + Icon(Symbols.bolt, size: 16), + const Gap(4), + Text('attachmentCopyCompressed').tr().fontSize(13), + ], + ), + if (media.attachment != null) + Row( + children: [ + Icon(Symbols.cloud, size: 16), + const Gap(4), + Text('attachmentUploaded').tr().fontSize(13), + ], + ) + else + Row( + children: [ + Icon(Symbols.cloud_off, size: 16), + const Gap(4), + Text('attachmentPending').tr().fontSize(13), + ], ), - ]), ], ), - ), - SnMediaType.audio => Container( - color: Theme.of(context).colorScheme.surfaceContainer, - child: Stack( - fit: StackFit.expand, - children: [ - if (media.attachment?.thumbnail != null) - AutoResizeUniversalImage(sn.getAttachmentUrl(media.attachment!.thumbnail!.rid)), - const Icon(Symbols.audio_file, color: Colors.white, shadows: [ - Shadow( - offset: Offset(1, 1), - blurRadius: 8.0, - color: Color.fromARGB(255, 0, 0, 0), - ), - ]), - ], - ), - ), - _ => Container( - color: Theme.of(context).colorScheme.surfaceContainer, - child: const Icon(Symbols.docs).center(), - ), - }, + ).padding(horizontal: 12, vertical: 12), + ], ), ), );