笔记功能初步完善

2026-03-06 13:49:13 +08:00
parent 3ebc71da7d
commit 17de976d4b
20 changed files with 3058 additions and 1951 deletions
--- a/lib/utils/book_dao.dart
+++ b/lib/utils/book_dao.dart
@@ -6,25 +6,17 @@ import 'database_helper.dart';
 class BookDao {
  final DatabaseHelper _dbHelper = DatabaseHelper.instance;

-  // 获取所有书籍记录
+  // 获取所有未删除的书籍记录
  Future<List<Book>> getAllBooks() async {
    final db = await _dbHelper.database;
-    final List<Map<String, dynamic>> maps = await db.query('books');
+    final List<Map<String, dynamic>> maps = await db.query(
+      'books',
+      where: 'is_deleted = ?',
+      whereArgs: [0],
+      orderBy: 'updated_at DESC',
+    );

-    return List.generate(maps.length, (i) {
-      return Book(
-        id: maps[i]['id'].toString(),
-        title: maps[i]['title'],
-        author: maps[i]['author'],
-        cover: maps[i]['cover'],
-        rating: maps[i]['rating']?.toDouble(),
-        status: maps[i]['status'],
-        readDate: maps[i]['read_date'] != null 
-            ? DateTime.parse(maps[i]['read_date']) 
-            : null,
-        note: maps[i]['note'],
-      );
-    });
+    return List.generate(maps.length, (i) => Book.fromJson(maps[i]));
  }

  // 根据状态筛选书籍记录
@@ -32,24 +24,25 @@ class BookDao {
    final db = await _dbHelper.database;
    final List<Map<String, dynamic>> maps = await db.query(
      'books',
-      where: 'status = ?',
-      whereArgs: [status],
+      where: 'status = ? AND is_deleted = ?',
+      whereArgs: [status, 0],
+      orderBy: 'updated_at DESC',
    );

-    return List.generate(maps.length, (i) {
-      return Book(
-        id: maps[i]['id'].toString(),
-        title: maps[i]['title'],
-        author: maps[i]['author'],
-        cover: maps[i]['cover'],
-        rating: maps[i]['rating']?.toDouble(),
-        status: maps[i]['status'],
-        readDate: maps[i]['read_date'] != null 
-            ? DateTime.parse(maps[i]['read_date']) 
-            : null,
-        note: maps[i]['note'],
-      );
-    });
+    return List.generate(maps.length, (i) => Book.fromJson(maps[i]));
+  }
+
+  // 根据ID获取书籍
+  Future<Book?> getBookById(String id) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'books',
+      where: 'id = ? AND is_deleted = ?',
+      whereArgs: [id, 0],
+    );
+
+    if (maps.isEmpty) return null;
+    return Book.fromJson(maps.first);
  }

  // 添加书籍记录
@@ -69,7 +62,21 @@ class BookDao {
    );
  }

-  // 删除书籍记录
+  // 软删除书籍记录
+  Future<int> softDeleteBook(String id) async {
+    final db = await _dbHelper.database;
+    return await db.update(
+      'books',
+      {
+        'is_deleted': 1,
+        'updated_at': DateTime.now().toIso8601String(),
+      },
+      where: 'id = ?',
+      whereArgs: [id],
+    );
+  }
+
+  // 彻底删除书籍记录
  Future<int> deleteBook(String id) async {
    final db = await _dbHelper.database;
    return await db.delete(
@@ -78,4 +85,43 @@ class BookDao {
      whereArgs: [id],
    );
  }
+
+  // 搜索书籍（标题、别名）
+  Future<List<Book>> searchBooks(String query) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'books',
+      where: '(title LIKE ? OR alternate_titles LIKE ?) AND is_deleted = ?',
+      whereArgs: ['%$query%', '%$query%', 0],
+      orderBy: 'updated_at DESC',
+    );
+
+    return List.generate(maps.length, (i) => Book.fromJson(maps[i]));
+  }
+
+  // 根据作者筛选
+  Future<List<Book>> getBooksByAuthor(String author) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'books',
+      where: 'authors LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$author%', 0],
+      orderBy: 'updated_at DESC',
+    );
+
+    return List.generate(maps.length, (i) => Book.fromJson(maps[i]));
+  }
+
+  // 根据类型筛选
+  Future<List<Book>> getBooksByGenre(String genre) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'books',
+      where: 'genres LIKE ? AND is_deleted = ?',
+      whereArgs: ['%$genre%', 0],
+      orderBy: 'updated_at DESC',
+    );
+
+    return List.generate(maps.length, (i) => Book.fromJson(maps[i]));
+  }
 }
