feat: update unp4k

2026-02-06 15:10:20 +00:00 · 2025-12-04 16:06:49 +08:00
parent e3c3986379
commit e1ed30b6e6
14 changed files with 362 additions and 411 deletions
--- a/lib/common/rust/api/unp4k_api.dart
+++ b/lib/common/rust/api/unp4k_api.dart
@@ -8,20 +8,20 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 import 'package:freezed_annotation/freezed_annotation.dart' hide protected;
 part 'unp4k_api.freezed.dart';

-/// 打开 P4K 文件
-Future<BigInt> p4KOpen({required String p4KPath}) =>
+// These functions are ignored because they are not marked as `pub`: `dos_datetime_to_millis`, `ensure_files_loaded`
+
+/// 打开 P4K 文件（仅打开，不读取文件列表）
+Future<void> p4KOpen({required String p4KPath}) =>
    RustLib.instance.api.crateApiUnp4KApiP4KOpen(p4KPath: p4KPath);

+/// 获取文件数量（会触发文件列表加载）
+Future<BigInt> p4KGetFileCount() =>
+    RustLib.instance.api.crateApiUnp4KApiP4KGetFileCount();
+
 /// 获取所有文件列表
 Future<List<P4kFileItem>> p4KGetAllFiles() =>
    RustLib.instance.api.crateApiUnp4KApiP4KGetAllFiles();

-/// 获取指定目录下的文件列表
-Future<List<P4kFileItem>> p4KGetFilesInDirectory({required String directory}) =>
-    RustLib.instance.api.crateApiUnp4KApiP4KGetFilesInDirectory(
-      directory: directory,
-    );
-
 /// 提取文件到内存
 Future<Uint8List> p4KExtractToMemory({required String filePath}) =>
    RustLib.instance.api.crateApiUnp4KApiP4KExtractToMemory(filePath: filePath);
@@ -46,5 +46,6 @@ sealed class P4kFileItem with _$P4kFileItem {
    required bool isDirectory,
    required BigInt size,
    required BigInt compressedSize,
+    required PlatformInt64 dateModified,
  }) = _P4kFileItem;
 }
--- a/lib/common/rust/api/unp4k_api.freezed.dart
+++ b/lib/common/rust/api/unp4k_api.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$P4kFileItem {

- String get name; bool get isDirectory; BigInt get size; BigInt get compressedSize;
+ String get name; bool get isDirectory; BigInt get size; BigInt get compressedSize; PlatformInt64 get dateModified;
 /// Create a copy of P4kFileItem
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $P4kFileItemCopyWith<P4kFileItem> get copyWith => _$P4kFileItemCopyWithImpl<P4kF

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is P4kFileItem&&(identical(other.name, name) || other.name == name)&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.size, size) || other.size == size)&&(identical(other.compressedSize, compressedSize) || other.compressedSize == compressedSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is P4kFileItem&&(identical(other.name, name) || other.name == name)&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.size, size) || other.size == size)&&(identical(other.compressedSize, compressedSize) || other.compressedSize == compressedSize)&&(identical(other.dateModified, dateModified) || other.dateModified == dateModified));
 }


@override
-int get hashCode => Object.hash(runtimeType,name,isDirectory,size,compressedSize);
+int get hashCode => Object.hash(runtimeType,name,isDirectory,size,compressedSize,dateModified);

@override
 String toString() {
-  return 'P4kFileItem(name: $name, isDirectory: $isDirectory, size: $size, compressedSize: $compressedSize)';
+  return 'P4kFileItem(name: $name, isDirectory: $isDirectory, size: $size, compressedSize: $compressedSize, dateModified: $dateModified)';
 }


@@ -45,7 +45,7 @@ abstract mixin class $P4kFileItemCopyWith<$Res>  {
  factory $P4kFileItemCopyWith(P4kFileItem value, $Res Function(P4kFileItem) _then) = _$P4kFileItemCopyWithImpl;
@useResult
 $Res call({
- String name, bool isDirectory, BigInt size, BigInt compressedSize
+ String name, bool isDirectory, BigInt size, BigInt compressedSize, PlatformInt64 dateModified
 });


@@ -62,13 +62,14 @@ class _$P4kFileItemCopyWithImpl<$Res>

 /// Create a copy of P4kFileItem
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? name = null,Object? isDirectory = null,Object? size = null,Object? compressedSize = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? name = null,Object? isDirectory = null,Object? size = null,Object? compressedSize = null,Object? dateModified = null,}) {
  return _then(_self.copyWith(
 name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String,isDirectory: null == isDirectory ? _self.isDirectory : isDirectory // ignore: cast_nullable_to_non_nullable
 as bool,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
 as BigInt,compressedSize: null == compressedSize ? _self.compressedSize : compressedSize // ignore: cast_nullable_to_non_nullable
-as BigInt,
+as BigInt,dateModified: null == dateModified ? _self.dateModified : dateModified // ignore: cast_nullable_to_non_nullable
+as PlatformInt64,
  ));
 }

