squid/minecraft-server-installer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

MCSI-1 refactor: rename vanila -> vanilla

Browse Source
This commit is contained in:
SquidSpirit 2025-06-29 18:31:41 +08:00
parent b1aa09bf57
commit 6e85c7ff06
20 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/main/framework/ui/basic_configuration_tab.dart
View File

@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:gap/gap.dart';
import 'package:minecraft_server_installer/main/framework/ui/strings.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart';
import 'package:minecraft_server_installer/vanila/framework/ui/game_version_dropdown.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart';
import 'package:minecraft_server_installer/vanilla/framework/ui/game_version_dropdown.dart';
class BasicConfigurationTab extends StatefulWidget {
const BasicConfigurationTab({super.key});
@ -23,7 +23,7 @@ class _BasicConfigurationTabState extends State<BasicConfigurationTab> {
children: [
const GameVersionDropdown(),
const Spacer(),
BlocConsumer<VanilaBloc, VanilaState>(
BlocConsumer<VanillaBloc, VanillaState>(
listener: (_, __) {},
builder:
(context, state) => Row(
@ -50,6 +50,6 @@ class _BasicConfigurationTabState extends State<BasicConfigurationTab> {
}
void _downloadServerFile() {
context.read<VanilaBloc>().add(VanilaServerFileDownloadedEvent());
context.read<VanillaBloc>().add(VanillaServerFileDownloadedEvent());
}
}

28
lib/main/framework/ui/minecraft_server_installer.dart
View File

@ -1,13 +1,13 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/framework/ui/basic_configuration_tab.dart';
import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_repository_impl.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/get_game_version_list_use_case.dart';
import 'package:minecraft_server_installer/vanila/framework/api/vanila_api_service_impl.dart';
import 'package:minecraft_server_installer/vanila/framework/storage/vanila_file_storage_impl.dart';
import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_repository_impl.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/get_game_version_list_use_case.dart';
import 'package:minecraft_server_installer/vanilla/framework/api/vanilla_api_service_impl.dart';
import 'package:minecraft_server_installer/vanilla/framework/storage/vanilla_file_storage_impl.dart';
class MinecraftServerInstaller extends StatelessWidget {
const MinecraftServerInstaller({super.key});
@ -17,9 +17,9 @@ class MinecraftServerInstaller extends StatelessWidget {
@override
Widget build(BuildContext context) {
final gameVersionApiService = VanilaApiServiceImpl();
final gameVersionFileStorage = VanilaFileStorageImpl();
final gameVersionRepository = VanilaRepositoryImpl(gameVersionApiService, gameVersionFileStorage);
final gameVersionApiService = VanillaApiServiceImpl();
final gameVersionFileStorage = VanillaFileStorageImpl();
final gameVersionRepository = VanillaRepositoryImpl(gameVersionApiService, gameVersionFileStorage);
final getGameVersionListUseCase = GetGameVersionListUseCase(gameVersionRepository);
final downloadServerFileUseCase = DownloadServerFileUseCase(gameVersionRepository);
@ -28,15 +28,15 @@ class MinecraftServerInstaller extends StatelessWidget {
theme: ThemeData.light().copyWith(colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue.shade900)),
home: MultiBlocProvider(
providers: [
BlocProvider<VanilaBloc>(
BlocProvider<VanillaBloc>(
create:
(context) =>
VanilaBloc(getGameVersionListUseCase, downloadServerFileUseCase)
..add(VanilaGameVersionListLoadedEvent()),
VanillaBloc(getGameVersionListUseCase, downloadServerFileUseCase)
..add(VanillaGameVersionListLoadedEvent()),
),
],
child: Scaffold(
body: BlocConsumer<VanilaBloc, VanilaState>(
body: BlocConsumer<VanillaBloc, VanillaState>(
listener: (_, __) {},
builder: (_, state) {
if (state.isLocked) {

10
lib/vanila/adapter/gateway/vanila_api_service.dart
View File

@ -1,10 +0,0 @@
import 'dart:typed_data';
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
abstract interface class VanilaApiService {
Future<List<GameVersion>> fetchGameVersionList();
Future<Uint8List> fetchServerFile(Uri url, {DownloadProgressCallback? onProgressChanged});
}

25
lib/vanila/adapter/gateway/vanila_repository_impl.dart
View File

@ -1,25 +0,0 @@
import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart';
import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart';
import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
class VanilaRepositoryImpl implements VanilaRepository {
final VanilaApiService _gameVersionApiService;
final VanilaFileStorage _gameVersionFileStorage;
VanilaRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage);
@override
Future<List<GameVersion>> getGameVersionList() => _gameVersionApiService.fetchGameVersionList();
@override
Future<void> downloadServerFile(
GameVersion version,
String savePath, {
DownloadProgressCallback? onProgressChanged,
}) async {
final fileBytes = await _gameVersionApiService.fetchServerFile(version.url, onProgressChanged: onProgressChanged);
await _gameVersionFileStorage.saveFile(fileBytes, savePath);
}
}

74
lib/vanila/adapter/presentation/vanila_bloc.dart
View File

@ -1,74 +0,0 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/constants.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/get_game_version_list_use_case.dart';
import 'package:path/path.dart' as path;
class VanilaBloc extends Bloc<VanilaEvent, VanilaState> {
final GetGameVersionListUseCase _getGameVersionListUseCase;
final DownloadServerFileUseCase _downloadServerFileUseCase;
VanilaBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanilaState.empty()) {
on<VanilaGameVersionListLoadedEvent>((_, emit) async {
try {
final gameVersions = await _getGameVersionListUseCase();
emit(
const VanilaState.empty().copyWith(
gameVersions: gameVersions.map((entity) => GameVersionViewModel.from(entity)).toList(),
),
);
} on Exception {
emit(const VanilaState.empty());
}
});
on<VanilaGameVersionSelectedEvent>((event, emit) {
emit(state.copyWith(selectedGameVersion: event.gameVersion));
});
on<VanilaServerFileDownloadedEvent>((_, emit) async {
final gameVersion = state.selectedGameVersion;
if (gameVersion == null) {
return;
}
emit(state.copyWith(isLocked: true));
await _downloadServerFileUseCase(
gameVersion.toEntity(),
path.join('.', Constants.serverFileName),
onProgressChanged: (progress) => add(_VanilaDownloadProgressChangedEvent(progress)),
);
emit(state.copyWith(isLocked: false));
});
on<_VanilaDownloadProgressChangedEvent>((event, emit) {
if (event.progress < 0) {
emit(state.copyWith(downloadProgress: 0));
} else if (event.progress > 1) {
emit(state.copyWith(downloadProgress: 1));
} else {
emit(state.copyWith(downloadProgress: event.progress));
}
});
}
}
sealed class VanilaEvent {}
class VanilaGameVersionListLoadedEvent extends VanilaEvent {}
class VanilaGameVersionSelectedEvent extends VanilaEvent {
final GameVersionViewModel gameVersion;
VanilaGameVersionSelectedEvent(this.gameVersion);
}
class VanilaServerFileDownloadedEvent extends VanilaEvent {}
class _VanilaDownloadProgressChangedEvent extends VanilaEvent {
final double progress;
_VanilaDownloadProgressChangedEvent(this.progress);
}

8
lib/vanila/application/repository/vanila_repository.dart
View File

@ -1,8 +0,0 @@
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
abstract interface class VanilaRepository {
Future<List<GameVersion>> getGameVersionList();
Future<void> downloadServerFile(GameVersion version, String savePath, {DownloadProgressCallback? onProgressChanged});
}

10
lib/vanila/application/use_case/get_game_version_list_use_case.dart
View File

@ -1,10 +0,0 @@
import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
class GetGameVersionListUseCase {
final VanilaRepository _gameVersionRepository;
GetGameVersionListUseCase(this._gameVersionRepository);
Future<List<GameVersion>> call() => _gameVersionRepository.getGameVersionList();
}

10
lib/vanilla/adapter/gateway/vanilla_api_service.dart Normal file
View File

@ -0,0 +1,10 @@
import 'dart:typed_data';
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
abstract interface class VanillaApiService {
Future<List<GameVersion>> fetchGameVersionList();
Future<Uint8List> fetchServerFile(Uri url, {DownloadProgressCallback? onProgressChanged});
}

2
lib/vanila/adapter/gateway/vanila_file_storage.dart → lib/vanilla/adapter/gateway/vanilla_file_storage.dart
View File

@ -1,5 +1,5 @@
import 'dart:typed_data';
abstract interface class VanilaFileStorage {
abstract interface class VanillaFileStorage {
Future<void> saveFile(Uint8List fileBytes, String savePath);
}

25
lib/vanilla/adapter/gateway/vanilla_repository_impl.dart Normal file
View File

@ -0,0 +1,25 @@
import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_api_service.dart';
import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_file_storage.dart';
import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
class VanillaRepositoryImpl implements VanillaRepository {
final VanillaApiService _gameVersionApiService;
final VanillaFileStorage _gameVersionFileStorage;
VanillaRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage);
@override
Future<List<GameVersion>> getGameVersionList() => _gameVersionApiService.fetchGameVersionList();
@override
Future<void> downloadServerFile(
GameVersion version,
String savePath, {
DownloadProgressCallback? onProgressChanged,
}) async {
final fileBytes = await _gameVersionApiService.fetchServerFile(version.url, onProgressChanged: onProgressChanged);
await _gameVersionFileStorage.saveFile(fileBytes, savePath);
}
}

2
lib/vanila/adapter/presentation/game_version_view_model.dart → lib/vanilla/adapter/presentation/game_version_view_model.dart
View File

@ -1,5 +1,5 @@
import 'package:equatable/equatable.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
class GameVersionViewModel with EquatableMixin {
final String name;

74
lib/vanilla/adapter/presentation/vanilla_bloc.dart Normal file
View File

@ -0,0 +1,74 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/constants.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/get_game_version_list_use_case.dart';
import 'package:path/path.dart' as path;
class VanillaBloc extends Bloc<VanillaEvent, VanillaState> {
final GetGameVersionListUseCase _getGameVersionListUseCase;
final DownloadServerFileUseCase _downloadServerFileUseCase;
VanillaBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanillaState.empty()) {
on<VanillaGameVersionListLoadedEvent>((_, emit) async {
try {
final gameVersions = await _getGameVersionListUseCase();
emit(
const VanillaState.empty().copyWith(
gameVersions: gameVersions.map((entity) => GameVersionViewModel.from(entity)).toList(),
),
);
} on Exception {
emit(const VanillaState.empty());
}
});
on<VanillaGameVersionSelectedEvent>((event, emit) {
emit(state.copyWith(selectedGameVersion: event.gameVersion));
});
on<VanillaServerFileDownloadedEvent>((_, emit) async {
final gameVersion = state.selectedGameVersion;
if (gameVersion == null) {
return;
}
emit(state.copyWith(isLocked: true));
await _downloadServerFileUseCase(
gameVersion.toEntity(),
path.join('.', Constants.serverFileName),
onProgressChanged: (progress) => add(_VanillaDownloadProgressChangedEvent(progress)),
);
emit(state.copyWith(isLocked: false));
});
on<_VanillaDownloadProgressChangedEvent>((event, emit) {
if (event.progress < 0) {
emit(state.copyWith(downloadProgress: 0));
} else if (event.progress > 1) {
emit(state.copyWith(downloadProgress: 1));
} else {
emit(state.copyWith(downloadProgress: event.progress));
}
});
}
}
sealed class VanillaEvent {}
class VanillaGameVersionListLoadedEvent extends VanillaEvent {}
class VanillaGameVersionSelectedEvent extends VanillaEvent {
final GameVersionViewModel gameVersion;
VanillaGameVersionSelectedEvent(this.gameVersion);
}
class VanillaServerFileDownloadedEvent extends VanillaEvent {}
class _VanillaDownloadProgressChangedEvent extends VanillaEvent {
final double progress;
_VanillaDownloadProgressChangedEvent(this.progress);
}

12
lib/vanila/adapter/presentation/vanila_state.dart → lib/vanilla/adapter/presentation/vanilla_state.dart
View File

@ -1,20 +1,20 @@
import 'package:equatable/equatable.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart';
class VanilaState with EquatableMixin {
class VanillaState with EquatableMixin {
final bool isLocked;
final double downloadProgress;
final List<GameVersionViewModel> gameVersions;
final GameVersionViewModel? selectedGameVersion;
const VanilaState({
const VanillaState({
required this.isLocked,
required this.downloadProgress,
required this.gameVersions,
required this.selectedGameVersion,
});
const VanilaState.empty()
const VanillaState.empty()
: this(isLocked: false, downloadProgress: 0, gameVersions: const [], selectedGameVersion: null);
@override
@ -24,12 +24,12 @@ class VanilaState with EquatableMixin {
bool get isDownloading => downloadProgress > 0 && downloadProgress < 1;
VanilaState copyWith({
VanillaState copyWith({
bool? isLocked,
double? downloadProgress,
List<GameVersionViewModel>? gameVersions,
GameVersionViewModel? selectedGameVersion,
}) => VanilaState(
}) => VanillaState(
isLocked: isLocked ?? this.isLocked,
downloadProgress: downloadProgress ?? this.downloadProgress,
gameVersions: gameVersions ?? this.gameVersions,

8
lib/vanilla/application/repository/vanilla_repository.dart Normal file
View File

@ -0,0 +1,8 @@
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
abstract interface class VanillaRepository {
Future<List<GameVersion>> getGameVersionList();
Future<void> downloadServerFile(GameVersion version, String savePath, {DownloadProgressCallback? onProgressChanged});
}

6
lib/vanila/application/use_case/download_server_file_use_case.dart → lib/vanilla/application/use_case/download_server_file_use_case.dart
View File

@ -1,10 +1,10 @@
import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
typedef DownloadProgressCallback = void Function(double progress);
class DownloadServerFileUseCase {
final VanilaRepository _gameVersionRepository;
final VanillaRepository _gameVersionRepository;
DownloadServerFileUseCase(this._gameVersionRepository);

10
lib/vanilla/application/use_case/get_game_version_list_use_case.dart Normal file
View File

@ -0,0 +1,10 @@
import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
class GetGameVersionListUseCase {
final VanillaRepository _gameVersionRepository;
GetGameVersionListUseCase(this._gameVersionRepository);
Future<List<GameVersion>> call() => _gameVersionRepository.getGameVersionList();
}

0
lib/vanila/domain/entity/game_version.dart → lib/vanilla/domain/entity/game_version.dart
View File

8
lib/vanila/framework/api/vanila_api_service_impl.dart → lib/vanilla/framework/api/vanilla_api_service_impl.dart
View File

@ -3,11 +3,11 @@ import 'dart:typed_data';
import 'package:http/http.dart' as http;
import 'package:minecraft_server_installer/main/constants.dart';
import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart';
import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_api_service.dart';
import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart';
import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart';
class VanilaApiServiceImpl implements VanilaApiService {
class VanillaApiServiceImpl implements VanillaApiService {
@override
Future<List<GameVersion>> fetchGameVersionList() async {
final sourceUrl = Uri.parse(Constants.gameVersionListUrl);

4
lib/vanila/framework/storage/vanila_file_storage_impl.dart → lib/vanilla/framework/storage/vanilla_file_storage_impl.dart
View File

@ -1,9 +1,9 @@
import 'dart:io';
import 'dart:typed_data';
import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart';
import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_file_storage.dart';
class VanilaFileStorageImpl implements VanilaFileStorage {
class VanillaFileStorageImpl implements VanillaFileStorage {
@override
Future<void> saveFile(Uint8List fileBytes, String savePath) async {
final file = File(savePath);

10
lib/vanila/framework/ui/game_version_dropdown.dart → lib/vanilla/framework/ui/game_version_dropdown.dart
View File

@ -1,15 +1,15 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/framework/ui/strings.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart';
class GameVersionDropdown extends StatelessWidget {
const GameVersionDropdown({super.key});
@override
Widget build(BuildContext context) => BlocConsumer<VanilaBloc, VanilaState>(
Widget build(BuildContext context) => BlocConsumer<VanillaBloc, VanillaState>(
listener: (_, __) {},
builder:
(_, state) => DropdownMenu(
@ -20,7 +20,7 @@ class GameVersionDropdown extends StatelessWidget {
label: const Text('${Strings.fieldGameVersion} *'),
onSelected: (value) {
if (value != null) {
context.read<VanilaBloc>().add(VanilaGameVersionSelectedEvent(value));
context.read<VanillaBloc>().add(VanillaGameVersionSelectedEvent(value));
}
},
dropdownMenuEntries: