Merge pull request #1435 from julien4215/add-broadcast-result

Add new broadcast game results

Author: veloce

lib/src/model/broadcast/broadcast.dart

@@ -7,7 +7,54 @@ part 'broadcast.freezed.dart';
 
 typedef BroadcastList = ({IList<Broadcast> active, IList<Broadcast> past, int? nextPage});
 
-enum BroadcastResult { whiteWins, blackWins, draw, ongoing, noResultPgnTag }
+enum BroadcastResult {
+  whiteWins,
+  blackWins,
+  draw,
+  canceled,
+  whiteHalfWins,
+  blackHalfWins,
+  ongoing,
+  noResultPgnTag;
+
+  static BroadcastResult resultFromString(String? result) {
+    return (result == null)
+        ? BroadcastResult.noResultPgnTag
+        : switch (result) {
+          '½-½' => BroadcastResult.draw,
+          '1-0' => BroadcastResult.whiteWins,
+          '0-1' => BroadcastResult.blackWins,
+          '0-0' => BroadcastResult.canceled,
+          '½-0' => BroadcastResult.whiteHalfWins,
+          '0-½' => BroadcastResult.blackHalfWins,
+          '*' => BroadcastResult.ongoing,
+          _ => throw FormatException("value $result can't be interpreted as a broadcast result"),
+        };
+  }
+
+  String resultToString(Side side) {
+    return switch (this) {
+      whiteWins => side == Side.white ? '1' : '0',
+      blackWins => side == Side.white ? '0' : '1',
+      draw => '½',
+      canceled => '0',
+      whiteHalfWins => side == Side.white ? '½' : '0',
+      blackHalfWins => side == Side.white ? '0' : '½',
+      _ => throw FormatException('result $this is not a game that is over'),
+    };
+  }
+
+  bool get isOngoing => switch (this) {
+    ongoing => true,
+    _ => false,
+  };
+
+  bool get isOver => switch (this) {
+    ongoing => false,
+    noResultPgnTag => false,
+    _ => true,
+  };
+}
 
 @freezed
 class Broadcast with _$Broadcast {
@@ -100,11 +147,8 @@ class BroadcastGame with _$BroadcastGame {
     int? mate,
   }) = _BroadcastGame;
 
-  bool get isOngoing => status == BroadcastResult.ongoing;
-  bool get isOver =>
-      status == BroadcastResult.draw ||
-      status == BroadcastResult.whiteWins ||
-      status == BroadcastResult.blackWins;
+  bool get isOngoing => status.isOngoing;
+  bool get isOver => status.isOver;
   Side get sideToMove => Setup.parseFen(fen).turn;
 }
 

lib/src/model/broadcast/broadcast_repository.dart

@@ -149,19 +149,7 @@ BroadcastRoundGames _gamesFromPick(RequiredPick pick) =>
 MapEntry<BroadcastGameId, BroadcastGame> gameFromPick(RequiredPick pick) {
   final stringStatus = pick('status').asStringOrNull();
 
-  final status =
-      (stringStatus == null)
-          ? BroadcastResult.noResultPgnTag
-          : switch (stringStatus) {
-            '½-½' => BroadcastResult.draw,
-            '1-0' => BroadcastResult.whiteWins,
-            '0-1' => BroadcastResult.blackWins,
-            '*' => BroadcastResult.ongoing,
-            _ =>
-              throw FormatException(
-                "value $stringStatus can't be interpreted as a broadcast result",
-              ),
-          };
+  final status = BroadcastResult.resultFromString(stringStatus);
 
   /// The amount of time that the player whose turn it is has been thinking since his last move
   final thinkTime = pick('thinkTime').asDurationFromSecondsOrNull() ?? Duration.zero;

lib/src/view/broadcast/broadcast_boards_tab.dart

@@ -341,15 +341,7 @@ class _PlayerWidget extends StatelessWidget {
               const SizedBox(width: 5),
               if (game.isOver)
                 Text(
-                  (gameStatus == BroadcastResult.draw)
-                      ? '½'
-                      : (gameStatus == BroadcastResult.whiteWins)
-                      ? side == Side.white
-                          ? '1'
-                          : '0'
-                      : side == Side.black
-                      ? '1'
-                      : '0',
+                  gameStatus.resultToString(side),
                   style: const TextStyle().copyWith(fontWeight: FontWeight.bold),
                 )
               else if (player.clock != null)

lib/src/view/broadcast/broadcast_game_screen.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:lichess_mobile/src/constants.dart';
 import 'package:lichess_mobile/src/model/analysis/analysis_preferences.dart';
-import 'package:lichess_mobile/src/model/broadcast/broadcast.dart';
 import 'package:lichess_mobile/src/model/broadcast/broadcast_analysis_controller.dart';
 import 'package:lichess_mobile/src/model/common/chess.dart';
 import 'package:lichess_mobile/src/model/common/eval.dart';
@@ -437,15 +436,7 @@ class _PlayerWidget extends ConsumerWidget {
               children: [
                 if (game.isOver) ...[
                   Text(
-                    (gameStatus == BroadcastResult.draw)
-                        ? '½'
-                        : (gameStatus == BroadcastResult.whiteWins)
-                        ? side == Side.white
-                            ? '1'
-                            : '0'
-                        : side == Side.black
-                        ? '1'
-                        : '0',
+                    gameStatus.resultToString(side),
                     style: const TextStyle().copyWith(fontWeight: FontWeight.bold),
                   ),
                   const SizedBox(width: 16.0),