Ungoing refactoring

src/views/dict_view.rs

@@ -5,58 +5,13 @@ use ratatui::widgets::{Block, Borders, List, ListItem, Paragraph};
 use ratatui::Frame;
 
 use crate::app::App;
+use crate::model::categories::{get_category_name, CatEntry, CATEGORIES};
 use crate::model::{Word, WORDS};
 use crate::state::DictFocus;
 use crate::theme;
 
-enum CatEntry {
-    Section(&'static str),
-    Category(&'static str),
-}
-
 use CatEntry::{Category, Section};
 
-const CATEGORIES: &[CatEntry] = &[
-    // Forth core
-    Section("Forth"),
-    Category("Stack"),
-    Category("Arithmetic"),
-    Category("Comparison"),
-    Category("Logic"),
-    Category("Control"),
-    Category("Variables"),
-    Category("Probability"),
-    Category("Definitions"),
-    // Live coding
-    Section("Live Coding"),
-    Category("Sound"),
-    Category("Time"),
-    Category("Context"),
-    Category("Music"),
-    Category("LFO"),
-    // Synthesis
-    Section("Synthesis"),
-    Category("Oscillator"),
-    Category("Wavetable"),
-    Category("Generator"),
-    Category("Envelope"),
-    Category("Sample"),
-    // Effects
-    Section("Effects"),
-    Category("Filter"),
-    Category("FM"),
-    Category("Modulation"),
-    Category("Mod FX"),
-    Category("Lo-fi"),
-    Category("Stereo"),
-    Category("Delay"),
-    Category("Reverb"),
-    // External I/O
-    Section("I/O"),
-    Category("MIDI"),
-    Category("Desktop"),
-];
-
 pub fn render(frame: &mut Frame, app: &App, area: Rect) {
     let [header_area, body_area] =
         Layout::vertical([Constraint::Length(5), Constraint::Fill(1)]).areas(area);
@@ -165,17 +120,6 @@ fn render_categories(frame: &mut Frame, app: &App, area: Rect, dimmed: bool) {
     frame.render_widget(list, area);
 }
 
-fn get_category_name(index: usize) -> &'static str {
-    CATEGORIES
-        .iter()
-        .filter_map(|e| match e {
-            Category(name) => Some(*name),
-            Section(_) => None,
-        })
-        .nth(index)
-        .unwrap_or("Unknown")
-}
-
 fn render_words(frame: &mut Frame, app: &App, area: Rect, is_searching: bool) {
     let theme = theme::get();
     let focused = app.ui.dict_focus == DictFocus::Words;
@@ -299,9 +243,3 @@ fn render_search_bar(frame: &mut Frame, app: &App, area: Rect) {
     frame.render_widget(Paragraph::new(vec![line]), area);
 }
 
-pub fn category_count() -> usize {
-    CATEGORIES
-        .iter()
-        .filter(|e| matches!(e, Category(_)))
-        .count()
-}

src/views/help_view.rs

@@ -7,10 +7,13 @@ use ratatui::Frame;
 use tui_big_text::{BigText, PixelSize};
 
 use crate::app::App;
+use crate::model::docs::{get_topic, DocEntry, DOCS};
 use crate::state::HelpFocus;
 use crate::theme;
 use crate::views::highlight;
 
+use DocEntry::{Section, Topic};
+
 struct AppTheme;
 
 impl MarkdownTheme for AppTheme {
@@ -83,74 +86,6 @@ impl CodeHighlighter for ForthHighlighter {
     }
 }
 
-enum DocEntry {
-    Section(&'static str),
-    Topic(&'static str, &'static str),
-}
-
-use DocEntry::{Section, Topic};
-
-const DOCS: &[DocEntry] = &[
-    // Getting Started
-    Section("Getting Started"),
-    Topic("Welcome", include_str!("../../docs/welcome.md")),
-    Topic("Moving Around", include_str!("../../docs/navigation.md")),
-    Topic(
-        "How Does It Work?",
-        include_str!("../../docs/how_it_works.md"),
-    ),
-    Topic(
-        "Banks & Patterns",
-        include_str!("../../docs/banks_patterns.md"),
-    ),
-    Topic("Stage / Commit", include_str!("../../docs/staging.md")),
-    Topic("Using the Sequencer", include_str!("../../docs/grid.md")),
-    Topic("Editing a Step", include_str!("../../docs/editing.md")),
-    // Forth fundamentals
-    Section("Forth"),
-    Topic("About Forth", include_str!("../../docs/about_forth.md")),
-    Topic("The Dictionary", include_str!("../../docs/dictionary.md")),
-    Topic("The Stack", include_str!("../../docs/stack.md")),
-    Topic("Creating Words", include_str!("../../docs/definitions.md")),
-    Topic("Oddities", include_str!("../../docs/oddities.md")),
-    // Audio Engine
-    Section("Audio Engine"),
-    Topic("Introduction", include_str!("../../docs/engine_intro.md")),
-    Topic("Settings", include_str!("../../docs/engine_settings.md")),
-    Topic("Sources", include_str!("../../docs/engine_sources.md")),
-    Topic("Samples", include_str!("../../docs/engine_samples.md")),
-    Topic("Wavetables", include_str!("../../docs/engine_wavetable.md")),
-    Topic("Filters", include_str!("../../docs/engine_filters.md")),
-    Topic(
-        "Modulation",
-        include_str!("../../docs/engine_modulation.md"),
-    ),
-    Topic(
-        "Distortion",
-        include_str!("../../docs/engine_distortion.md"),
-    ),
-    Topic("Space & Time", include_str!("../../docs/engine_space.md")),
-    Topic("Words & Sounds", include_str!("../../docs/engine_words.md")),
-    // MIDI
-    Section("MIDI"),
-    Topic("Introduction", include_str!("../../docs/midi_intro.md")),
-    Topic("MIDI Output", include_str!("../../docs/midi_output.md")),
-    Topic("MIDI Input", include_str!("../../docs/midi_input.md")),
-];
-
-pub fn topic_count() -> usize {
-    DOCS.iter().filter(|e| matches!(e, Topic(_, _))).count()
-}
-
-fn get_topic(index: usize) -> Option<(&'static str, &'static str)> {
-    DOCS.iter()
-        .filter_map(|e| match e {
-            Topic(name, content) => Some((*name, *content)),
-            Section(_) => None,
-        })
-        .nth(index)
-}
-
 pub fn render(frame: &mut Frame, app: &App, area: Rect) {
     let [topics_area, content_area] =
         Layout::horizontal([Constraint::Length(24), Constraint::Fill(1)]).areas(area);
@@ -386,22 +321,3 @@ fn find_bytes(haystack: &[u8], needle: &[u8]) -> Option<usize> {
     haystack.windows(needle.len()).position(|w| w == needle)
 }
 
-/// Find first line matching query across all topics. Returns (topic_index, line_index).
-pub fn find_match(query: &str) -> Option<(usize, usize)> {
-    let query = query.to_lowercase();
-    for (topic_idx, (_, content)) in DOCS
-        .iter()
-        .filter_map(|e| match e {
-            Topic(name, content) => Some((*name, *content)),
-            Section(_) => None,
-        })
-        .enumerate()
-    {
-        for (line_idx, line) in content.lines().enumerate() {
-            if line.to_lowercase().contains(&query) {
-                return Some((topic_idx, line_idx));
-            }
-        }
-    }
-    None
-}