--- a/lib/utils/database_helper.dart
+++ b/lib/utils/database_helper.dart
@@ -20,7 +20,7 @@ class DatabaseHelper {

    return await openDatabase(
      path,
-      version: 2,
+      version: 4,
      onCreate: _createDB,
      onUpgrade: _onUpgrade,
    );
@@ -32,6 +32,110 @@ class DatabaseHelper {
      // 升级movies表结构
      await _upgradeMoviesTableV2(db);
    }
+    if (oldVersion < 3) {
+      // 升级books表结构
+      await _upgradeBooksTableV3(db);
+    }
+    if (oldVersion < 4) {
+      // 升级notes表结构
+      await _upgradeNotesTableV4(db);
+    }
+  }
+  
+  /// 升级notes表到V4
+  Future<void> _upgradeNotesTableV4(Database db) async {
+    // 备份旧数据
+    final oldData = await db.query('notes');
+    
+    // 删除旧表
+    await db.execute('DROP TABLE IF EXISTS notes');
+    
+    // 创建新表
+    await db.execute('''
+      CREATE TABLE notes (
+        id TEXT PRIMARY KEY,
+        content TEXT NOT NULL,
+        content_type TEXT DEFAULT 'markdown',
+        tags TEXT,
+        created_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL
+      )
+    ''');
+    
+    // 迁移旧数据（将title合并到content中）
+    for (final row in oldData) {
+      try {
+        final now = DateTime.now().toIso8601String();
+        final title = row['title']?.toString() ?? '';
+        final content = row['content']?.toString() ?? '';
+        final combinedContent = title.isNotEmpty 
+            ? '# $title\n\n$content'
+            : content;
+        
+        await db.insert('notes', {
+          'id': row['id']?.toString() ?? DateTime.now().millisecondsSinceEpoch.toString(),
+          'content': combinedContent,
+          'content_type': 'markdown',
+          'tags': row['tags'] ?? '',
+          'created_at': row['created_at']?.toString() ?? now,
+          'updated_at': row['updated_at']?.toString() ?? now,
+        });
+      } catch (e) {
+        // 忽略迁移失败的记录
+      }
+    }
+  }
+  
+  /// 升级books表到V3
+  Future<void> _upgradeBooksTableV3(Database db) async {
+    // 备份旧数据
+    final oldData = await db.query('books');
+    
+    // 删除旧表
+    await db.execute('DROP TABLE IF EXISTS books');
+    
+    // 创建新表
+    await db.execute('''
+      CREATE TABLE books (
+        id TEXT PRIMARY KEY,
+        title TEXT NOT NULL,
+        cover_path TEXT,
+        authors TEXT,
+        alternate_titles TEXT,
+        publisher TEXT,
+        genres TEXT,
+        summary TEXT,
+        rating REAL,
+        status TEXT NOT NULL,
+        created_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL,
+        is_deleted INTEGER DEFAULT 0
+      )
+    ''');
+    
+    // 迁移旧数据
+    for (final row in oldData) {
+      try {
+        final now = DateTime.now().toIso8601String();
+        await db.insert('books', {
+          'id': row['id']?.toString() ?? DateTime.now().millisecondsSinceEpoch.toString(),
+          'title': row['title']?.toString() ?? '',
+          'cover_path': row['cover'],
+          'authors': row['author'] != null ? '["${row['author']}"]' : '[]',
+          'alternate_titles': '[]',
+          'publisher': null,
+          'genres': '[]',
+          'summary': row['note'],
+          'rating': row['rating'],
+          'status': row['status'] ?? 'want_to_read',
+          'created_at': now,
+          'updated_at': now,
+          'is_deleted': 0,
+        });
+      } catch (e) {
+        // 忽略迁移失败的记录
+      }
+    }
  }

  /// 升级movies表到V2
