优化

lib/utils/movie/movie_dao.dart

@@ -1,4 +1,4 @@
-import 'package:sqflite/sqflite.dart';
+import 'package:flutter/foundation.dart';
 import '../../models/data_models.dart';
 import '../database_helper.dart';
 
@@ -6,8 +6,17 @@ import '../database_helper.dart';
 class MovieDao {
   final DatabaseHelper _dbHelper = DatabaseHelper.instance;
 
+  Future<T> _wrap<T>(String op, Future<T> Function() fn) async {
+    try {
+      return await fn();
+    } catch (e) {
+      debugPrint('[MovieDao] $op error: $e');
+      rethrow;
+    }
+  }
+
   // 获取所有影视记录（未删除的）
-  Future<List<Movie>> getAllMovies() async {
+  Future<List<Movie>> getAllMovies() => _wrap('getAllMovies', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
@@ -15,12 +24,11 @@ class MovieDao {
       whereArgs: [0],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Movie.fromJson(maps[i]));
-  }
+  });
 
   // 分页查询影视记录
-  Future<List<Movie>> getMoviesPaged({String? status, int limit = 20, int offset = 0}) async {
+  Future<List<Movie>> getMoviesPaged({String? status, int limit = 20, int offset = 0}) => _wrap('getMoviesPaged', () async {
     final db = await _dbHelper.database;
     String where = 'is_deleted = 0';
     List<dynamic> whereArgs = [];
@@ -31,10 +39,10 @@ class MovieDao {
     final maps = await db.query('movies', where: where, whereArgs: whereArgs,
         orderBy: 'created_at DESC', limit: limit, offset: offset);
     return List.generate(maps.length, (i) => Movie.fromJson(maps[i]));
-  }
+  });
 
   // 根据状态筛选影视记录
-  Future<List<Movie>> getMoviesByStatus(String status) async {
+  Future<List<Movie>> getMoviesByStatus(String status) => _wrap('getMoviesByStatus', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
@@ -42,96 +50,86 @@ class MovieDao {
       whereArgs: [status, 0],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Movie.fromJson(maps[i]));
-  }
+  });
 
   // 根据导演筛选
-  Future<List<Movie>> getMoviesByDirector(String director) async {
+  Future<List<Movie>> getMoviesByDirector(String director) => _wrap('getMoviesByDirector', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
-      where: 'is_deleted = ?',
-      whereArgs: [0],
+      where: 'directors LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$director%', 0],
       orderBy: 'created_at DESC',
     );
-    
-    return List.generate(maps.length, (i) => Movie.fromJson(maps[i]))
+    return maps.map((m) => Movie.fromJson(m))
         .where((movie) => movie.directors.contains(director))
         .toList();
-  }
+  });
 
   // 根据编剧筛选
-  Future<List<Movie>> getMoviesByWriter(String writer) async {
+  Future<List<Movie>> getMoviesByWriter(String writer) => _wrap('getMoviesByWriter', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
-      where: 'is_deleted = ?',
-      whereArgs: [0],
+      where: 'writers LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$writer%', 0],
       orderBy: 'created_at DESC',
     );
-    
-    return List.generate(maps.length, (i) => Movie.fromJson(maps[i]))
+    return maps.map((m) => Movie.fromJson(m))
         .where((movie) => movie.writers.contains(writer))
         .toList();
-  }
+  });
 
   // 根据演员筛选
-  Future<List<Movie>> getMoviesByActor(String actor) async {
+  Future<List<Movie>> getMoviesByActor(String actor) => _wrap('getMoviesByActor', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
-      where: 'is_deleted = ?',
-      whereArgs: [0],
+      where: 'actors LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$actor%', 0],
       orderBy: 'created_at DESC',
     );
-    
-    return List.generate(maps.length, (i) => Movie.fromJson(maps[i]))
+    return maps.map((m) => Movie.fromJson(m))
         .where((movie) => movie.actors.contains(actor))
         .toList();
