From b750203af86c5ad501568607e810080d272c72a6 Mon Sep 17 00:00:00 2001
From: Simon Ding <dingchuan91@gmail.com>
Date: Tue, 16 Jul 2024 17:57:58 +0800
Subject: [PATCH] chore: updates

---
 server/resources.go         |  3 +++
 ui/lib/movie_watchlist.dart |  2 +-
 ui/lib/search.dart          | 13 ++++++++++---
 ui/lib/tv_details.dart      |  9 ++++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/server/resources.go b/server/resources.go
index ae4d7eb..81edbab 100644
--- a/server/resources.go
+++ b/server/resources.go
@@ -225,6 +225,9 @@ func (s *Server) SearchAvailableMovies(c *gin.Context) (interface{}, error) {
 		if !strings.Contains(r.Name, strconv.Itoa(year)) && !strings.Contains(r.Name, strconv.Itoa(year+1)) && !strings.Contains(r.Name, strconv.Itoa(year-1)) {
 			continue //not the same movie, if year is not correct
 		}
+		if !strings.Contains(r.Name, movieDetail.NameCn) && !strings.Contains(r.Name, movieDetail.NameEn) {
+			continue //name not match
+		}
 		searchResults = append(searchResults, TorznabSearchResult{
 			Name: r.Name,
 			Size: r.Size,
diff --git a/ui/lib/movie_watchlist.dart b/ui/lib/movie_watchlist.dart
index 5968d5e..6a03159 100644
--- a/ui/lib/movie_watchlist.dart
+++ b/ui/lib/movie_watchlist.dart
@@ -9,7 +9,7 @@ import 'package:ui/utils.dart';
 import 'package:ui/widgets/progress_indicator.dart';
 
 class MovieWatchlistPage extends ConsumerWidget {
-  static const route = "/movie";
+  static const route = "/movies";
 
   const MovieWatchlistPage({super.key});
 
diff --git a/ui/lib/search.dart b/ui/lib/search.dart
index d3809a7..fac98fb 100644
--- a/ui/lib/search.dart
+++ b/ui/lib/search.dart
@@ -57,16 +57,23 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                             Row(
                               children: [
                                 Text(
-                                  "${item.name} (${item.firstAirDate?.year})",
+                                  "${item.name} ${item.name != item.originalName ? item.originalName : ''} (${item.firstAirDate?.year})",
                                   style: const TextStyle(
                                       fontSize: 14,
                                       fontWeight: FontWeight.bold),
                                 ),
-                                const SizedBox(width: 10,),
-                                item.mediaType == "tv" ? const Icon(Icons.live_tv): const Icon(Icons.movie)
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                item.mediaType == "tv"
+                                    ? const Icon(Icons.live_tv)
+                                    : const Icon(Icons.movie)
                               ],
                             ),
                             const Text(""),
+                            item.originCountry.isNotEmpty
+                                ? Text("国家：${item.originCountry[0]}")
+                                : Container(),
                             Text("${item.overview}")
                           ],
                         ),
diff --git a/ui/lib/tv_details.dart b/ui/lib/tv_details.dart
index 0ca0e70..b576cca 100644
--- a/ui/lib/tv_details.dart
+++ b/ui/lib/tv_details.dart
@@ -131,7 +131,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
                             Flexible(
                               flex: 1,
                               child: Padding(
-                                padding: EdgeInsets.all(10),
+                                padding: const EdgeInsets.all(10),
                                 child: Image.network(
                                   "${APIs.imagesUrl}/${details.id}/poster.jpg",
                                   fit: BoxFit.contain,
@@ -139,14 +139,13 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
                                 ),
                               ),
                             ),
-                            Expanded(
+                            Flexible(
                               flex: 6,
                               child: Row(
                                 children: [
                                   Expanded(
                                       child: Column(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
+                                        crossAxisAlignment: CrossAxisAlignment.start,
                                     children: [
                                       Row(
                                         children: [
@@ -173,7 +172,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
                                       ),
                                       const Divider(thickness: 1, height: 1),
                                       Text(
-                                        "${details.name} (${details.airDate!.split("-")[0]})",
+                                        "${details.name} ${details.name != details.originalName ? details.originalName: ''} (${details.airDate!.split("-")[0]})",
                                         style: const TextStyle(
                                             fontSize: 20,
                                             fontWeight: FontWeight.bold),