fix: syntax error in downloads_provider.dart

Fixed duplicated code that caused compilation error:
- Removed duplicate _setError method definition
- Fixed parameter list: void _setError(String? error, [String? stackTrace])
- File now compiles correctly

Error was:
lib/presentation/providers/downloads_provider.dart:173:2: Error: Expected a declaration, but got '?'.
}? error) {
 ^

Fixed by properly replacing the old method with new signature.

.github/workflows/release.yml

@@ -66,6 +66,14 @@ jobs:
           channel: 'stable'
           cache: true
 
+      - name: Update version from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION_NAME=${GITHUB_REF#refs/tags/v}
+          BUILD_NUMBER=$(echo $VERSION_NAME | sed 's/[^0-9]//g')
+          echo "Updating version to $VERSION_NAME+$BUILD_NUMBER"
+          sed -i "s/^version: .*/version: $VERSION_NAME+$BUILD_NUMBER/" pubspec.yaml
+
       - name: Get dependencies
         run: flutter pub get
 

.gitlab-ci.yml

@@ -57,6 +57,15 @@ build:apk:arm64:
 build:apk:arm:
   stage: build
   image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
+  before_script:
+    # Update version from tag if present
+    - |
+      if [ -n "$CI_COMMIT_TAG" ]; then
+        VERSION_NAME="${CI_COMMIT_TAG#v}"
+        BUILD_NUMBER=$(echo $CI_COMMIT_TAG | sed 's/[^0-9]//g')
+        echo "Updating version to $VERSION_NAME+$BUILD_NUMBER"
+        sed -i "s/^version: .*/version: $VERSION_NAME+$BUILD_NUMBER/" pubspec.yaml
+      fi
   script:
     - flutter pub get
     - mkdir -p debug-symbols

lib/data/api/neomovies_api_client.dart

@@ -186,17 +186,28 @@ class NeoMoviesApiClient {
   /// Get movie by ID
   Future<Movie> getMovieById(String id) async {
     final uri = Uri.parse('$apiUrl/movies/$id');
+    print('Fetching movie from: $uri');
     final response = await _client.get(uri);
 
+    print('Response status: ${response.statusCode}');
+    print('Response body: ${response.body.substring(0, response.body.length > 500 ? 500 : response.body.length)}...');
+
     if (response.statusCode == 200) {
       final apiResponse = json.decode(response.body);
+      print('Decoded API response type: ${apiResponse.runtimeType}');
+      print('API response keys: ${apiResponse is Map ? apiResponse.keys.toList() : 'Not a map'}');
+      
       // API returns: {"success": true, "data": {...}}
       final movieData = (apiResponse is Map && apiResponse['data'] != null) 
           ? apiResponse['data'] 
           : apiResponse;
+      
+      print('Movie data keys: ${movieData is Map ? movieData.keys.toList() : 'Not a map'}');
+      print('Movie data: $movieData');
+      
       return Movie.fromJson(movieData);
     } else {
-      throw Exception('Failed to load movie: ${response.statusCode}');
+      throw Exception('Failed to load movie: ${response.statusCode} - ${response.body}');
     }
   }
 
@@ -227,17 +238,28 @@ class NeoMoviesApiClient {
   /// Get TV show by ID
   Future<Movie> getTvShowById(String id) async {
     final uri = Uri.parse('$apiUrl/tv/$id');
+    print('Fetching TV show from: $uri');
     final response = await _client.get(uri);
 
+    print('Response status: ${response.statusCode}');
+    print('Response body: ${response.body.substring(0, response.body.length > 500 ? 500 : response.body.length)}...');
+
     if (response.statusCode == 200) {
       final apiResponse = json.decode(response.body);
+      print('Decoded API response type: ${apiResponse.runtimeType}');
+      print('API response keys: ${apiResponse is Map ? apiResponse.keys.toList() : 'Not a map'}');
+      
       // API returns: {"success": true, "data": {...}}
       final tvData = (apiResponse is Map && apiResponse['data'] != null) 
           ? apiResponse['data'] 
           : apiResponse;
+      
+      print('TV data keys: ${tvData is Map ? tvData.keys.toList() : 'Not a map'}');
+      print('TV data: $tvData');
+      
       return Movie.fromJson(tvData);
     } else {
-      throw Exception('Failed to load TV show: ${response.statusCode}');
+      throw Exception('Failed to load TV show: ${response.statusCode} - ${response.body}');
     }
   }
 

lib/data/models/movie.dart

@@ -67,30 +67,79 @@ class Movie extends HiveObject {
   });
 
   factory Movie.fromJson(Map<String, dynamic> json) {
-    return Movie(
+    try {
-      id: (json['id'] as num).toString(), // Ensure id is a string
+      print('Parsing Movie from JSON: ${json.keys.toList()}');
-      title: (json['title'] ?? json['name'] ?? '') as String,
+      
-      posterPath: json['poster_path'] as String?,
+      // Parse genres safely - API returns: [{"id": 18, "name": "Drama"}]
-      backdropPath: json['backdrop_path'] as String?,
+      List<String> genresList = [];
-      overview: json['overview'] as String?,
+      if (json['genres'] != null && json['genres'] is List) {
-      releaseDate: json['release_date'] != null && json['release_date'].isNotEmpty
+        genresList = (json['genres'] as List)
-          ? DateTime.tryParse(json['release_date'] as String)
+            .map((g) {
-          : json['first_air_date'] != null && json['first_air_date'].isNotEmpty
+              if (g is Map && g.containsKey('name')) {
-              ? DateTime.tryParse(json['first_air_date'] as String)
+                return g['name'] as String? ?? '';
-              : null,
+              }
-      genres: List<String>.from(json['genres']?.map((g) => g['name']) ?? []),
+              return '';
-      voteAverage: (json['vote_average'] as num?)?.toDouble() ?? 0.0,
+            })
-      popularity: (json['popularity'] as num?)?.toDouble() ?? 0.0,
+            .where((name) => name.isNotEmpty)
-      runtime: json['runtime'] is num
+            .toList();
-          ? (json['runtime'] as num).toInt()
+        print('Parsed genres: $genresList');
-          : (json['episode_run_time'] is List && (json['episode_run_time'] as List).isNotEmpty)
+      }
-              ? ((json['episode_run_time'] as List).first as num).toInt()
+
-              : null,
+      // Parse dates safely
-      seasonsCount: json['number_of_seasons'] as int?,
+      DateTime? parsedDate;
-      episodesCount: json['number_of_episodes'] as int?,
+      final releaseDate = json['release_date'];
-      tagline: json['tagline'] as String?,
+      final firstAirDate = json['first_air_date'];
-      mediaType: (json['media_type'] ?? (json['title'] != null ? 'movie' : 'tv')) as String,
+      
-    );
+      if (releaseDate != null && releaseDate.toString().isNotEmpty && releaseDate.toString() != 'null') {
+        parsedDate = DateTime.tryParse(releaseDate.toString());
+      } else if (firstAirDate != null && firstAirDate.toString().isNotEmpty && firstAirDate.toString() != 'null') {
+        parsedDate = DateTime.tryParse(firstAirDate.toString());
+      }
+
+      // Parse runtime (movie) or episode_run_time (TV)
+      int? runtimeValue;
+      if (json['runtime'] != null && json['runtime'] is num && (json['runtime'] as num) > 0) {
+        runtimeValue = (json['runtime'] as num).toInt();
+      } else if (json['episode_run_time'] != null && json['episode_run_time'] is List) {
+        final episodeRunTime = json['episode_run_time'] as List;
+        if (episodeRunTime.isNotEmpty && episodeRunTime.first is num) {
+          runtimeValue = (episodeRunTime.first as num).toInt();
+        }
+      }
+
+      // Determine media type
+      String mediaTypeValue = 'movie';
+      if (json.containsKey('media_type') && json['media_type'] != null) {
+        mediaTypeValue = json['media_type'] as String;
+      } else if (json.containsKey('name') || json.containsKey('first_air_date')) {
+        mediaTypeValue = 'tv';
+      }
+
+      final movie = Movie(
+        id: (json['id'] as num).toString(),
+        title: (json['title'] ?? json['name'] ?? 'Untitled') as String,
+        posterPath: json['poster_path'] as String?,
+        backdropPath: json['backdrop_path'] as String?,
+        overview: json['overview'] as String?,
+        releaseDate: parsedDate,
+        genres: genresList,
+        voteAverage: (json['vote_average'] as num?)?.toDouble() ?? 0.0,
+        popularity: (json['popularity'] as num?)?.toDouble() ?? 0.0,
+        runtime: runtimeValue,
+        seasonsCount: json['number_of_seasons'] as int?,
+        episodesCount: json['number_of_episodes'] as int?,
+        tagline: json['tagline'] as String?,
+        mediaType: mediaTypeValue,
+      );
+
+      print('Successfully parsed movie: ${movie.title}');
+      return movie;
+    } catch (e, stackTrace) {
+      print('❌ Error parsing Movie from JSON: $e');
+      print('Stack trace: $stackTrace');
+      print('JSON data: $json');
+      rethrow;
+    }
   }
 
   Map<String, dynamic> toJson() => _$MovieToJson(this);

lib/main.dart

@@ -19,6 +19,7 @@ import 'package:neomovies_mobile/presentation/providers/favorites_provider.dart'
 import 'package:neomovies_mobile/presentation/providers/home_provider.dart';
 import 'package:neomovies_mobile/presentation/providers/movie_detail_provider.dart';
 import 'package:neomovies_mobile/presentation/providers/reactions_provider.dart';
+import 'package:neomovies_mobile/presentation/providers/downloads_provider.dart';
 import 'package:neomovies_mobile/presentation/screens/main_screen.dart';
 import 'package:provider/provider.dart';
 

lib/presentation/providers/downloads_provider.dart

@@ -9,10 +9,12 @@ class DownloadsProvider with ChangeNotifier {
   Timer? _progressTimer;
   bool _isLoading = false;
   String? _error;
+  String? _stackTrace;
 
   List<TorrentInfo> get torrents => List.unmodifiable(_torrents);
   bool get isLoading => _isLoading;
   String? get error => _error;
+  String? get stackTrace => _stackTrace;
 
   DownloadsProvider() {
     _startProgressUpdates();
@@ -164,8 +166,9 @@ class DownloadsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  void _setError(String? error) {
+  void _setError(String? error, [String? stackTrace]) {
     _error = error;
+    _stackTrace = stackTrace;
     notifyListeners();
   }
 }

lib/presentation/providers/movie_detail_provider.dart

@@ -24,6 +24,9 @@ class MovieDetailProvider with ChangeNotifier {
   String? _error;
   String? get error => _error;
 
+  String? _stackTrace;
+  String? get stackTrace => _stackTrace;
+
   Future<void> loadMedia(int mediaId, String mediaType) async {
     _isLoading = true;
     _isImdbLoading = true;
@@ -33,11 +36,15 @@ class MovieDetailProvider with ChangeNotifier {
     notifyListeners();
 
     try {
+      print('Loading media: ID=$mediaId, type=$mediaType');
+      
       // Load movie/TV details
       if (mediaType == 'movie') {
         _movie = await _movieRepository.getMovieById(mediaId.toString());
+        print('Movie loaded successfully: ${_movie?.title}');
       } else {
         _movie = await _movieRepository.getTvById(mediaId.toString());
+        print('TV show loaded successfully: ${_movie?.title}');
       }
       
       _isLoading = false;
@@ -46,16 +53,20 @@ class MovieDetailProvider with ChangeNotifier {
       // Try to load IMDb ID (non-blocking)
       if (_movie != null) {
         try {
+          print('Loading IMDb ID for $mediaType $mediaId');
           _imdbId = await _apiClient.getImdbId(mediaId.toString(), mediaType);
+          print('IMDb ID loaded: $_imdbId');
         } catch (e) {
           // IMDb ID loading failed, but don't fail the whole screen
           print('Failed to load IMDb ID: $e');
           _imdbId = null;
         }
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
       print('Error loading media: $e');
+      print('Stack trace: $stackTrace');
       _error = e.toString();
+      _stackTrace = stackTrace.toString();
       _isLoading = false;
       notifyListeners();
     } finally {

lib/presentation/screens/downloads/downloads_screen.dart

@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../providers/downloads_provider.dart';
+import '../../widgets/error_display.dart';
 import '../../../data/models/torrent_info.dart';
 import 'torrent_detail_screen.dart';
-import 'package:auto_route/auto_route.dart';
 
-@RoutePage()
 class DownloadsScreen extends StatefulWidget {
   const DownloadsScreen({super.key});
 
@@ -48,37 +47,13 @@ class _DownloadsScreenState extends State<DownloadsScreen> {
           }
 
           if (provider.error != null) {
-            return Center(
+            return ErrorDisplay(
-              child: Column(
+              title: 'Ошибка загрузки торрентов',
-                mainAxisAlignment: MainAxisAlignment.center,
+              error: provider.error!,
-                children: [
+              stackTrace: provider.stackTrace,
-                  Icon(
+              onRetry: () {
-                    Icons.error_outline,
+                provider.refreshDownloads();
-                    size: 64,
+              },
-                    color: Colors.red.shade300,
-                  ),
-                  const SizedBox(height: 16),
-                  Text(
-                    'Ошибка загрузки',
-                    style: Theme.of(context).textTheme.headlineSmall,
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    provider.error!,
-                    textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      color: Colors.grey.shade600,
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                  ElevatedButton(
-                    onPressed: () {
-                      provider.refreshDownloads();
-                    },
-                    child: const Text('Попробовать снова'),
-                  ),
-                ],
-              ),
             );
           }
 

lib/presentation/screens/movie_detail/movie_detail_screen.dart

@@ -7,6 +7,7 @@ import 'package:neomovies_mobile/presentation/providers/reactions_provider.dart'
 import 'package:neomovies_mobile/presentation/providers/movie_detail_provider.dart';
 import 'package:neomovies_mobile/presentation/screens/player/video_player_screen.dart';
 import 'package:neomovies_mobile/presentation/screens/torrent_selector/torrent_selector_screen.dart';
+import 'package:neomovies_mobile/presentation/widgets/error_display.dart';
 import 'package:provider/provider.dart';
 
 class MovieDetailScreen extends StatefulWidget {
@@ -89,7 +90,15 @@ class _MovieDetailScreenState extends State<MovieDetailScreen> {
           }
 
           if (provider.error != null) {
-            return Center(child: Text('Error: ${provider.error}'));
+            return ErrorDisplay(
+              title: 'Ошибка загрузки ${widget.mediaType == 'movie' ? 'фильма' : 'сериала'}',
+              error: provider.error!,
+              stackTrace: provider.stackTrace,
+              onRetry: () {
+                Provider.of<MovieDetailProvider>(context, listen: false)
+                    .loadMedia(int.parse(widget.movieId), widget.mediaType);
+              },
+            );
           }
 
           if (provider.movie == null) {

lib/presentation/widgets/error_display.dart

@@ -0,0 +1,254 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+/// Widget that displays detailed error information for debugging
+class ErrorDisplay extends StatelessWidget {
+  final String title;
+  final String error;
+  final String? stackTrace;
+  final VoidCallback? onRetry;
+
+  const ErrorDisplay({
+    super.key,
+    this.title = 'Произошла ошибка',
+    required this.error,
+    this.stackTrace,
+    this.onRetry,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Error icon and title
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(
+                  Icons.error_outline,
+                  size: 48,
+                  color: Colors.red.shade400,
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            
+            // Title
+            Text(
+              title,
+              style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: Colors.red.shade700,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 24),
+            
+            // Error message card
+            Container(
+              width: double.infinity,
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: Colors.red.shade50,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: Colors.red.shade200),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Icon(Icons.info_outline, size: 20, color: Colors.red.shade700),
+                      const SizedBox(width: 8),
+                      Text(
+                        'Сообщение об ошибке:',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Colors.red.shade700,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  SelectableText(
+                    error,
+                    style: const TextStyle(
+                      fontFamily: 'monospace',
+                      fontSize: 13,
+                    ),
+                  ),
+                  const SizedBox(height: 12),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: OutlinedButton.icon(
+                          onPressed: () {
+                            Clipboard.setData(ClipboardData(text: error));
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Ошибка скопирована в буфер обмена'),
+                                duration: Duration(seconds: 2),
+                              ),
+                            );
+                          },
+                          icon: const Icon(Icons.copy, size: 18),
+                          label: const Text('Копировать ошибку'),
+                          style: OutlinedButton.styleFrom(
+                            foregroundColor: Colors.red.shade700,
+                            side: BorderSide(color: Colors.red.shade300),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            
+            // Stack trace (if available)
+            if (stackTrace != null && stackTrace!.isNotEmpty) ...[
+              const SizedBox(height: 16),
+              ExpansionTile(
+                title: Row(
+                  children: [
+                    Icon(Icons.bug_report, size: 20, color: Colors.orange.shade700),
+                    const SizedBox(width: 8),
+                    Text(
+                      'Stack Trace (для разработчиков)',
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        color: Colors.orange.shade700,
+                      ),
+                    ),
+                  ],
+                ),
+                backgroundColor: Colors.orange.shade50,
+                collapsedBackgroundColor: Colors.orange.shade50,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  side: BorderSide(color: Colors.orange.shade200),
+                ),
+                collapsedShape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  side: BorderSide(color: Colors.orange.shade200),
+                ),
+                children: [
+                  Container(
+                    width: double.infinity,
+                    padding: const EdgeInsets.all(16),
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade900,
+                      borderRadius: const BorderRadius.only(
+                        bottomLeft: Radius.circular(8),
+                        bottomRight: Radius.circular(8),
+                      ),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SelectableText(
+                          stackTrace!,
+                          style: const TextStyle(
+                            fontFamily: 'monospace',
+                            fontSize: 11,
+                            color: Colors.greenAccent,
+                          ),
+                        ),
+                        const SizedBox(height: 12),
+                        OutlinedButton.icon(
+                          onPressed: () {
+                            Clipboard.setData(ClipboardData(text: stackTrace!));
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Stack trace скопирован в буфер обмена'),
+                                duration: Duration(seconds: 2),
+                              ),
+                            );
+                          },
+                          icon: const Icon(Icons.copy, size: 18),
+                          label: const Text('Копировать stack trace'),
+                          style: OutlinedButton.styleFrom(
+                            foregroundColor: Colors.greenAccent,
+                            side: const BorderSide(color: Colors.greenAccent),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ],
+            
+            // Retry button
+            if (onRetry != null) ...[
+              const SizedBox(height: 24),
+              Row(
+                children: [
+                  Expanded(
+                    child: ElevatedButton.icon(
+                      onPressed: onRetry,
+                      icon: const Icon(Icons.refresh),
+                      label: const Text('Попробовать снова'),
+                      style: ElevatedButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                        backgroundColor: Theme.of(context).primaryColor,
+                        foregroundColor: Colors.white,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+            
+            // Debug tips
+            const SizedBox(height: 24),
+            Container(
+              width: double.infinity,
+              padding: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: Colors.blue.shade50,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: Colors.blue.shade200),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Icon(Icons.lightbulb_outline, size: 20, color: Colors.blue.shade700),
+                      const SizedBox(width: 8),
+                      Text(
+                        'Советы по отладке:',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Colors.blue.shade700,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    '• Скопируйте ошибку и отправьте разработчику\n'
+                    '• Проверьте соединение с интернетом\n'
+                    '• Проверьте логи Flutter в консоли\n'
+                    '• Попробуйте перезапустить приложение',
+                    style: TextStyle(
+                      fontSize: 12,
+                      color: Colors.blue.shade900,
+                      height: 1.5,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}