Fix the bug that the gallery language is displayed incorrectly on the details page when the gallery list layout

  that does not select to display tags

  修复在未选择显示标签的画廊列表布局时，详情页画廊语言展示错误的bug

Author: jiangtian616

changelog/v7.4.11+150.md

@@ -19,6 +19,7 @@
 - 修复iOS下更新版本后保存原图失败的bug
 - 修复手动重新下载的状态bug
 - 修复瀑布流布局下图片周围存在空白区域的bug
+- 修复在未选择显示标签的画廊列表布局时，详情页画廊语言展示错误的bug
 - 升级数据库组件、网络组件、缓存组件、cookie组件
 
 ------------------------------------------------------------------------------------------
@@ -47,4 +48,6 @@
 - Fix the bug that saving the original image fails after updating the version on iOS
 - Fix the bug that the status of manual re-download is incorrect
 - Fix the bug that there is a blank area around the image in the waterfall layout
+- Fix the bug that the gallery language is displayed incorrectly on the details page when the gallery list layout
+  that does not select to display tags
 - Upgrade database component, network component, cache component, cookie component

lib/src/model/gallery_detail.dart

@@ -9,6 +9,7 @@ import 'gallery_thumbnail.dart';
 class GalleryDetail {
   String rawTitle;
   String? japaneseTitle;
+  String language;
   int ratingCount;
   double realRating;
   String size;
@@ -30,6 +31,7 @@ class GalleryDetail {
   GalleryDetail({
     required this.rawTitle,
     this.japaneseTitle,
+    required this.language,
     required this.ratingCount,
     required this.realRating,
     required this.size,

lib/src/pages/details/details_page.dart

@@ -426,24 +426,37 @@ class DetailsPage extends StatelessWidget with Scroll2TopPageMixin {
 
   Widget _buildLanguage(double iconSize, double space, BuildContext context) {
     return GetBuilder<DetailsPageLogic>(
-      id: DetailsPageLogic.galleryId,
+      id: DetailsPageLogic.languageId,
       global: false,
       init: logic,
-      builder: (_) => Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(Icons.language, size: iconSize, color: UIConfig.detailsPageIconColor(context)),
-          SizedBox(width: space),
-          AnimatedSwitcher(
-            duration: const Duration(milliseconds: UIConfig.detailsPageAnimationDuration),
-            child: Text(
-              state.gallery == null ? '...' : state.gallery!.language?.capitalizeFirst ?? 'Japanese',
-              key: ValueKey(state.gallery == null ? '...' : state.gallery!.language?.capitalizeFirst ?? 'Japanese'),
-              style: const TextStyle(fontSize: UIConfig.detailsPageInfoTextSize),
+      builder: (_) {
+        String language;
+        if (state.galleryDetails != null) {
+          language = state.galleryDetails!.language.capitalizeFirst!;
+        } else if (state.gallery?.language != null) {
+          language = state.gallery!.language!.capitalizeFirst!;
+        } else if (state.gallery?.tags.isNotEmpty ?? false) {
+          language = 'Japanese';
+        } else {
+          language = '...';
+        }
+
+        return Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.language, size: iconSize, color: UIConfig.detailsPageIconColor(context)),
+            SizedBox(width: space),
+            AnimatedSwitcher(
+              duration: const Duration(milliseconds: UIConfig.detailsPageAnimationDuration),
+              child: Text(
+                language,
+                key: ValueKey(language),
+                style: const TextStyle(fontSize: UIConfig.detailsPageInfoTextSize),
+              ),
             ),
-          ),
-        ],
-      ),
+          ],
+        );
+      },
     );
   }
 

lib/src/pages/details/details_page_logic.dart

@@ -59,13 +59,13 @@ import '../../widget/eh_download_dialog.dart';
 import '../../widget/eh_download_hh_dialog.dart';
 import '../../widget/eh_gallery_history_dialog.dart';
 import '../../widget/jump_page_dialog.dart';
-import '../download/list/local/local_gallery_list_page_logic.dart';
 import 'details_page_state.dart';
 
 class DetailsPageLogic extends GetxController with LoginRequiredMixin, Scroll2TopLogicMixin, UpdateGlobalGalleryStatusLogicMixin {
   static const String galleryId = 'galleryId';
   static const String uploaderId = 'uploaderId';
   static const String detailsId = 'detailsId';
+  static const String languageId = 'languageId';
   static const String pageCountId = 'pageCountId';
   static const String ratingId = 'ratingId';
   static const String favoriteId = 'favoriteId';
@@ -788,6 +788,10 @@ class DetailsPageLogic extends GetxController with LoginRequiredMixin, Scroll2To
       return;
     }
 
+    if (state.gallery?.language == null) {
+      updateIds.add(languageId);
+    }
+
     /// page count is null in favorite page
     if (state.gallery?.pageCount != newGallery.pageCount) {
       state.gallery?.pageCount = newGallery.pageCount;

lib/src/pages/setting/style/theme_color/preview_page/detail_preview_page.dart

@@ -295,6 +295,7 @@ class DetailsPreviewPageState extends DetailsPageState {
 
     galleryDetails = GalleryDetail(
       rawTitle: 'Title - This is the detail preview page',
+      language: 'Chinese',
       ratingCount: 666,
       realRating: 4,
       size: '66.66MB',

lib/src/utils/eh_spider_parser.dart

@@ -253,6 +253,7 @@ class EHSpiderParser {
     GalleryDetail galleryDetail = GalleryDetail(
       rawTitle: document.querySelector('#gn')!.text,
       japaneseTitle: document.querySelector('#gj')!.text,
+      language: document.querySelector('#gdd > table > tbody')?.children[3].children[1].nodes[0].text?.trim() ?? '',
       ratingCount: int.parse(document.querySelector('#rating_count')?.text ?? '0'),
       realRating: _parseGalleryDetailsRealRating(document),
       size: document.querySelector('#gdd > table > tbody')?.children[4].children[1].text ?? '',