Refactor matchloading to support Catigoal JSON format

Author: mato157

lib/screens/settings.dart

@@ -334,7 +334,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                           ),
                           Padding(
                             padding: EdgeInsets.symmetric(vertical: 4.0),
-                            child: Text('Version: 0.9.5', style: TextStyle(fontSize: 14)),
+                            child: Text('Version: 0.9.6', style: TextStyle(fontSize: 14)),
                           ),
                           Padding(
                             padding: EdgeInsets.symmetric(vertical: 4.0),

lib/services/match_data.dart

@@ -21,20 +21,21 @@ class Match {
 
   factory Match.fromJson(Map<String, dynamic> json) {
     return Match(
-      id: json['#'] as String,
-      fieldRaw: json['Field'] as String,
-      team1: json['Teams_1'] as String,
-      team2: json['Teams_3'] as String,
-
-      // Extract only the number from the fieldRaw string
-      // Example: "L-1" -> "1"
-      field: RegExp(r'\d+').firstMatch(json['Field'] as String)?.group(0) ?? '',
+      id: json['number']?.toString() ?? '', // Safely extract match number as the ID
+      fieldRaw: json['pitch'] as String? ?? '', // Safely extract pitch
+      team1: json['team1']?['name'] as String? ?? 'Unknown Team 1', // Safely extract team1 name
+      team2: json['team2']?['name'] as String? ?? 'Unknown Team 2', // Safely extract team2 name
+      field: RegExp(r'\d+')
+              .firstMatch(json['pitch'] as String? ?? '')
+              ?.group(0)
+              ?.replaceFirst(RegExp(r'^0+'), '') ??
+          '', // Safely extract field number
     );
   }
 }
 
 class MatchDataService {
-  String _url = 'https://raw.githubusercontent.com/robocup-junior/soccer-matches/refs/heads/main/data/RCJI25/matches.json';
+  String _url = 'https://catigoal.com/rest/v1/RCJI25/matches?format=json';
   String _matchId = '';
   String _state = '';
   List<Match> _matches = [];
@@ -50,28 +51,34 @@ class MatchDataService {
   /// Loads MQTT settings from SharedPreferences
   Future<void> loadPreferences() async {
     prefs = await SharedPreferences.getInstance();
-    _url = prefs.getString('matches_url') ?? 'https://raw.githubusercontent.com/robocup-junior/soccer-matches/refs/heads/main/data/RCJI25/matches.json';
+    _url = prefs.getString('matches_url') ?? 'https://catigoal.com/rest/v1/RCJI25/matches?format=json';
   }
 
   Future<List<Match>> fetchMatches(String url) async {
     final response = await http.get(Uri.parse(url));
 
-    //print(response.body);
     if (response.statusCode == 200) {
       print('Matches loaded successfully');
-      final List<dynamic> jsonList = json.decode(response.body);
-      print('Number of matches: ${jsonList.length}');
-      return jsonList.map((json) => Match.fromJson(json)).toList();
+      final Map<String, dynamic> jsonResponse = json.decode(response.body);
+      final List<dynamic> matchesList = jsonResponse['matches'];
+      print('Number of matches: ${matchesList.length}');
+      return matchesList.map((matchJson) => Match.fromJson(matchJson)).toList();
     } else {
       throw Exception('Failed to load matches');
     }
   }
 
   Match? findMatchById(List<Match> matches, String gameId) {
     try {
-      return matches.firstWhere((match) => match.id == gameId);
+      // Iterate through matches and find the one with the matching ID
+      for (var match in matches) {
+        if (match.id == gameId) {
+          return match;
+        }
+      }
+      return null; // Return null if no match is found
     } catch (e) {
-      return null;
+      return null; // Handle errors gracefully
     }
   }
 

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.9.5+6
+version: 0.9.6+8
 
 
 environment: