Alez/Babylonia-terminal
1
0
Fork 0
mirror of https://github.com/ALEZ-DEV/Babylonia-terminal.git synced 2025-12-16 17:38:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can now see the download speed

Browse Source
This commit is contained in:
ALEZ-DEV 2024-11-06 19:50:21 +01:00
parent 323ebaaf63
commit f0c9e4707a
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
babylonia_terminal_launcher/lib/models/game.dart
View File

@ -22,20 +22,16 @@ class Game with ChangeNotifier {
Int64 currentProgress = Int64(0); Int64 currentProgress = Int64(0);
Int64 maxProgress = Int64(0); Int64 maxProgress = Int64(0);
Int64 currentSpeed = Int64(0);
Future startInstallation(GameStateProvider gameState, bool isUpdating) async { Future startInstallation(GameStateProvider gameState, bool isUpdating) async {
StartGameInstallation(isUpdating: isUpdating).sendSignalToRust(); StartGameInstallation(isUpdating: isUpdating).sendSignalToRust();
gameInstallationState = GameInstallationState.checkingFile; gameInstallationState = GameInstallationState.checkingFile;
notifyListeners(); notifyListeners();
//final downloadStream = NotifyGameStartDownloading.rustSignalStream;
//await for (final _ in downloadStream) {
// gameInstallationState = GameInstallationState.downloading;
// notifyListeners();
// break;
//}
final downloadProgresStream = GameInstallationProgress.rustSignalStream; final downloadProgresStream = GameInstallationProgress.rustSignalStream;
DateTime waitUntil = DateTime.now().add(const Duration(seconds: 1));
Int64 lastProgress = Int64(0);
await for (final rustSignal in downloadProgresStream) { await for (final rustSignal in downloadProgresStream) {
if (gameInstallationState == GameInstallationState.checkingFile) { if (gameInstallationState == GameInstallationState.checkingFile) {
gameInstallationState = GameInstallationState.downloading; gameInstallationState = GameInstallationState.downloading;
@ -43,7 +39,22 @@ class Game with ChangeNotifier {
currentProgress = rustSignal.message.current; currentProgress = rustSignal.message.current;
maxProgress = rustSignal.message.max; maxProgress = rustSignal.message.max;
print("progress current : $currentProgress / $maxProgress");
if (waitUntil.isBefore(DateTime.now())) {
if (currentSpeed == 0) {
currentSpeed = currentProgress;
lastProgress = currentProgress;
} else {
currentSpeed = currentProgress - lastProgress;
lastProgress = currentProgress;
print('currentProgress -> $currentProgress');
print('lastProgress -> $lastProgress');
print('currentSpeed -> ${currentSpeed.toInt() / 1048576} MiB/s');
}
waitUntil = DateTime.now().add(Duration(seconds: 1));
}
notifyListeners(); notifyListeners();
if (currentProgress >= maxProgress) { if (currentProgress >= maxProgress) {
@ -51,7 +62,6 @@ class Game with ChangeNotifier {
} }
} }
print("patching game...");
gameInstallationState = GameInstallationState.patching; gameInstallationState = GameInstallationState.patching;
notifyListeners(); notifyListeners();

3
babylonia_terminal_launcher/lib/widgets/steps/game_steps_widget.dart
View File

@ -110,6 +110,7 @@ class _DownloadingGame extends StatelessWidget {
//1024^3 = 1073741824 //1024^3 = 1073741824
final currentGb = provider.currentProgress.toInt() / 1073741824; final currentGb = provider.currentProgress.toInt() / 1073741824;
final maxGb = provider.maxProgress.toInt() / 1073741824; final maxGb = provider.maxProgress.toInt() / 1073741824;
final currentSpeed = provider.currentSpeed.toInt() / 1048576;
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 40.0), padding: const EdgeInsets.only(bottom: 40.0),
@ -119,7 +120,7 @@ class _DownloadingGame extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(bottom: 8.0), padding: const EdgeInsets.only(bottom: 8.0),
child: Text( child: Text(
"${currentGb.toStringAsFixed(2)} / ${maxGb.toStringAsFixed(2)} GiB (${pourcent.toStringAsFixed(2)}%)", "${currentGb.toStringAsFixed(2)} / ${maxGb.toStringAsFixed(2)} GiB (${pourcent.toStringAsFixed(2)}%) - ${currentSpeed.toStringAsFixed(2)}MiB/s",
), ),
), ),
YaruLinearProgressIndicator( YaruLinearProgressIndicator(