Merge branch 'main' into main

Author: OctagonalStar

.github/workflows/FlutterBuildTest.yml

@@ -0,0 +1,41 @@
+name: Flutter Build(PR)
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build-windows:
+    name: Build Windows App
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: '3.35.5'
+
+      - run: flutter pub get
+      - run: flutter build windows
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: windows-build
+          path: build/windows/x64/runner/Release
+
+  build-web:
+    name: Build Flutter Web
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+      - run: flutter pub get
+      - run: flutter build web --release
+      - uses: actions/upload-artifact@v4
+        with:
+          name: web-build
+          path: build/web

CHANGELOG.md

@@ -2,10 +2,21 @@
 
 ## v?.?.?? - ????-??-?? - (??????)
 
+### Added
+
+- 添加了日志捕获 [#23](https://github.com/OctagonalStar/arabic_learning/issues/23)
+- 添加了调试页面
+- 添加了个性化FSRS预设页面 [#26](https://github.com/OctagonalStar/arabic_learning/issues/26)
+
 ### Improvement
 
 - 优化了网页端字体加载逻辑
 
+### Fix
+
+- 修复了FSRS算法对已经过期的单词无法计数的问题
+- 修复了日志中FSRS信息输出错误的问题
+
 ## v0.1.11 - 2025-11-28 - (000111)
 
 ### Added

lib/funcs/fsrs_func.dart

@@ -1,44 +1,59 @@
 import 'dart:convert';
-import 'package:arabic_learning/package_replacement/storage.dart';
+
+import 'package:arabic_learning/funcs/utili.dart';
 import 'package:fsrs/fsrs.dart';
+import 'package:logging/logging.dart';
+
+import 'package:arabic_learning/package_replacement/storage.dart';
 
 class FSRS { 
   List<Card> cards = [];
   List<ReviewLog> reviewLogs = [];
   late Scheduler scheduler;
-  late SharedPreferences prefs;
-  late Rater rater;
+  late final SharedPreferences prefs;
   late Map<String, dynamic> settingData;
-
+  late final Logger logger;
   // index != cardId; cardId = wordId = the index of word in global.wordData[words]
 
-  Future<bool> init() async {
-    prefs = await SharedPreferences.getInstance();
+  bool init({required SharedPreferences outerPrefs}) {
+    prefs = outerPrefs;
+    logger = Logger('FSRS');
+    logger.fine("构建FSRS模块");
+    settingData = {
+      'enabled': false,
+      'scheduler': {},
+      'cards': [],
+      'reviewLog': [],
+      'rater': {
+        "desiredRetention": 0.9,
+        "easyDuration": 3000,
+        "goodDuration": 6000
+      },
+    };
+
     if(!prefs.containsKey("fsrsData")) {
-      settingData = {
-        'enabled': false,
-        'scheduler': {},
-        'cards': [],
-        'reviewLog': [],
-        'rater': {'scheme': 0},
-      };
+      logger.info("未发现FSRS配置，加载默认配置");
       prefs.setString("fsrsData", jsonEncode(settingData));
       return false;
+    } else {
+      settingData = deepMerge(settingData, jsonDecode(prefs.getString("fsrsData")!));
     }
-    settingData = jsonDecode(prefs.getString("fsrsData")!) as Map<String, dynamic>;
+    
     if(isEnabled()){
       scheduler = Scheduler.fromMap(settingData['scheduler']);
       for(int i = 0; i < settingData['cards'].length; i++) {
         cards.add(Card.fromMap(settingData['cards'][i]));
         reviewLogs.add(ReviewLog.fromMap(settingData['reviewLog'][i]));
       }
-      rater = Rater(settingData['rater']['scheme']);
+      logger.info("FSRS配置加载完成");
       return true;
     }
+    logger.info("FSRS未启用");
     return false;
   }
 
   void save() async {
+    logger.info("正在保存FSRS配置");
     settingData['scheduler'] = scheduler.toMap();
     List cardsCache = [];
     List logCache = [];
@@ -55,33 +70,33 @@ class FSRS {
     return settingData['enabled'];
   }
 
-  Future<void> createScheduler(int scheme) async {
-    await init();
-    List<double> desiredRetention = [0.85, 0.9, 0.95, 0.95, 0.99];
-    scheduler = Scheduler(desiredRetention: desiredRetention[scheme]);
-    settingData['rater']['scheme'] = scheme;
+  void createScheduler({required SharedPreferences prefs}) {
+    logger.info("初始化scheduler，选择相关配置 ${settingData["rater"].toString()}");
+    scheduler = Scheduler(desiredRetention: settingData["rater"]["desiredRetention"]);
     settingData['enabled'] = true;
     settingData['scheduler'] = scheduler.toMap();
-    rater = Rater(scheme);
     save();
   }
 
   int willDueIn(int index) {
-    return cards[index].due.difference(DateTime.now()).inDays;
+    return cards[index].due.toLocal().difference(DateTime.now()).inDays;
   }
 
   void reviewCard(int wordId, int duration, bool isCorrect) {
+    logger.fine("记录复习卡片: Id: $wordId; duration: $duration; isCorrect: $isCorrect");
     int index = cards.indexWhere((Card card) => card.cardId == wordId); // 避免有时候cardId != wordId
-    final (:card, :reviewLog) = scheduler.reviewCard(cards[index], rater.calculate(duration, isCorrect));
+    logger.fine("定位复习卡片地址: $index, 目前阶段: ${cards[index].step}, 难度: ${cards[index].difficulty}, 稳定: ${cards[index].stability}, 过期时间(+8): ${cards[index].due.toLocal()}");
+    final (:card, :reviewLog) = scheduler.reviewCard(cards[index], calculate(duration, isCorrect), reviewDateTime: DateTime.now().toUtc(), reviewDuration: duration);
     cards[index] = card;
     reviewLogs[index] = reviewLog;
+    logger.fine("卡片 $index 复习后: 目前阶段: ${cards[index].step}, 难度: ${cards[index].difficulty}, 稳定: ${cards[index].stability}, 过期时间(+8): ${cards[index].due.toLocal()}");
     save();
   }
 
   int getWillDueCount() {
     int dueCards = 0;
     for(int i = 0; i < cards.length; i++) {
-      if(willDueIn(i) == 0) {
+      if(willDueIn(i) < 1) {
         dueCards++;
       }
     }
@@ -91,7 +106,7 @@ class FSRS {
   int getLeastDueCard() {
     int leastDueIndex = 0;
     for(int i = 1; i < cards.length; i++) {
-      if(cards[i].due.isBefore(cards[leastDueIndex].due) && cards[i].due.difference(DateTime.now()) < Duration(days: 1)) {
+      if(cards[i].due.toLocal().isBefore(cards[leastDueIndex].due.toLocal()) && cards[i].due.toLocal().difference(DateTime.now()) < Duration(days: 1)) {
         leastDueIndex = i;
       }
     }
@@ -112,31 +127,22 @@ class FSRS {
     reviewLogs.add(ReviewLog(cardId: wordId, rating: Rating.good, reviewDateTime: DateTime.now()));
     save();
   }
-}
-
-class Rater {
-  Rating get easy => Rating.easy;
-  Rating get good => Rating.good;
-  Rating get hard => Rating.hard;
-  Rating get forget => Rating.again;
-
-  late int scheme;
-
-  Rater(this.scheme);
-
-  static const List<List<int>> _difficultyScheme = [
-    [3000, 8000], // Easy
-    [2000, 6000], // Fine
-    [1500, 4000], // OK~
-    [1000, 2000], // Emm...
-    [1000, 1500], // Impossible
-  ];
 
   Rating calculate(int duration, bool isCorrect) {
     // duration in milliseconds
-    if (!isCorrect) return Rating.again;
-    if (duration < _difficultyScheme[scheme][0]) return Rating.easy;
-    if (duration < _difficultyScheme[scheme][1]) return Rating.good;
+    if (!isCorrect) {
+      logger.fine("计算得分: again");
+      return Rating.again;
+    }
+    if (duration < settingData['rater']['easyDuration']) {
+      logger.fine("计算得分: easy");
+      return Rating.easy;
+    }
+    if (duration < settingData['rater']['goodDuration']) {
+      logger.fine("计算得分: good");
+      return Rating.good;
+    }
+    logger.fine("计算得分: hard");
     return Rating.hard;
   }
 }

lib/funcs/sync.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:typed_data' show Uint8List;
 
-import 'package:flutter/material.dart';
 import 'package:webdav_client/webdav_client.dart';
+import 'package:logging/logging.dart';
 
 import 'package:arabic_learning/package_replacement/storage.dart' show SharedPreferences;
 
@@ -17,8 +17,12 @@ class WebDAV {
   bool isWriteable = false;
 
   late Client client;
+  final Logger logger = Logger("WebDAV");
 
   static Future<List<dynamic>> test(String uri, String user, {String password = ''}) async {
+    final Logger tempLogger = Logger("WebDAV_Test");
+    tempLogger.info("进行WebDAV测试");
+    tempLogger.fine("测试uri: $uri");
     Client tempClient = newClient(
       uri,
       user: user,
@@ -34,29 +38,39 @@ class WebDAV {
       tempClient.setConnectTimeout(8000);
       tempClient.setSendTimeout(60000);
       tempClient.setReceiveTimeout(60000);
+      tempLogger.fine("完成基础设置");
     } catch (e) {
+      tempLogger.warning("基础设置中出现错误: $e");
       return [false, false, "base setting error: $e"];
     }
     try{
       await tempClient.ping(); // test for connection
+      tempLogger.fine("PING: 可达性测试成功");
     } catch (e) {
+      tempLogger.warning("PING: 可达性测试错误: $e");
       return [false, false, "remote server didn't response: $e"];
     }
     try {
       await tempClient.readDir('/'); // test for read
+      tempLogger.fine("READ: 可读性测试成功");
     } catch (e) {
+      tempLogger.warning("PING: 可读性测试错误: $e");
       return [true, false, 'no read access: $e'];
     }
     try{
       await tempClient.write("TestFile", Uint8List(64)); // test for write
       await tempClient.remove("TestFile");
+      tempLogger.fine("WRITE: 可写性测试成功");
     } catch (e) {
+      tempLogger.warning("PING: 可写性测试错误: $e");
       return [true, false, 'no write access: $e'];
     }
+    tempLogger.info("所有测试均通过");
     return [true, true, 'ok'];
   } 
 
   Future<void> connect() async {
+    logger.info("正在链接: $uri");
     try{
       client = newClient(
         uri,
@@ -75,24 +89,39 @@ class WebDAV {
       isWriteable = true;
       await client.remove("TestFile");
     } catch (e) {
-      debugPrint(e.toString());
+      logger.warning("链接中出现错误: $e");
+      rethrow;
     }
   }
 
-  Future<bool> upload(SharedPreferences pref,{bool force = false}) async {
-    if(isWriteable || force) {
-      await client.write("arabic_learning.bak", utf8.encode(jsonEncode(pref.export())));
-      return true;
+  Future<void> upload(SharedPreferences pref,{bool force = false}) async {
+    logger.info("开始上传文件: 服务可写: $isWriteable; force: $force");
+    try {
+      if(isWriteable || force) {
+        await client.write("arabic_learning.bak", utf8.encode(jsonEncode(pref.export())));
+        logger.info("文件上传成功");
+        return;
+      }
+      throw Exception("服务不可写，取消上传");
+    } catch (e) {
+      logger.warning("WebDAV上传失败: $e");
+      rethrow;
     }
-    return false;
   }
 
-  Future<bool> download(SharedPreferences pref,{bool force = false}) async {
-    if(isReadable || force) {
-      Map<String, dynamic> file = jsonDecode(utf8.decode(await client.read("arabic_learning.bak")));
-      pref.recovery(file);
-      return true;
+  Future<void> download(SharedPreferences pref,{bool force = false}) async {
+    logger.info("开始恢复文件: 服务可读: $isReadable; force: $force");
+    try {
+      if(isReadable || force) {
+        Map<String, dynamic> file = jsonDecode(utf8.decode(await client.read("arabic_learning.bak")));
+        logger.fine("文件下载成功，开始恢复");
+        pref.recovery(file);
+        return;
+      }
+      throw Exception("服务不可读，取消恢复");
+    } catch (e) {
+      logger.warning("WebDAV恢复失败: $e");
+      rethrow;
     }
-    return false;
   }
 }