-  }
+  });
 
   // 根据类型筛选
-  Future<List<Movie>> getMoviesByGenre(String genre) async {
+  Future<List<Movie>> getMoviesByGenre(String genre) => _wrap('getMoviesByGenre', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
-      where: 'is_deleted = ?',
-      whereArgs: [0],
+      where: 'genres LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$genre%', 0],
       orderBy: 'created_at DESC',
     );
-    
-    return List.generate(maps.length, (i) => Movie.fromJson(maps[i]))
+    return maps.map((m) => Movie.fromJson(m))
         .where((movie) => movie.genres.contains(genre))
         .toList();
-  }
+  });
 
   // 搜索影视（标题或别名）
-  Future<List<Movie>> searchMovies(String keyword) async {
+  Future<List<Movie>> searchMovies(String keyword) => _wrap('searchMovies', () async {
     final db = await _dbHelper.database;
+    final likeKeyword = '%$keyword%';
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
-      where: 'is_deleted = ?',
-      whereArgs: [0],
+      where: '(title LIKE ? OR alternate_titles LIKE ?) AND is_deleted = ?',
+      whereArgs: [likeKeyword, likeKeyword, 0],
       orderBy: 'created_at DESC',
     );
-    
-    final lowerKeyword = keyword.toLowerCase();
-    return List.generate(maps.length, (i) => Movie.fromJson(maps[i]))
-        .where((movie) => 
-            movie.title.toLowerCase().contains(lowerKeyword) ||
-            movie.alternateTitles.any((t) => t.toLowerCase().contains(lowerKeyword)))
-        .toList();
-  }
+    return maps.map((m) => Movie.fromJson(m)).toList();
+  });
 
   // 添加影视记录
-  Future<int> insertMovie(Movie movie) async {
+  Future<int> insertMovie(Movie movie) => _wrap('insertMovie', () async {
     final db = await _dbHelper.database;
     return await db.insert('movies', movie.toJson());
-  }
+  });
 
   // 更新影视记录
-  Future<int> updateMovie(Movie movie) async {
+  Future<int> updateMovie(Movie movie) => _wrap('updateMovie', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movies',
@@ -139,10 +137,10 @@ class MovieDao {
       where: 'id = ?',
       whereArgs: [movie.id],
     );
-  }
+  });
 
   // 删除影视记录（软删除）
