refa: video model (#523)

lib/utils/em.dart

@@ -1,31 +1,27 @@
 import 'package:html/parser.dart' show parse;
 
 class Em {
-  static regCate(String origin) {
-    String str = origin;
-    RegExp exp = RegExp('<[^>]*>([^<]*)</[^>]*>');
-    Iterable<Match> matches = exp.allMatches(origin);
-    for (Match match in matches) {
-      str = match.group(1)!;
-    }
-    return str;
+  static final _exp = RegExp('<[^>]*>([^<]*)</[^>]*>');
+
+  static String regCate(String origin) {
+    Iterable<Match> matches = _exp.allMatches(origin);
+    return matches.lastOrNull?.group(1) ?? origin;
   }
 
-  static regTitle(String origin) {
-    RegExp exp = RegExp('<[^>]*>([^<]*)</[^>]*>');
-    List res = [];
+  static List<Map<String, String>> regTitle(String origin) {
+    List<Map<String, String>> res = [];
     origin.splitMapJoin(
-      exp,
+      _exp,
       onMatch: (Match match) {
         String matchStr = match[0]!;
-        Map map = {'type': 'em', 'text': regCate(matchStr)};
+        var map = {'type': 'em', 'text': regCate(matchStr)};
         res.add(map);
-        return regCate(matchStr);
+        return matchStr;
       },
       onNonMatch: (String str) {
         if (str != '') {
           str = parse(str).body?.text ?? str;
-          Map map = {'type': 'text', 'text': str};
+          var map = {'type': 'text', 'text': str};
           res.add(map);
         }
         return str;

lib/utils/recommend_filter.dart

@@ -1,3 +1,4 @@
+import 'package:PiliPlus/models/model_video.dart';
 import 'package:hive/hive.dart';
 
 import 'storage.dart';
@@ -30,46 +31,30 @@ class RecommendFilter {
         .get(SettingBoxKey.applyFilterToRelatedVideos, defaultValue: true);
   }
 
-  static bool filter(dynamic videoItem, {bool relatedVideos = false}) {
-    if (relatedVideos && !applyFilterToRelatedVideos) {
-      return false;
-    }
+  static bool filter(BaseVideoItemModel videoItem) {
     //由于相关视频中没有已关注标签，只能视为非关注视频
-    if (!relatedVideos &&
-        videoItem.isFollowed == 1 &&
-        exemptFilterForFollowed) {
+    if (videoItem.isFollowed && exemptFilterForFollowed) {
       return false;
     }
-    if (videoItem.duration > 0 && videoItem.duration < minDurationForRcmd) {
-      return true;
-    }
-    if (filterLikeRatio(videoItem.stat.like, videoItem.stat.view)) {
-      return true;
-    }
-    if (filterTitle(videoItem.title)) {
-      return true;
-    }
-    return false;
+    return filterAll(videoItem);
   }
 
-  static bool filterLikeRatio(like, view) {
-    if (view is int &&
+  static bool filterLikeRatio(int? like, int? view) {
+    return (view != null &&
         view > -1 &&
-        like is int &&
+        like != null &&
         like > -1 &&
-        like * 100 < minLikeRatioForRecommend * view) {
-      return true;
-    }
-    return false;
+        like * 100 < minLikeRatioForRecommend * view);
   }
 
-  static bool filterTitle(String title, {bool? isFollowed}) {
-    if (exemptFilterForFollowed && isFollowed == true) {
-      return false;
-    }
-    if (rcmdRegExp.pattern.isNotEmpty && rcmdRegExp.hasMatch(title)) {
-      return true;
-    }
-    return false;
+  static bool filterTitle(String title) {
+    return (rcmdRegExp.pattern.isNotEmpty && rcmdRegExp.hasMatch(title));
+  }
+
+  static bool filterAll(BaseVideoItemModel videoItem) {
+    return (videoItem.duration > 0 &&
+            videoItem.duration < minDurationForRcmd) ||
+        filterLikeRatio(videoItem.stat.like, videoItem.stat.view) ||
+        filterTitle(videoItem.title);
   }
 }

lib/utils/utils.dart

@@ -47,11 +47,17 @@ import 'package:html/dom.dart' as dom;
 import 'package:html/parser.dart' as html_parser;
 import 'package:path/path.dart' as path;
 
+import '../models/home/rcmd/result.dart';
+import '../models/model_rec_video_item.dart';
+import '../models/model_video.dart';
+
 class Utils {
   static final Random random = Random();
 
   static const channel = MethodChannel("PiliPlus");
 
+  static final _numRegExp = RegExp(r'([\d\.]+)([千万亿])?');
+
   static ThemeData getThemeData({
     required ColorScheme colorScheme,
     required bool isDynamic,
@@ -1149,6 +1155,32 @@ class Utils {
   //   return tempPath;
   // }
 
+  static int getUnit(String? unit) {
+    switch (unit) {
+      case '千':
+        return 1000;
+      case '万':
+        return 10000;
+      case '亿':
+        return 100000000;
+      default:
+        return 1;
+    }
+  }
+
+  static int parseNum(String numberStr) {
+    if (numberStr == '-') return 0;
+    try {
+      final match = _numRegExp.firstMatch(numberStr)!;
+      var number = double.parse(match.group(1)!);
+      number *= getUnit(match.group(2));
+      return number.toInt();
+    } catch (e) {
+      debugPrint('parse failed: "$numberStr" : $e');
+      return 0;
+    }
+  }
+
   static String numFormat(dynamic number) {
     if (number == null) {
       return '00:00';
@@ -1197,63 +1229,49 @@ class Utils {
     return '${int.parse(durationParts[0])}秒';
   }
 
-  static String videoItemSemantics(dynamic videoItem) {
-    String semanticsLabel = "";
-    bool emptyStatCheck(dynamic stat) {
-      return stat == null ||
-          stat == '' ||
-          stat == 0 ||
-          stat == '0' ||
-          stat == '-';
+  static String videoItemSemantics(BaseVideoItemModel videoItem) {
+    StringBuffer semanticsLabel = StringBuffer();
+    bool emptyStatCheck(int? stat) {
+      return stat == null || stat <= 0;
     }
 
-    if (videoItem.runtimeType.toString() == "RecVideoItemAppModel") {
+    if (videoItem is RecVideoItemAppModel) {
       if (videoItem.goto == 'picture') {
-        semanticsLabel += '动态,';
+        semanticsLabel.write('动态,');
       } else if (videoItem.goto == 'bangumi') {
-        semanticsLabel += '番剧,';
+        semanticsLabel.write('番剧,');
       }
     }
-    if (videoItem.title is String) {
-      semanticsLabel += videoItem.title;
-    } else {
-      semanticsLabel +=
-          videoItem.title.map((e) => e['text'] as String).join('');
-    }
+    semanticsLabel.write(videoItem.title);
 
     if (!emptyStatCheck(videoItem.stat.view)) {
-      semanticsLabel += ',${Utils.numFormat(videoItem.stat.view)}';
-      semanticsLabel +=
-          (videoItem.runtimeType.toString() == "RecVideoItemAppModel" &&
-                  videoItem.goto == 'picture')
+      semanticsLabel.write(',${Utils.numFormat(videoItem.stat.view)}');
+      semanticsLabel.write(
+          (videoItem is RecVideoItemAppModel && videoItem.goto == 'picture')
               ? '浏览'
-              : '播放';
+              : '播放');
     }
     if (!emptyStatCheck(videoItem.stat.danmu)) {
-      semanticsLabel += ',${Utils.numFormat(videoItem.stat.danmu)}弹幕';
+      semanticsLabel.write(',${Utils.numFormat(videoItem.stat.danmu)}弹幕');
     }
-    if (videoItem.rcmdReason != null) {
-      semanticsLabel += ',${videoItem.rcmdReason}';
+    if ((videoItem is BaseRecVideoItemModel) && videoItem.rcmdReason != null) {
+      semanticsLabel.write(',${videoItem.rcmdReason}');
     }
-    if (!emptyStatCheck(videoItem.duration) &&
-        (videoItem.duration is! int || videoItem.duration > 0)) {
-      semanticsLabel +=
-          ',时长${Utils.durationReadFormat(Utils.timeFormat(videoItem.duration))}';
+    if (!emptyStatCheck(videoItem.duration) && videoItem.duration > 0) {
+      semanticsLabel.write(
+          ',时长${Utils.durationReadFormat(Utils.timeFormat(videoItem.duration))}');
     }
-    if (videoItem.runtimeType.toString() != "RecVideoItemAppModel" &&
-        videoItem.pubdate != null) {
-      semanticsLabel +=
-          ',${Utils.dateFormat(videoItem.pubdate!, formatType: 'day')}';
+    if (videoItem.pubdate != null) {
+      semanticsLabel
+          .write(',${Utils.dateFormat(videoItem.pubdate!, formatType: 'day')}');
     }
     if (videoItem.owner.name != '') {
-      semanticsLabel += ',Up主：${videoItem.owner.name}';
+      semanticsLabel.write(',Up主：${videoItem.owner.name}');
     }
-    if ((videoItem.runtimeType.toString() == "RecVideoItemAppModel" ||
-            videoItem.runtimeType.toString() == "RecVideoItemModel") &&
-        videoItem.isFollowed == 1) {
-      semanticsLabel += ',已关注';
+    if (videoItem is BaseRecVideoItemModel && videoItem.isFollowed) {
+      semanticsLabel.write(',已关注');
     }
-    return semanticsLabel;
+    return semanticsLabel.toString();
   }
 
   static String timeFormat(dynamic time) {
@@ -1263,14 +1281,7 @@ class Utils {
     if (time == null || time == 0) {
       return '00:00';
     }
-    int hour = time ~/ 3600;
-    int minute = (time % 3600) ~/ 60;
-    int second = time % 60;
-    String paddingStr(int number) {
-      return number.toString().padLeft(2, '0');
-    }
-
-    return '${hour > 0 ? "${paddingStr(hour)}:" : ""}${paddingStr(minute)}:${paddingStr(second)}';
+    return formatDuration(time);
   }
 
   static String shortenChineseDateString(String date) {
@@ -1570,17 +1581,6 @@ class Utils {
     }
   }
 
-  // 时间戳转时间
-  static tampToSeektime(number) {
-    int hours = number ~/ 60;
-    int minutes = number % 60;
-
-    String formattedHours = hours.toString().padLeft(2, '0');
-    String formattedMinutes = minutes.toString().padLeft(2, '0');
-
-    return '$formattedHours:$formattedMinutes';
-  }
-
   static double getSheetHeight(BuildContext context) {
     double height = context.height.abs();
     double width = context.width.abs();