@@ -150,10 +151,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize,  PlatformInt64 dateModified)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _P4kFileItem() when $default != null:
-return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);case _:
+return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize,_that.dateModified);case _:
  return orElse();

 }
@@ -171,10 +172,10 @@ return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);ca
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize,  PlatformInt64 dateModified)  $default,) {final _that = this;
 switch (_that) {
 case _P4kFileItem():
-return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);}
+return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize,_that.dateModified);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -188,10 +189,10 @@ return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String name,  bool isDirectory,  BigInt size,  BigInt compressedSize,  PlatformInt64 dateModified)?  $default,) {final _that = this;
 switch (_that) {
 case _P4kFileItem() when $default != null:
-return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);case _:
+return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize,_that.dateModified);case _:
  return null;

 }
@@ -203,13 +204,14 @@ return $default(_that.name,_that.isDirectory,_that.size,_that.compressedSize);ca


 class _P4kFileItem implements P4kFileItem {
-  const _P4kFileItem({required this.name, required this.isDirectory, required this.size, required this.compressedSize});
+  const _P4kFileItem({required this.name, required this.isDirectory, required this.size, required this.compressedSize, required this.dateModified});
  

@override final  String name;
@override final  bool isDirectory;
@override final  BigInt size;
@override final  BigInt compressedSize;
+@override final  PlatformInt64 dateModified;

 /// Create a copy of P4kFileItem
 /// with the given fields replaced by the non-null parameter values.
@@ -221,16 +223,16 @@ _$P4kFileItemCopyWith<_P4kFileItem> get copyWith => __$P4kFileItemCopyWithImpl<_

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _P4kFileItem&&(identical(other.name, name) || other.name == name)&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.size, size) || other.size == size)&&(identical(other.compressedSize, compressedSize) || other.compressedSize == compressedSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _P4kFileItem&&(identical(other.name, name) || other.name == name)&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.size, size) || other.size == size)&&(identical(other.compressedSize, compressedSize) || other.compressedSize == compressedSize)&&(identical(other.dateModified, dateModified) || other.dateModified == dateModified));
 }


@override
-int get hashCode => Object.hash(runtimeType,name,isDirectory,size,compressedSize);
+int get hashCode => Object.hash(runtimeType,name,isDirectory,size,compressedSize,dateModified);

@override
 String toString() {
-  return 'P4kFileItem(name: $name, isDirectory: $isDirectory, size: $size, compressedSize: $compressedSize)';
+  return 'P4kFileItem(name: $name, isDirectory: $isDirectory, size: $size, compressedSize: $compressedSize, dateModified: $dateModified)';
 }


@@ -241,7 +243,7 @@ abstract mixin class _$P4kFileItemCopyWith<$Res> implements $P4kFileItemCopyWith
  factory _$P4kFileItemCopyWith(_P4kFileItem value, $Res Function(_P4kFileItem) _then) = __$P4kFileItemCopyWithImpl;
@override @useResult
 $Res call({
- String name, bool isDirectory, BigInt size, BigInt compressedSize
+ String name, bool isDirectory, BigInt size, BigInt compressedSize, PlatformInt64 dateModified
 });


@@ -258,13 +260,14 @@ class __$P4kFileItemCopyWithImpl<$Res>

 /// Create a copy of P4kFileItem
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? name = null,Object? isDirectory = null,Object? size = null,Object? compressedSize = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? name = null,Object? isDirectory = null,Object? size = null,Object? compressedSize = null,Object? dateModified = null,}) {
  return _then(_P4kFileItem(
 name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String,isDirectory: null == isDirectory ? _self.isDirectory : isDirectory // ignore: cast_nullable_to_non_nullable
 as bool,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
 as BigInt,compressedSize: null == compressedSize ? _self.compressedSize : compressedSize // ignore: cast_nullable_to_non_nullable
-as BigInt,
+as BigInt,dateModified: null == dateModified ? _self.dateModified : dateModified // ignore: cast_nullable_to_non_nullable
+as PlatformInt64,
  ));
 }

--- a/lib/common/rust/frb_generated.dart
+++ b/lib/common/rust/frb_generated.dart
@@ -70,7 +70,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
  String get codegenVersion => '2.11.1';

  @override