-  Future<int> deleteMovie(String id) async {
+  Future<int> deleteMovie(String id) => _wrap('deleteMovie', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movies',
@@ -150,52 +148,73 @@ class MovieDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   // 获取所有导演（去重）
-  Future<List<String>> getAllDirectors() async {
+  Future<List<String>> getAllDirectors() => _wrap('getAllDirectors', () async {
     final movies = await getAllMovies();
     final directors = <String>{};
     for (final movie in movies) {
       directors.addAll(movie.directors);
     }
     return directors.toList()..sort();
-  }
+  });
 
   // 获取所有编剧（去重）
-  Future<List<String>> getAllWriters() async {
+  Future<List<String>> getAllWriters() => _wrap('getAllWriters', () async {
     final movies = await getAllMovies();
     final writers = <String>{};
     for (final movie in movies) {
       writers.addAll(movie.writers);
     }
     return writers.toList()..sort();
-  }
+  });
 
   // 获取所有演员（去重）
-  Future<List<String>> getAllActors() async {
+  Future<List<String>> getAllActors() => _wrap('getAllActors', () async {
     final movies = await getAllMovies();
     final actors = <String>{};
     for (final movie in movies) {
       actors.addAll(movie.actors);
     }
     return actors.toList()..sort();
-  }
+  });
 
   // 获取所有类型（去重）
-  Future<List<String>> getAllGenres() async {
+  Future<List<String>> getAllGenres() => _wrap('getAllGenres', () async {
     final movies = await getAllMovies();
     final genres = <String>{};
     for (final movie in movies) {
       genres.addAll(movie.genres);
     }
     return genres.toList()..sort();
-  }
+  });
+
+  // 一次性获取所有元数据（导演、编剧、演员、类型）
+  Future<Map<String, List<String>>> getAllMetadata() => _wrap('getAllMetadata', () async {
+    final movies = await getAllMovies();
+    final directors = <String>{};
+    final writers = <String>{};
+    final actors = <String>{};
+    final genres = <String>{};
+    for (final movie in movies) {
+      directors.addAll(movie.directors);
+      writers.addAll(movie.writers);
+      actors.addAll(movie.actors);
+      genres.addAll(movie.genres);
+    }
+    return {
+      'directors': directors.toList()..sort(),
+      'writers': writers.toList()..sort(),
+      'actors': actors.toList()..sort(),
+      'genres': genres.toList()..sort(),
+    };
+  });
 
   // ========== 回收站相关方法 ==========
 
   // 获取已删除的影视
-  Future<List<Movie>> getDeletedMovies() async {
+  Future<List<Movie>> getDeletedMovies() => _wrap('getDeletedMovies', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movies',
@@ -203,12 +222,11 @@ class MovieDao {
       whereArgs: [1],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Movie.fromJson(maps[i]));
-  }
+  });
 
   // 恢复已删除的影视
-  Future<int> restoreMovie(String id) async {
+  Future<int> restoreMovie(String id) => _wrap('restoreMovie', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movies',
@@ -216,15 +234,15 @@ class MovieDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   // 彻底删除影视
-  Future<int> permanentDeleteMovie(String id) async {
+  Future<int> permanentDeleteMovie(String id) => _wrap('permanentDeleteMovie', () async {
     final db = await _dbHelper.database;
     return await db.delete(
       'movies',
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 }

lib/utils/movie/movie_poster_dao.dart

@@ -1,4 +1,4 @@
-import 'package:sqflite/sqflite.dart';
+import 'package:flutter/foundation.dart';
 import '../../models/data_models.dart';
 import '../database_helper.dart';
 
@@ -6,8 +6,17 @@ import '../database_helper.dart';
 class MoviePosterDao {
   final DatabaseHelper _dbHelper = DatabaseHelper.instance;
 
+  Future<T> _wrap<T>(String op, Future<T> Function() fn) async {
+    try {
+      return await fn();
+    } catch (e) {
+      debugPrint('[MoviePosterDao] $op error: $e');
+      rethrow;
+    }
+  }
+
   /// 获取影视的所有海报
-  Future<List<MoviePoster>> getPostersByMovieId(String movieId) async {
+  Future<List<MoviePoster>> getPostersByMovieId(String movieId) => _wrap('getPostersByMovieId', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_posters',
@@ -15,31 +24,29 @@ class MoviePosterDao {
       whereArgs: [movieId],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => MoviePoster.fromJson(maps[i]));
-  }
+  });
 
   /// 根据ID获取海报
-  Future<MoviePoster?> getPosterById(String id) async {
+  Future<MoviePoster?> getPosterById(String id) => _wrap('getPosterById', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_posters',
       where: 'id = ? AND is_deleted = 0',
       whereArgs: [id],
     );
-
     if (maps.isEmpty) return null;
     return MoviePoster.fromJson(maps.first);
-  }
+  });
 
   /// 添加海报
-  Future<int> insertPoster(MoviePoster poster) async {
+  Future<int> insertPoster(MoviePoster poster) => _wrap('insertPoster', () async {
     final db = await _dbHelper.database;
     return await db.insert('movie_posters', poster.toJson());
-  }
+  });
 
   /// 软删除海报
-  Future<int> deletePoster(String id) async {
+  Future<int> deletePoster(String id) => _wrap('deletePoster', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movie_posters',
@@ -47,15 +54,15 @@ class MoviePosterDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   /// 获取影视的海报数量
-  Future<int> getPosterCount(String movieId) async {
+  Future<int> getPosterCount(String movieId) => _wrap('getPosterCount', () async {
     final db = await _dbHelper.database;
     final result = await db.rawQuery(
       'SELECT COUNT(*) as count FROM movie_posters WHERE movie_id = ? AND is_deleted = 0',
       [movieId],
     );
-    return result.first['count'] as int;
-  }
+    return result.first['count'] as int? ?? 0;
+  });
 }

lib/utils/movie/movie_review_dao.dart

@@ -1,4 +1,4 @@
-import 'package:sqflite/sqflite.dart';
+import 'package:flutter/foundation.dart';
 import '../../models/data_models.dart';
 import '../database_helper.dart';
 
@@ -6,8 +6,17 @@ import '../database_helper.dart';
 class MovieReviewDao {
   final DatabaseHelper _dbHelper = DatabaseHelper.instance;
 
+  Future<T> _wrap<T>(String op, Future<T> Function() fn) async {
+    try {
+      return await fn();
+    } catch (e) {
+      debugPrint('[MovieReviewDao] $op error: $e');
+      rethrow;
+    }
+  }
+
   /// 获取影视的所有影评
-  Future<List<MovieReview>> getReviewsByMovieId(String movieId) async {
+  Future<List<MovieReview>> getReviewsByMovieId(String movieId) => _wrap('getReviewsByMovieId', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_reviews',
@@ -15,31 +24,29 @@ class MovieReviewDao {
       whereArgs: [movieId],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => MovieReview.fromJson(maps[i]));
-  }
+  });
 
   /// 根据ID获取影评
-  Future<MovieReview?> getReviewById(String id) async {
+  Future<MovieReview?> getReviewById(String id) => _wrap('getReviewById', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_reviews',
       where: 'id = ? AND is_deleted = 0',
       whereArgs: [id],
     );
-
     if (maps.isEmpty) return null;
     return MovieReview.fromJson(maps.first);
-  }
+  });
 
   /// 添加影评
-  Future<int> insertReview(MovieReview review) async {
+  Future<int> insertReview(MovieReview review) => _wrap('insertReview', () async {
     final db = await _dbHelper.database;
     return await db.insert('movie_reviews', review.toJson());
-  }
+  });
 
   /// 更新影评
-  Future<int> updateReview(MovieReview review) async {
+  Future<int> updateReview(MovieReview review) => _wrap('updateReview', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movie_reviews',
@@ -47,10 +54,10 @@ class MovieReviewDao {
       where: 'id = ?',
       whereArgs: [review.id],
     );
-  }
+  });
 
   /// 软删除影评
-  Future<int> deleteReview(String id) async {
+  Future<int> deleteReview(String id) => _wrap('deleteReview', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'movie_reviews',
@@ -58,20 +65,20 @@ class MovieReviewDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   /// 获取影视的影评数量
-  Future<int> getReviewCount(String movieId) async {
+  Future<int> getReviewCount(String movieId) => _wrap('getReviewCount', () async {
     final db = await _dbHelper.database;
     final result = await db.rawQuery(
       'SELECT COUNT(*) as count FROM movie_reviews WHERE movie_id = ? AND is_deleted = 0',
       [movieId],
     );
-    return result.first['count'] as int;
-  }
+    return result.first['count'] as int? ?? 0;
+  });
 
   /// 获取短评列表
-  Future<List<MovieReview>> getShortReviews(String movieId) async {
+  Future<List<MovieReview>> getShortReviews(String movieId) => _wrap('getShortReviews', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_reviews',
@@ -79,12 +86,11 @@ class MovieReviewDao {
       whereArgs: [movieId],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => MovieReview.fromJson(maps[i]));
-  }
+  });
 
   /// 获取长评列表
-  Future<List<MovieReview>> getLongReviews(String movieId) async {
+  Future<List<MovieReview>> getLongReviews(String movieId) => _wrap('getLongReviews', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'movie_reviews',
@@ -92,7 +98,6 @@ class MovieReviewDao {
       whereArgs: [movieId],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => MovieReview.fromJson(maps[i]));
-  }
+  });
 }