mirror of
https://mirror.ghproxy.com/https://github.com/StarCitizenToolBox/app.git
synced 2024-12-23 01:53:41 +08:00
feat: Unp4kcState errorMessage
This commit is contained in:
parent
8d2b4983c0
commit
3e5a258cf8
@ -8,7 +8,7 @@ import 'package:starcitizen_doctor/common/utils/log.dart';
|
||||
class BinaryModuleConf {
|
||||
static const _modules = {
|
||||
"aria2c": "0",
|
||||
"unp4kc": "0",
|
||||
"unp4kc": "1",
|
||||
};
|
||||
|
||||
static Future extractModule(List<String> modules, String workingDir) async {
|
||||
|
||||
@ -29,6 +29,7 @@ class Unp4kcState with _$Unp4kcState {
|
||||
required String curPath,
|
||||
String? endMessage,
|
||||
MapEntry<String, String>? tempOpenFile,
|
||||
@Default("") String errorMessage,
|
||||
}) = _Unp4kcState;
|
||||
}
|
||||
|
||||
@ -72,6 +73,12 @@ class Unp4kCModel extends _$Unp4kCModel {
|
||||
break;
|
||||
case RsProcessStreamDataType.error:
|
||||
dPrint("[unp4kc] stderr: ${event.data}");
|
||||
if (state.errorMessage.isEmpty) {
|
||||
state = state.copyWith(errorMessage: event.data);
|
||||
} else {
|
||||
state = state.copyWith(
|
||||
errorMessage: "${state.errorMessage}\n${event.data}");
|
||||
}
|
||||
break;
|
||||
case RsProcessStreamDataType.exit:
|
||||
dPrint("[unp4kc] exit: ${event.data}");
|
||||
|
||||
@ -24,6 +24,7 @@ mixin _$Unp4kcState {
|
||||
String? get endMessage => throw _privateConstructorUsedError;
|
||||
MapEntry<String, String>? get tempOpenFile =>
|
||||
throw _privateConstructorUsedError;
|
||||
String get errorMessage => throw _privateConstructorUsedError;
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
$Unp4kcStateCopyWith<Unp4kcState> get copyWith =>
|
||||
@ -42,7 +43,8 @@ abstract class $Unp4kcStateCopyWith<$Res> {
|
||||
MemoryFileSystem? fs,
|
||||
String curPath,
|
||||
String? endMessage,
|
||||
MapEntry<String, String>? tempOpenFile});
|
||||
MapEntry<String, String>? tempOpenFile,
|
||||
String errorMessage});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@ -64,6 +66,7 @@ class _$Unp4kcStateCopyWithImpl<$Res, $Val extends Unp4kcState>
|
||||
Object? curPath = null,
|
||||
Object? endMessage = freezed,
|
||||
Object? tempOpenFile = freezed,
|
||||
Object? errorMessage = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
startUp: null == startUp
|
||||
@ -90,6 +93,10 @@ class _$Unp4kcStateCopyWithImpl<$Res, $Val extends Unp4kcState>
|
||||
? _value.tempOpenFile
|
||||
: tempOpenFile // ignore: cast_nullable_to_non_nullable
|
||||
as MapEntry<String, String>?,
|
||||
errorMessage: null == errorMessage
|
||||
? _value.errorMessage
|
||||
: errorMessage // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
@ -108,7 +115,8 @@ abstract class _$$Unp4kcStateImplCopyWith<$Res>
|
||||
MemoryFileSystem? fs,
|
||||
String curPath,
|
||||
String? endMessage,
|
||||
MapEntry<String, String>? tempOpenFile});
|
||||
MapEntry<String, String>? tempOpenFile,
|
||||
String errorMessage});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@ -128,6 +136,7 @@ class __$$Unp4kcStateImplCopyWithImpl<$Res>
|
||||
Object? curPath = null,
|
||||
Object? endMessage = freezed,
|
||||
Object? tempOpenFile = freezed,
|
||||
Object? errorMessage = null,
|
||||
}) {
|
||||
return _then(_$Unp4kcStateImpl(
|
||||
startUp: null == startUp
|
||||
@ -154,6 +163,10 @@ class __$$Unp4kcStateImplCopyWithImpl<$Res>
|
||||
? _value.tempOpenFile
|
||||
: tempOpenFile // ignore: cast_nullable_to_non_nullable
|
||||
as MapEntry<String, String>?,
|
||||
errorMessage: null == errorMessage
|
||||
? _value.errorMessage
|
||||
: errorMessage // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
));
|
||||
}
|
||||
}
|
||||
@ -167,7 +180,8 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState {
|
||||
this.fs,
|
||||
required this.curPath,
|
||||
this.endMessage,
|
||||
this.tempOpenFile})
|
||||
this.tempOpenFile,
|
||||
this.errorMessage = ""})
|
||||
: _files = files;
|
||||
|
||||
@override
|
||||
@ -190,10 +204,13 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState {
|
||||
final String? endMessage;
|
||||
@override
|
||||
final MapEntry<String, String>? tempOpenFile;
|
||||
@override
|
||||
@JsonKey()
|
||||
final String errorMessage;
|
||||
|
||||
@override
|
||||
String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
|
||||
return 'Unp4kcState(startUp: $startUp, files: $files, fs: $fs, curPath: $curPath, endMessage: $endMessage, tempOpenFile: $tempOpenFile)';
|
||||
return 'Unp4kcState(startUp: $startUp, files: $files, fs: $fs, curPath: $curPath, endMessage: $endMessage, tempOpenFile: $tempOpenFile, errorMessage: $errorMessage)';
|
||||
}
|
||||
|
||||
@override
|
||||
@ -206,7 +223,8 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState {
|
||||
..add(DiagnosticsProperty('fs', fs))
|
||||
..add(DiagnosticsProperty('curPath', curPath))
|
||||
..add(DiagnosticsProperty('endMessage', endMessage))
|
||||
..add(DiagnosticsProperty('tempOpenFile', tempOpenFile));
|
||||
..add(DiagnosticsProperty('tempOpenFile', tempOpenFile))
|
||||
..add(DiagnosticsProperty('errorMessage', errorMessage));
|
||||
}
|
||||
|
||||
@override
|
||||
@ -221,7 +239,9 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState {
|
||||
(identical(other.endMessage, endMessage) ||
|
||||
other.endMessage == endMessage) &&
|
||||
(identical(other.tempOpenFile, tempOpenFile) ||
|
||||
other.tempOpenFile == tempOpenFile));
|
||||
other.tempOpenFile == tempOpenFile) &&
|
||||
(identical(other.errorMessage, errorMessage) ||
|
||||
other.errorMessage == errorMessage));
|
||||
}
|
||||
|
||||
@override
|
||||
@ -232,7 +252,8 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState {
|
||||
fs,
|
||||
curPath,
|
||||
endMessage,
|
||||
tempOpenFile);
|
||||
tempOpenFile,
|
||||
errorMessage);
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@ -248,7 +269,8 @@ abstract class _Unp4kcState implements Unp4kcState {
|
||||
final MemoryFileSystem? fs,
|
||||
required final String curPath,
|
||||
final String? endMessage,
|
||||
final MapEntry<String, String>? tempOpenFile}) = _$Unp4kcStateImpl;
|
||||
final MapEntry<String, String>? tempOpenFile,
|
||||
final String errorMessage}) = _$Unp4kcStateImpl;
|
||||
|
||||
@override
|
||||
bool get startUp;
|
||||
@ -263,6 +285,8 @@ abstract class _Unp4kcState implements Unp4kcState {
|
||||
@override
|
||||
MapEntry<String, String>? get tempOpenFile;
|
||||
@override
|
||||
String get errorMessage;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$Unp4kcStateImplCopyWith<_$Unp4kcStateImpl> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
|
||||
@ -6,7 +6,7 @@ part of 'unp4kc.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$unp4kCModelHash() => r'be71e2f9c2060df5ed8f1b64cce993058320bac4';
|
||||
String _$unp4kCModelHash() => r'24f5043f687a5f652a0741b8e6f4a3855fca0101';
|
||||
|
||||
/// See also [Unp4kCModel].
|
||||
@ProviderFor(Unp4kCModel)
|
||||
|
||||
@ -7,7 +7,7 @@ part of 'advanced_localization_ui_model.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$advancedLocalizationUIModelHash() =>
|
||||
r'acf91fc467108c3669d8ddd6fed3c24434be4ae8';
|
||||
r'9fbbeca3af90f992717710633bcf2cd0e1cb06eb';
|
||||
|
||||
/// See also [AdvancedLocalizationUIModel].
|
||||
@ProviderFor(AdvancedLocalizationUIModel)
|
||||
|
||||
@ -6,7 +6,7 @@ part of 'tools_ui_model.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$toolsUIModelHash() => r'4c27a3df07cb000ac58b74b3da48d926d0b01ea8';
|
||||
String _$toolsUIModelHash() => r'bef6b6cf35ae13d7100fa8db85b7f6c04f244b27';
|
||||
|
||||
/// See also [ToolsUIModel].
|
||||
@ProviderFor(ToolsUIModel)
|
||||
|
||||
@ -6,6 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:re_editor/re_editor.dart';
|
||||
import 'package:starcitizen_doctor/common/helper/system_helper.dart';
|
||||
import 'package:starcitizen_doctor/data/app_unp4k_p4k_item_data.dart';
|
||||
import 'package:starcitizen_doctor/provider/unp4kc.dart';
|
||||
import 'package:starcitizen_doctor/widgets/widgets.dart';
|
||||
import 'package:super_sliver_list/super_sliver_list.dart';
|
||||
@ -22,7 +23,20 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
return makeDefaultPage(context,
|
||||
title: S.current.tools_unp4k_title(model.getGamePath()),
|
||||
useBodyContainer: false,
|
||||
content: state.files == null
|
||||
content: makeBody(context, state, model, files, paths));
|
||||
}
|
||||
|
||||
Widget makeBody(BuildContext context, Unp4kcState state, Unp4kCModel model,
|
||||
List<AppUnp4kP4kItemData>? files, List<String> paths) {
|
||||
if (state.errorMessage.isNotEmpty) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Center(
|
||||
child: Text(state.errorMessage),
|
||||
),
|
||||
);
|
||||
}
|
||||
return state.files == null
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@ -42,8 +56,7 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color:
|
||||
FluentTheme.of(context).cardColor.withOpacity(.06)),
|
||||
color: FluentTheme.of(context).cardColor.withOpacity(.06)),
|
||||
height: 36,
|
||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
||||
child: SuperListView.builder(
|
||||
@ -79,17 +92,15 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * .3,
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context)
|
||||
.cardColor
|
||||
.withOpacity(.01),
|
||||
color: FluentTheme.of(context).cardColor.withOpacity(.01),
|
||||
),
|
||||
child: SuperListView.builder(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 6, bottom: 6, left: 3, right: 12),
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
final item = files![index];
|
||||
final fileName = item.name
|
||||
?.replaceAll(state.curPath.trim(), "") ??
|
||||
final fileName =
|
||||
item.name?.replaceAll(state.curPath.trim(), "") ??
|
||||
"?";
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(top: 4, bottom: 4),
|
||||
@ -107,15 +118,13 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
}
|
||||
},
|
||||
icon: Padding(
|
||||
padding:
|
||||
const EdgeInsets.only(left: 4, right: 4),
|
||||
padding: const EdgeInsets.only(left: 4, right: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
if (item.isDirectory ?? false)
|
||||
const Icon(
|
||||
FluentIcons.folder_fill,
|
||||
color:
|
||||
Color.fromRGBO(255, 224, 138, 1),
|
||||
color: Color.fromRGBO(255, 224, 138, 1),
|
||||
)
|
||||
else if (fileName.endsWith(".xml"))
|
||||
const Icon(
|
||||
@ -143,8 +152,7 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
if (!(item.isDirectory ??
|
||||
true)) ...[
|
||||
if (!(item.isDirectory ?? true)) ...[
|
||||
const SizedBox(height: 1),
|
||||
Row(
|
||||
children: [
|
||||
@ -188,8 +196,7 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
child: Container(
|
||||
child: state.tempOpenFile == null
|
||||
? Center(
|
||||
child:
|
||||
Text(S.current.tools_unp4k_view_file),
|
||||
child: Text(S.current.tools_unp4k_view_file),
|
||||
)
|
||||
: state.tempOpenFile?.key == "loading"
|
||||
? makeLoading(context)
|
||||
@ -200,8 +207,7 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
if (state.tempOpenFile?.key == "text")
|
||||
Expanded(
|
||||
child: _TextTempWidget(
|
||||
state.tempOpenFile?.value ??
|
||||
""))
|
||||
state.tempOpenFile?.value ?? ""))
|
||||
else
|
||||
Expanded(
|
||||
child: Center(
|
||||
@ -217,14 +223,13 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
FilledButton(
|
||||
child: Padding(
|
||||
padding:
|
||||
const EdgeInsets
|
||||
.all(4),
|
||||
const EdgeInsets.all(4),
|
||||
child: Text(S.current
|
||||
.action_open_folder),
|
||||
),
|
||||
onPressed: () {
|
||||
SystemHelper.openDir(
|
||||
state.tempOpenFile
|
||||
SystemHelper.openDir(state
|
||||
.tempOpenFile
|
||||
?.value ??
|
||||
"");
|
||||
})
|
||||
@ -247,7 +252,7 @@ class UnP4kcUI extends HookConsumerWidget {
|
||||
),
|
||||
),
|
||||
],
|
||||
));
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user