-  int get rustContentHash => -737964996;
+  int get rustContentHash => 1801517256;

  static const kDefaultExternalLibraryLoaderConfig =
      ExternalLibraryLoaderConfig(
@@ -133,11 +133,9 @@ abstract class RustLibApi extends BaseApi {

  Future<List<P4kFileItem>> crateApiUnp4KApiP4KGetAllFiles();

-  Future<List<P4kFileItem>> crateApiUnp4KApiP4KGetFilesInDirectory({
-    required String directory,
-  });
+  Future<BigInt> crateApiUnp4KApiP4KGetFileCount();

-  Future<BigInt> crateApiUnp4KApiP4KOpen({required String p4KPath});
+  Future<void> crateApiUnp4KApiP4KOpen({required String p4KPath});

  Future<void> crateApiAsarApiRsiLauncherAsarDataWriteMainJs({
    required RsiLauncherAsarData that,
@@ -582,37 +580,28 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      const TaskConstMeta(debugName: "p4k_get_all_files", argNames: []);

  @override
-  Future<List<P4kFileItem>> crateApiUnp4KApiP4KGetFilesInDirectory({
-    required String directory,
-  }) {
+  Future<BigInt> crateApiUnp4KApiP4KGetFileCount() {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
-          var arg0 = cst_encode_String(directory);
-          return wire.wire__crate__api__unp4k_api__p4k_get_files_in_directory(
-            port_,
-            arg0,
-          );
+          return wire.wire__crate__api__unp4k_api__p4k_get_file_count(port_);
        },
        codec: DcoCodec(
-          decodeSuccessData: dco_decode_list_p_4_k_file_item,
+          decodeSuccessData: dco_decode_usize,
          decodeErrorData: dco_decode_AnyhowException,
        ),
-        constMeta: kCrateApiUnp4KApiP4KGetFilesInDirectoryConstMeta,
-        argValues: [directory],
+        constMeta: kCrateApiUnp4KApiP4KGetFileCountConstMeta,
+        argValues: [],
        apiImpl: this,
      ),
    );
  }

-  TaskConstMeta get kCrateApiUnp4KApiP4KGetFilesInDirectoryConstMeta =>
-      const TaskConstMeta(
-        debugName: "p4k_get_files_in_directory",
-        argNames: ["directory"],
-      );
+  TaskConstMeta get kCrateApiUnp4KApiP4KGetFileCountConstMeta =>
+      const TaskConstMeta(debugName: "p4k_get_file_count", argNames: []);

  @override
-  Future<BigInt> crateApiUnp4KApiP4KOpen({required String p4KPath}) {
+  Future<void> crateApiUnp4KApiP4KOpen({required String p4KPath}) {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
@@ -620,7 +609,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          return wire.wire__crate__api__unp4k_api__p4k_open(port_, arg0);
        },
        codec: DcoCodec(
-          decodeSuccessData: dco_decode_usize,
+          decodeSuccessData: dco_decode_unit,
          decodeErrorData: dco_decode_AnyhowException,
        ),
        constMeta: kCrateApiUnp4KApiP4KOpenConstMeta,
@@ -991,6 +980,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return raw as int;
  }

+  @protected
+  PlatformInt64 dco_decode_i_64(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dcoDecodeI64(raw);
+  }
+
  @protected
  List<String> dco_decode_list_String(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -1073,13 +1068,14 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  P4kFileItem dco_decode_p_4_k_file_item(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    final arr = raw as List<dynamic>;
-    if (arr.length != 4)
-      throw Exception('unexpected arr length: expect 4 but see ${arr.length}');
+    if (arr.length != 5)
+      throw Exception('unexpected arr length: expect 5 but see ${arr.length}');
    return P4kFileItem(
      name: dco_decode_String(arr[0]),
      isDirectory: dco_decode_bool(arr[1]),
      size: dco_decode_u_64(arr[2]),
      compressedSize: dco_decode_u_64(arr[3]),
+      dateModified: dco_decode_i_64(arr[4]),
    );
  }

@@ -1255,6 +1251,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return deserializer.buffer.getInt32();
  }

+  @protected
+  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getPlatformInt64();
+  }
+
  @protected
  List<String> sse_decode_list_String(SseDeserializer deserializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
@@ -1399,11 +1401,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    var var_isDirectory = sse_decode_bool(deserializer);
    var var_size = sse_decode_u_64(deserializer);
    var var_compressedSize = sse_decode_u_64(deserializer);
+    var var_dateModified = sse_decode_i_64(deserializer);
    return P4kFileItem(
      name: var_name,
      isDirectory: var_isDirectory,
      size: var_size,
      compressedSize: var_compressedSize,
+      dateModified: var_dateModified,
    );
  }

@@ -1652,6 +1656,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    serializer.buffer.putInt32(self);
  }