@@ -120,26 +224,31 @@ class DatabaseHelper {
    // 书籍表
    await db.execute('''
      CREATE TABLE books (
-        id $idType,
-        title $textType,
-        author TEXT,
-        cover TEXT,
+        id TEXT PRIMARY KEY,
+        title TEXT NOT NULL,
+        cover_path TEXT,
+        authors TEXT,
+        alternate_titles TEXT,
+        publisher TEXT,
+        genres TEXT,
+        summary TEXT,
        rating REAL,
-        status $textType,
-        read_date TEXT,
-        note TEXT
+        status TEXT NOT NULL,
+        created_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL,
+        is_deleted INTEGER DEFAULT 0
      )
    ''');

    // 笔记表
    await db.execute('''
      CREATE TABLE notes (
-        id $idType,
-        title $textType,
-        content $textType,
+        id TEXT PRIMARY KEY,
+        content TEXT NOT NULL,
+        content_type TEXT DEFAULT 'markdown',
        tags TEXT,
-        created_at $textType,
-        updated_at $textType
+        created_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL
      )
    ''');
  }
--- a/lib/utils/note_dao.dart
+++ b/lib/utils/note_dao.dart
@@ -14,31 +14,26 @@ class NoteDao {
      orderBy: 'updated_at DESC',
    );

-    return List.generate(maps.length, (i) {
-      return Note(
-        id: maps[i]['id'].toString(),
-        title: maps[i]['title'],
-        content: maps[i]['content'],
-        tags: maps[i]['tags'] != null 
-            ? List<String>.from(maps[i]['tags'].split(',')) 
-            : [],
-        createdAt: DateTime.parse(maps[i]['created_at']),
-        updatedAt: DateTime.parse(maps[i]['updated_at']),
-      );
-    });
+    return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
+  }
+
+  // 根据ID获取笔记
+  Future<Note?> getNoteById(String id) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'notes',
+      where: 'id = ?',
+      whereArgs: [id],
+    );
+
+    if (maps.isEmpty) return null;
+    return Note.fromJson(maps.first);
  }

  // 添加笔记
  Future<int> insertNote(Note note) async {
    final db = await _dbHelper.database;
-    return await db.insert('notes', {
-      'id': note.id,
-      'title': note.title,
-      'content': note.content,
-      'tags': note.tags.join(','),
-      'created_at': note.createdAt.toIso8601String(),
-      'updated_at': note.updatedAt.toIso8601String(),
-    });
+    return await db.insert('notes', note.toJson());
  }

  // 更新笔记
@@ -46,12 +41,7 @@ class NoteDao {
    final db = await _dbHelper.database;
    return await db.update(
      'notes',
-      {
-        'title': note.title,
-        'content': note.content,
-        'tags': note.tags.join(','),
-        'updated_at': note.updatedAt.toIso8601String(),
-      },
+      note.toJson(),
      where: 'id = ?',
      whereArgs: [note.id],
    );
@@ -66,4 +56,30 @@ class NoteDao {
      whereArgs: [id],
    );
  }
+
+  // 搜索笔记
+  Future<List<Note>> searchNotes(String query) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'notes',
+      where: 'content LIKE ? OR tags LIKE ?',
+      whereArgs: ['%$query%', '%$query%'],
+      orderBy: 'updated_at DESC',
+    );
+
+    return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
+  }
+
+  // 根据标签筛选
+  Future<List<Note>> getNotesByTag(String tag) async {
+    final db = await _dbHelper.database;
+    final List<Map<String, dynamic>> maps = await db.query(
+      'notes',
+      where: 'tags LIKE ?',
+      whereArgs: ['%$tag%'],
+      orderBy: 'updated_at DESC',
+    );
+
+    return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
+  }
 }