feat: keep timestamps of transferred files (#1505)

localsend · Jul 14, 2024 · 9d523b4 · 9d523b4
1 parent a95e617
commit 9d523b4
Show file tree

Hide file tree

Showing 27 changed files with 550 additions and 719 deletions.
diff --git a/app/assets/CHANGELOG.md b/app/assets/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - feat: add clear button in the send tab (@Caesarovich)
 - feat: save text messages to history (@Tienisto)
+- feat: keep timestamps of transferred files (@Tienisto)
 - feat: add option to require PIN when sharing via link (@Tienisto)
 - feat: add option to require PIN when receiving files (@Tienisto)
 - feat: add option to open parent folder of received files in history (@Tienisto)

diff --git a/app/lib/model/cross_file.dart b/app/lib/model/cross_file.dart
@@ -17,6 +17,8 @@ class CrossFile with CrossFileMappable {
   final AssetEntity? asset; // for thumbnails
   final String? path;
   final List<int>? bytes; // if type message, then UTF-8 encoded
+  final DateTime? lastModified;
+  final DateTime? lastAccessed;
 
   const CrossFile({
     required this.name,
@@ -26,6 +28,8 @@ class CrossFile with CrossFileMappable {
     required this.asset,
     required this.path,
     required this.bytes,
+    required this.lastModified,
+    required this.lastAccessed,
   });
 
   /// Custom toString() to avoid printing the bytes.

diff --git a/app/lib/model/cross_file.mapper.dart b/app/lib/model/cross_file.mapper.dart
@@ -35,6 +35,10 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
   static const Field<CrossFile, String> _f$path = Field('path', _$path);
   static List<int>? _$bytes(CrossFile v) => v.bytes;
   static const Field<CrossFile, List<int>> _f$bytes = Field('bytes', _$bytes);
+  static DateTime? _$lastModified(CrossFile v) => v.lastModified;
+  static const Field<CrossFile, DateTime> _f$lastModified = Field('lastModified', _$lastModified);
+  static DateTime? _$lastAccessed(CrossFile v) => v.lastAccessed;
+  static const Field<CrossFile, DateTime> _f$lastAccessed = Field('lastAccessed', _$lastAccessed);
 
   @override
   final MappableFields<CrossFile> fields = const {
@@ -45,6 +49,8 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
     #asset: _f$asset,
     #path: _f$path,
     #bytes: _f$bytes,
+    #lastModified: _f$lastModified,
+    #lastAccessed: _f$lastAccessed,
   };
 
   static CrossFile _instantiate(DecodingData data) {
@@ -55,7 +61,9 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
         thumbnail: data.dec(_f$thumbnail),
         asset: data.dec(_f$asset),
         path: data.dec(_f$path),
-        bytes: data.dec(_f$bytes));
+        bytes: data.dec(_f$bytes),
+        lastModified: data.dec(_f$lastModified),
+        lastAccessed: data.dec(_f$lastAccessed));
   }
 
   @override
@@ -102,7 +110,16 @@ extension CrossFileValueCopy<$R, $Out> on ObjectCopyWith<$R, CrossFile, $Out> {
 
 abstract class CrossFileCopyWith<$R, $In extends CrossFile, $Out> implements ClassCopyWith<$R, $In, $Out> {
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes;
-  $R call({String? name, FileType? fileType, int? size, Uint8List? thumbnail, AssetEntity? asset, String? path, List<int>? bytes});
+  $R call(
+      {String? name,
+      FileType? fileType,
+      int? size,
+      Uint8List? thumbnail,
+      AssetEntity? asset,
+      String? path,
+      List<int>? bytes,
+      DateTime? lastModified,
+      DateTime? lastAccessed});
   CrossFileCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
@@ -122,15 +139,19 @@ class _CrossFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, CrossFile,
           Object? thumbnail = $none,
           Object? asset = $none,
           Object? path = $none,
-          Object? bytes = $none}) =>
+          Object? bytes = $none,
+          Object? lastModified = $none,
+          Object? lastAccessed = $none}) =>
       $apply(FieldCopyWithData({
         if (name != null) #name: name,
         if (fileType != null) #fileType: fileType,
         if (size != null) #size: size,
         if (thumbnail != $none) #thumbnail: thumbnail,
         if (asset != $none) #asset: asset,
         if (path != $none) #path: path,
-        if (bytes != $none) #bytes: bytes
+        if (bytes != $none) #bytes: bytes,
+        if (lastModified != $none) #lastModified: lastModified,
+        if (lastAccessed != $none) #lastAccessed: lastAccessed
       }));
   @override
   CrossFile $make(CopyWithData data) => CrossFile(
@@ -140,7 +161,9 @@ class _CrossFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, CrossFile,
       thumbnail: data.get(#thumbnail, or: $value.thumbnail),
       asset: data.get(#asset, or: $value.asset),
       path: data.get(#path, or: $value.path),
-      bytes: data.get(#bytes, or: $value.bytes));
+      bytes: data.get(#bytes, or: $value.bytes),
+      lastModified: data.get(#lastModified, or: $value.lastModified),
+      lastAccessed: data.get(#lastAccessed, or: $value.lastAccessed));
 
   @override
   CrossFileCopyWith<$R2, CrossFile, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _CrossFileCopyWithImpl($value, $cast, t);

diff --git a/app/lib/provider/network/send_provider.dart b/app/lib/provider/network/send_provider.dart
@@ -78,6 +78,12 @@ class SendNotifier extends Notifier<Map<String, SendSessionState>> {
               preview: files.length == 1 && files.first.fileType == FileType.text && files.first.bytes != null
                   ? utf8.decode(files.first.bytes!) // send simple message by embedding it into the preview
                   : null,
+              metadata: file.lastModified != null || file.lastAccessed != null
+                  ? FileMetadata(
+                      lastModified: file.lastModified,
+                      lastAccessed: file.lastAccessed,
+                    )
+                  : null,
               legacy: target.version == '1.0',
             ),
             status: FileStatus.queue,

diff --git a/app/lib/provider/network/server/controller/receive_controller.dart b/app/lib/provider/network/server/controller/receive_controller.dart
@@ -445,6 +445,8 @@ class ReceiveController {
         isImage: fileType == FileType.image,
         stream: request.read(),
         androidSdkInt: server.ref.read(deviceInfoProvider).androidSdkInt,
+        lastModified: receivingFile.file.metadata?.lastModified,
+        lastAccessed: receivingFile.file.metadata?.lastAccessed,
         onProgress: (savedBytes) {
           if (receivingFile.file.size != 0) {
             server.ref.notifier(progressProvider).setProgress(

diff --git a/app/lib/provider/network/server/controller/send_controller.dart b/app/lib/provider/network/server/controller/send_controller.dart
@@ -247,6 +247,12 @@ class SendController {
               preview: files.first.fileType == FileType.text && files.first.bytes != null
                   ? utf8.decode(files.first.bytes!) // send simple message by embedding it into the preview
                   : null,
+              metadata: file.lastModified != null || file.lastAccessed != null
+                  ? FileMetadata(
+                      lastModified: file.lastModified,
+                      lastAccessed: file.lastAccessed,
+                    )
+                  : null,
               legacy: false,
             ),
             asset: file.asset,

diff --git a/app/lib/provider/selection/selected_sending_files_provider.dart b/app/lib/provider/selection/selected_sending_files_provider.dart
@@ -49,6 +49,8 @@ class AddMessageAction extends ReduxAction<SelectedSendingFilesNotifier, List<Cr
       asset: null,
       path: null,
       bytes: bytes,
+      lastModified: null,
+      lastAccessed: null,
     );
 
     return List.unmodifiable([
@@ -98,6 +100,8 @@ class AddBinaryAction extends ReduxAction<SelectedSendingFilesNotifier, List<Cro
       asset: null,
       path: null,
       bytes: bytes,
+      lastModified: null,
+      lastAccessed: null,
     );
 
     return List.unmodifiable([
@@ -160,6 +164,8 @@ class AddDirectoryAction extends AsyncReduxAction<SelectedSendingFilesNotifier,
           asset: null,
           path: entity.path,
           bytes: null,
+          lastModified: entity.lastModifiedSync().toUtc(),
+          lastAccessed: entity.lastAccessedSync().toUtc(),
         );
 
         final isAlreadySelect = state.any((element) => element.isSameFile(otherFile: file));
@@ -219,6 +225,8 @@ class AddAndroidDirectoryAction extends AsyncReduxAction<SelectedSendingFilesNot
         asset: null,
         path: file.uri,
         bytes: null,
+        lastModified: DateTime.fromMillisecondsSinceEpoch(file.lastModified, isUtc: true),
+        lastAccessed: null,
       );
 
       final isAlreadySelect = state.any((element) => element.isSameFile(otherFile: crossFile));

diff --git a/app/lib/util/native/cross_file_converters.dart b/app/lib/util/native/cross_file_converters.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:common/common.dart';
 import 'package:device_apps/device_apps.dart';
-import 'package:file_picker/file_picker.dart' as file_picker;
 import 'package:flutter/foundation.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:localsend_app/model/cross_file.dart';
@@ -13,18 +12,6 @@ import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 /// Utility functions to convert third party models to common [CrossFile] model.
 class CrossFileConverters {
-  static Future<CrossFile> convertPlatformFile(file_picker.PlatformFile file) async {
-    return CrossFile(
-      name: file.name,
-      fileType: file.name.guessFileType(),
-      size: file.size,
-      thumbnail: null,
-      asset: null,
-      path: kIsWeb ? null : file.path,
-      bytes: kIsWeb ? file.bytes! : null,
-    );
-  }
-
   static Future<CrossFile> convertAssetEntity(AssetEntity asset) async {
     final file = (await asset.originFile)!;
     return CrossFile(
@@ -35,6 +22,8 @@ class CrossFileConverters {
       asset: asset,
       path: file.path,
       bytes: null,
+      lastModified: file.lastModifiedSync().toUtc(),
+      lastAccessed: file.lastAccessedSync().toUtc(),
     );
   }
 
@@ -47,6 +36,8 @@ class CrossFileConverters {
       asset: null,
       path: kIsWeb ? null : file.path,
       bytes: kIsWeb ? await file.readAsBytes() : null, // we can fetch it now because in Web it is already there
+      lastModified: kIsWeb ? null : await file.lastModified(),
+      lastAccessed: null,
     );
   }
 
@@ -59,6 +50,8 @@ class CrossFileConverters {
       asset: null,
       path: file.path,
       bytes: null,
+      lastModified: file.lastModifiedSync().toUtc(),
+      lastAccessed: file.lastAccessedSync().toUtc(),
     );
   }
 
@@ -71,6 +64,8 @@ class CrossFileConverters {
       asset: null,
       path: file.uri,
       bytes: null,
+      lastModified: DateTime.fromMillisecondsSinceEpoch(file.lastModified, isUtc: true),
+      lastAccessed: null,
     );
   }
 
@@ -85,6 +80,8 @@ class CrossFileConverters {
       asset: null,
       path: file.path,
       bytes: null,
+      lastModified: file.lastModifiedSync().toUtc(),
+      lastAccessed: file.lastAccessedSync().toUtc(),
     );
   }
 
@@ -98,6 +95,8 @@ class CrossFileConverters {
       asset: null,
       path: app.apkFilePath,
       bytes: null,
+      lastModified: null,
+      lastAccessed: null,
     );
   }
 }

diff --git a/app/lib/util/native/file_saver.dart b/app/lib/util/native/file_saver.dart
@@ -21,6 +21,8 @@ Future<void> saveFile({
   required bool isImage,
   required Stream<List<int>> stream,
   required int? androidSdkInt,
+  required DateTime? lastModified,
+  required DateTime? lastAccessed,
   required void Function(int savedBytes) onProgress,
 }) async {
   if (!saveToGallery && androidSdkInt != null && androidSdkInt <= 29) {
@@ -51,7 +53,8 @@ Future<void> saveFile({
     }
   }
 
-  final sink = File(destinationPath).openWrite();
+  final file = File(destinationPath);
+  final sink = file.openWrite();
   await _saveFile(
     destinationPath: destinationPath,
     saveToGallery: saveToGallery,
@@ -60,7 +63,19 @@ Future<void> saveFile({
     onProgress: onProgress,
     write: sink.add,
     writeAsync: null,
-    close: sink.close,
+    close: () async {
+      await sink.close();
+      if (lastModified != null) {
+        try {
+          await file.setLastModified(lastModified);
+        } catch (_) {}
+      }
+      if (lastAccessed != null) {
+        try {
+          await file.setLastAccessed(lastAccessed);
+        } catch (_) {}
+      }
+    },
   );
 }
 

diff --git a/app/test/unit/model/dto/prepare_upload_request_dto_test.dart b/app/test/unit/model/dto/prepare_upload_request_dto_test.dart
@@ -156,6 +156,7 @@ void main() {
             hash: '*hash*',
             preview: '*preview data*',
             legacy: true,
+            metadata: null,
           ),
           'some id 2': FileDto(
             id: 'some id 2',
@@ -165,6 +166,7 @@ void main() {
             hash: '*hash*',
             preview: '*preview data*',
             legacy: true,
+            metadata: null,
           ),
         },
       );
@@ -176,17 +178,18 @@ void main() {
     });
 
     test('should serialize in mime mode', () {
-      const dto = PrepareUploadRequestDto(
+      final dto = PrepareUploadRequestDto(
         info: info,
         files: {
-          'some id': FileDto(
+          'some id': const FileDto(
             id: 'some id',
             fileName: 'another image.jpg',
             size: 1234,
             fileType: FileType.image,
             hash: '*hash*',
             preview: '*preview data*',
             legacy: false,
+            metadata: null,
           ),
           'some id 2': FileDto(
             id: 'some id 2',
@@ -196,6 +199,10 @@ void main() {
             hash: '*hash*',
             preview: '*preview data*',
             legacy: false,
+            metadata: FileMetadata(
+              lastModified: DateTime.utc(2020),
+              lastAccessed: DateTime.utc(2021),
+            ),
           ),
         },
       );
@@ -205,6 +212,10 @@ void main() {
       expect(serialized['files'].length, 2);
       expect(serialized['files']['some id']['fileType'], 'image/jpeg');
       expect(serialized['files']['some id 2']['fileType'], 'application/vnd.android.package-archive');
+      expect(serialized['files']['some id 2']['metadata'], {
+        'modified': '2020-01-01T00:00:00.000Z',
+        'accessed': '2021-01-01T00:00:00.000Z',
+      });
     });
   });