new learn mode stuff and match

Author: Maws7140

__mocks__/obsidian.ts

@@ -56,10 +56,10 @@ export class TFile {
   basename: string;
   extension: string;
 
-  constructor(path: string) {
-    this.path = path;
-    this.basename = path.split('/').pop()?.replace(/\.[^/.]+$/, '') || '';
-    this.extension = path.split('.').pop() || '';
+  constructor(path?: string) {
+    this.path = path || '';
+    this.basename = (this.path && this.path.split('/').pop()?.replace(/\.[^/.]+$/, '')) || '';
+    this.extension = (this.path && this.path.split('.').pop()) || '';
   }
 }
 
@@ -157,6 +157,24 @@ export class Modal {
   }
 }
 
+// Minimal SuggestModal mock implementation used in tests
+export class SuggestModal<T> extends Modal {
+  placeholder?: string;
+  constructor(app: App) {
+    super(app);
+  }
+  setPlaceholder(text: string): this {
+    this.placeholder = text;
+    return this;
+  }
+  open(): void {
+    // no-op for tests
+  }
+  close(): void {
+    // no-op for tests
+  }
+}
+
 export class Notice {
   message: string;
 

__tests__/browser-viewmodel.test.ts

@@ -383,7 +383,8 @@ describe('BrowserViewModel', () => {
     });
 
     it('should calculate cards due today', () => {
-      const now = new Date();
+      // Use a fixed midday reference to avoid day-boundary flakiness in CI/local timezones.
+      const now = new Date('2026-05-10T12:00:00.000Z');
       const cards: FlashlyCard[] = [
         createMockCard({ 
           fsrsCard: {

__tests__/deck-metadata.test.ts

@@ -0,0 +1,52 @@
+import { StorageService } from '../src/services/storage-service';
+import { createMockPlugin } from './setup';
+
+describe('Deck metadata (star/archive)', () => {
+  let mockPlugin: ReturnType<typeof createMockPlugin>;
+  let service: StorageService;
+
+  beforeEach(async () => {
+    mockPlugin = createMockPlugin();
+    mockPlugin.loadData.mockResolvedValue(null);
+    service = new StorageService(mockPlugin);
+    await service.load();
+  });
+
+  it('toggles starred state and persists it', async () => {
+    expect(service.isDeckStarred('Alpha')).toBe(false);
+    service.toggleDeckStarred('Alpha');
+    expect(service.isDeckStarred('Alpha')).toBe(true);
+
+    await service.save();
+    const saved = mockPlugin.saveData.mock.calls[0][0];
+    expect(saved.decks).toBeDefined();
+    expect(saved.decks.Alpha).toBeDefined();
+    expect(saved.decks.Alpha.starred).toBe(true);
+
+    // Reload into new instance
+    const reloadedPlugin = createMockPlugin();
+    reloadedPlugin.loadData.mockResolvedValue(saved);
+    const reloaded = new StorageService(reloadedPlugin);
+    await reloaded.load();
+    expect(reloaded.isDeckStarred('Alpha')).toBe(true);
+  });
+
+  it('toggles archived state and persists it', async () => {
+    expect(service.isDeckArchived('Beta')).toBe(false);
+    service.toggleDeckArchived('Beta');
+    expect(service.isDeckArchived('Beta')).toBe(true);
+
+    await service.save();
+    const saved = mockPlugin.saveData.mock.calls[0][0];
+    expect(saved.decks).toBeDefined();
+    expect(saved.decks.Beta).toBeDefined();
+    expect(saved.decks.Beta.archived).toBe(true);
+
+    // Reload into new instance
+    const reloadedPlugin = createMockPlugin();
+    reloadedPlugin.loadData.mockResolvedValue(saved);
+    const reloaded = new StorageService(reloadedPlugin);
+    await reloaded.load();
+    expect(reloaded.isDeckArchived('Beta')).toBe(true);
+  });
+});

__tests__/quiz-match.test.ts

@@ -0,0 +1,58 @@
+import { createEmptyCard } from 'ts-fsrs';
+import { FlashlyCard, createFlashlyCard } from '../src/models/card';
+import { QuizConfig, QuizQuestion, checkAnswer } from '../src/models/quiz';
+import { TraditionalQuizGenerator } from '../src/quiz/traditional-quiz-generator';
+
+describe('Match quiz support', () => {
+	it('generates a match question when enabled', () => {
+		const generator = new TraditionalQuizGenerator();
+		const cards: FlashlyCard[] = [
+			createFlashlyCard('Term 1', 'Definition 1', 'test1.md', 1, createEmptyCard(new Date())),
+			createFlashlyCard('Term 2', 'Definition 2', 'test2.md', 2, createEmptyCard(new Date())),
+			createFlashlyCard('Term 3', 'Definition 3', 'test3.md', 3, createEmptyCard(new Date())),
+			createFlashlyCard('Term 4', 'Definition 4', 'test4.md', 4, createEmptyCard(new Date()))
+		];
+
+		const config: QuizConfig = {
+			questionCount: 1,
+			includeMultipleChoice: false,
+			includeFillBlank: false,
+			includeTrueFalse: false,
+			includeMatch: true,
+			useAI: false
+		};
+
+		const questions = generator.generateQuestions(cards, config);
+
+		expect(questions).toHaveLength(1);
+		expect(questions[0].type).toBe('match');
+		expect(Array.isArray(questions[0].correctAnswer)).toBe(true);
+		if (Array.isArray(questions[0].correctAnswer)) {
+			expect(questions[0].correctAnswer).toHaveLength(4);
+			expect(questions[0].correctAnswer[0]).toHaveProperty('left');
+			expect(questions[0].correctAnswer[0]).toHaveProperty('right');
+		}
+	});
+
+	it('scores match answers independent of order', () => {
+		const question: QuizQuestion = {
+			id: 'q-match',
+			type: 'match',
+			prompt: 'Match pairs',
+			correctAnswer: [
+				{ left: 'A', right: '1' },
+				{ left: 'B', right: '2' }
+			]
+		};
+
+		expect(checkAnswer(question, [
+			{ left: 'B', right: '2' },
+			{ left: 'A', right: '1' }
+		])).toBe(true);
+
+		expect(checkAnswer(question, [
+			{ left: 'A', right: '1' },
+			{ left: 'B', right: '3' }
+		])).toBe(false);
+	});
+});

main.ts

@@ -32,7 +32,7 @@ export default class FlashlyPlugin extends Plugin {
 	exportService: ExportService;
 	exportCommand: ExportCommand;
 	replayTutorialCommand: ReplayTutorialCommand;
-	statusBarItem: HTMLElement;
+	statusBarItem: HTMLElement | null = null;
 	logger: Logger;
 
 	async onload() {
@@ -150,14 +150,19 @@ export default class FlashlyPlugin extends Plugin {
 			void this.activateBrowserView();
 		});
 
-		// Add status bar item
-		this.statusBarItem = this.addStatusBarItem();
-		this.updateStatusBar();
-
-		// Update status bar every 60 seconds
-		this.registerInterval(
-			window.setInterval(() => this.updateStatusBar(), 60000)
-		);
+		// Add status bar item when the platform exposes one.
+		try {
+			this.statusBarItem = this.addStatusBarItem();
+			this.updateStatusBar();
+
+			// Update status bar every 60 seconds only if it exists.
+			this.registerInterval(
+				window.setInterval(() => this.updateStatusBar(), 60000)
+			);
+		} catch (error) {
+			console.warn('Flashly: status bar unavailable on this platform', error);
+			this.statusBarItem = null;
+		}
 
 		// Add settings tab
 		this.addSettingTab(new FlashlySettingTab(this.app, this));

package-lock.json

@@ -87,6 +87,16 @@ class GenerateQuizModal extends Modal {
 				});
 			});
 
+		new Setting(contentEl)
+			.setName('Match pairs')
+			.setDesc('Include matching questions where you pair terms with definitions')
+			.addToggle(toggle => {
+				toggle.setValue(this.config.includeMatch ?? false);
+				toggle.onChange(value => {
+					this.config.includeMatch = value;
+				});
+			});
+
 		// Learn Mode
 		new Setting(contentEl)
 			.setName('Learn mode')
@@ -103,8 +113,8 @@ class GenerateQuizModal extends Modal {
 			.setName('Filter by decks')
 			.setDesc('Select which decks to include (leave all unchecked for all decks)');
 
-		// Get all available decks
-		const allCards = this.plugin.storage.getAllCards();
+		// Get all available decks (exclude archived)
+		const allCards = this.plugin.storage.getActiveCards();
 		const deckSet = new Set<string>();
 		allCards.forEach(card => {
 			if (card.deck) {
@@ -337,7 +347,7 @@ class GenerateQuizModal extends Modal {
 		}
 
 		// Get available cards
-		let availableCards = this.plugin.storage.getAllCards();
+		let availableCards = this.plugin.storage.getActiveCards();
 
 		// Apply deck filter if specified
 		if (this.config.deckFilter && this.config.deckFilter.length > 0) {
@@ -526,7 +536,7 @@ class GenerateQuizModal extends Modal {
 
 		try {
 			// Validate at least one question type
-			if (!this.config.includeMultipleChoice && !this.config.includeFillBlank && !this.config.includeTrueFalse) {
+			if (!this.config.includeMultipleChoice && !this.config.includeFillBlank && !this.config.includeTrueFalse && !this.config.includeMatch) {
 				new Notice('Please select at least one question type');
 				return;
 			}
@@ -536,7 +546,7 @@ class GenerateQuizModal extends Modal {
 			const title = titleInput?.value || 'Untitled Quiz';
 
 			// Get cards
-			let cards = this.plugin.storage.getAllCards();
+			let cards = this.plugin.storage.getActiveCards();
 
 			// Apply card selection filter if AI is enabled and cards are selected
 			if (this.config.useAI && this.config.selectedCardIds && this.config.selectedCardIds.length > 0) {

src/commands/generate-quiz-command.ts

@@ -35,7 +35,7 @@ export class RefreshDecksCommand {
 		}
 
 		const deckSet = selection ? new Set(selection.map(deck => deck.toLowerCase())) : null;
-		const cards = this.storage.getAllCards();
+		const cards = this.storage.getActiveCards();
 		const now = new Date();
 		let updatedCount = 0;
 

src/commands/refresh-decks-command.ts

@@ -29,7 +29,7 @@ export class ScanCommand {
    * Get command ID for registration
    */
   getId(): string {
-    return 'scan-vault';
+    return 'flashly-scan-vault';
   }
 
   /**

src/commands/scan-command.ts

@@ -3,7 +3,15 @@
  * Supports both traditional and AI-generated quizzes
  */
 
-export type QuizQuestionType = 'multiple-choice' | 'fill-blank' | 'true-false' | 'audio-prompt';
+export type QuizQuestionType = 'multiple-choice' | 'fill-blank' | 'true-false' | 'audio-prompt' | 'match';
+
+export interface QuizMatchPair {
+	left: string;
+	right: string;
+	sourceCardId?: string;
+}
+
+export type QuizAnswer = string | number | QuizMatchPair[];
 
 export type QuizGenerationMethod = 'traditional' | 'ai-generated';
 
@@ -14,8 +22,8 @@ export interface QuizQuestion {
 	type: QuizQuestionType;              // Question type
 	prompt: string;                      // Question text
 	options?: string[];                  // Options for multiple choice (undefined for others)
-	correctAnswer: string | number;      // Correct answer (string or index)
-	userAnswer?: string | number;        // User's answer
+	correctAnswer: QuizAnswer;           // Correct answer (string, index, or pairs)
+	userAnswer?: QuizAnswer;              // User's answer
 	correct?: boolean;                   // Whether user answered correctly
 	sourceCardId?: string;               // Original card ID (for traditional)
 	explanation?: string;                // Explanation for the answer (AI can provide this)
@@ -55,6 +63,7 @@ export interface QuizConfig {
 	includeMultipleChoice: boolean;      // Include MC questions
 	includeFillBlank: boolean;           // Include fill-in-blank questions
 	includeTrueFalse: boolean;           // Include true/false questions
+	includeMatch?: boolean;              // Include matching questions
 	deckFilter?: string[];               // Optional deck filter
 	useAI: boolean;                      // Use AI generation
 	aiProvider?: AIProvider;             // AI provider if using AI
@@ -169,7 +178,23 @@ export function calculateQuizScore(quiz: Quiz): { score: number; correctCount: n
 /**
  * Check if question answer is correct
  */
-export function checkAnswer(question: QuizQuestion, userAnswer: string | number): boolean {
+
+function normalizeMatchPair(pair: QuizMatchPair): string {
+	return `${pair.left.trim().toLowerCase()}=>${pair.right.trim().toLowerCase()}`;
+}
+
+export function checkAnswer(question: QuizQuestion, userAnswer: QuizAnswer): boolean {
+	if (question.type === 'match' && Array.isArray(question.correctAnswer) && Array.isArray(userAnswer)) {
+		const correctPairs = [...question.correctAnswer].map(normalizeMatchPair).sort();
+		const userPairs = [...userAnswer].map(normalizeMatchPair).sort();
+
+		if (correctPairs.length !== userPairs.length) {
+			return false;
+		}
+
+		return correctPairs.every((pair, index) => pair === userPairs[index]);
+	}
+
 	if (question.type === 'multiple-choice' && typeof question.correctAnswer === 'number') {
 		return userAnswer === question.correctAnswer;
 	}
@@ -189,6 +214,7 @@ export const DEFAULT_QUIZ_CONFIG: QuizConfig = {
 	includeMultipleChoice: true,
 	includeFillBlank: true,
 	includeTrueFalse: true,
+	includeMatch: false,
 	useAI: false,
 	learnMode: false
 };