+  @protected
+  void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putPlatformInt64(self);
+  }
+
  @protected
  void sse_encode_list_String(List<String> self, SseSerializer serializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
@@ -1797,6 +1807,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    sse_encode_bool(self.isDirectory, serializer);
    sse_encode_u_64(self.size, serializer);
    sse_encode_u_64(self.compressedSize, serializer);
+    sse_encode_i_64(self.dateModified, serializer);
  }

  @protected
--- a/lib/common/rust/frb_generated.io.dart
+++ b/lib/common/rust/frb_generated.io.dart
@@ -54,6 +54,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  int dco_decode_i_32(dynamic raw);

+  @protected
+  PlatformInt64 dco_decode_i_64(dynamic raw);
+
  @protected
  List<String> dco_decode_list_String(dynamic raw);

@@ -166,6 +169,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  int sse_decode_i_32(SseDeserializer deserializer);

+  @protected
+  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer);
+
  @protected
  List<String> sse_decode_list_String(SseDeserializer deserializer);

@@ -318,6 +324,12 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    return wire.cst_new_box_autoadd_u_64(cst_encode_u_64(raw));
  }

+  @protected
+  int cst_encode_i_64(PlatformInt64 raw) {
+    // Codec=Cst (C-struct based), see doc to use other codecs
+    return raw.toInt();
+  }
+
  @protected
  ffi.Pointer<wire_cst_list_String> cst_encode_list_String(List<String> raw) {
    // Codec=Cst (C-struct based), see doc to use other codecs
@@ -446,6 +458,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    wireObj.is_directory = cst_encode_bool(apiObj.isDirectory);
    wireObj.size = cst_encode_u_64(apiObj.size);
    wireObj.compressed_size = cst_encode_u_64(apiObj.compressedSize);
+    wireObj.date_modified = cst_encode_i_64(apiObj.dateModified);
  }

  @protected
@@ -571,6 +584,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  void sse_encode_i_32(int self, SseSerializer serializer);

+  @protected
+  void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer);
+
  @protected
  void sse_encode_list_String(List<String> self, SseSerializer serializer);

@@ -1064,32 +1080,17 @@ class RustLibWire implements BaseWire {
      _wire__crate__api__unp4k_api__p4k_get_all_filesPtr
          .asFunction<void Function(int)>();

-  void wire__crate__api__unp4k_api__p4k_get_files_in_directory(
-    int port_,
-    ffi.Pointer<wire_cst_list_prim_u_8_strict> directory,
-  ) {
-    return _wire__crate__api__unp4k_api__p4k_get_files_in_directory(
-      port_,
-      directory,
-    );
+  void wire__crate__api__unp4k_api__p4k_get_file_count(int port_) {
+    return _wire__crate__api__unp4k_api__p4k_get_file_count(port_);
  }

-  late final _wire__crate__api__unp4k_api__p4k_get_files_in_directoryPtr =
-      _lookup<
-        ffi.NativeFunction<
-          ffi.Void Function(
-            ffi.Int64,
-            ffi.Pointer<wire_cst_list_prim_u_8_strict>,
-          )
-        >
-      >(
-        'frbgen_starcitizen_doctor_wire__crate__api__unp4k_api__p4k_get_files_in_directory',
+  late final _wire__crate__api__unp4k_api__p4k_get_file_countPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
+        'frbgen_starcitizen_doctor_wire__crate__api__unp4k_api__p4k_get_file_count',
      );
-  late final _wire__crate__api__unp4k_api__p4k_get_files_in_directory =
-      _wire__crate__api__unp4k_api__p4k_get_files_in_directoryPtr
-          .asFunction<
-            void Function(int, ffi.Pointer<wire_cst_list_prim_u_8_strict>)
-          >();
+  late final _wire__crate__api__unp4k_api__p4k_get_file_count =
+      _wire__crate__api__unp4k_api__p4k_get_file_countPtr
+          .asFunction<void Function(int)>();

  void wire__crate__api__unp4k_api__p4k_open(
    int port_,
@@ -1592,6 +1593,9 @@ final class wire_cst_p_4_k_file_item extends ffi.Struct {

  @ffi.Uint64()
  external int compressed_size;
+
+  @ffi.Int64()
+  external int date_modified;
 }

 final class wire_cst_list_p_4_k_file_item extends ffi.Struct {