patch of refactor phase 1: extract view modules with Action pattern · round #0 · pull #2 · oskar.tngl.sh/desktop-test

+21

CHANGELOG.md

···

       5
       5
        
       we tell the story of what we're building.

     

       6
       6
        
       

     

       7
       7
        
       

     

       8
       8
       +
       ---

     

       9
       9
       +
       

     

       10
       10
       +
       2025-10-25 (continued)

     

       11
       11
       +
       ----------------------

     

       12
       12
       +
       

     

       13
       13
       +
       refactored architecture (phase 1/3): extracted view modules with Action pattern

     

       14
       14
       +
       

     

       15
       15
       +
       following iced docs "Scaling Applications" pattern, separated view concerns from main state. created channels_view.rs and tracks_view.rs modules, each with their own State, Message enum, and Action enum for parent communication.

     

       16
       16
       +
       

     

       17
       17
       +
       improvements:

     

       18
       18
       +
         - #refactor extracted channels_view module (State, Message, Action with ShowChannelTracks)

     

       19
       19
       +
         - #refactor extracted tracks_view module (State, Message, Action, multi-select logic)

     

       20
       20
       +
         - #refactor moved filtering/sorting logic into view modules (filtered_channels, sorted_channels, filtered_tracks, sorted_tracks)

     

       21
       21
       +
         - #refactor updated main update() to route view messages and handle Actions

     

       22
       22
       +
         - #refactor view state stored in main State (channels_view_state, tracks_view_state)

     

       23
       23
       +
         - #pattern follows iced composable architecture (update returns Action, parent handles side effects)

     

       24
       24
       +
         - #cleanup removed duplicate code from main.rs (render functions simplified, matches_query removed)

     

       25
       25
       +
         - #code reduced main.rs complexity (view logic encapsulated, cleaner message routing)

     

       26
       26
       +
       

     

       27
       27
       +
       benefits: clear separation of concerns, testable view logic, type-safe transitions via Actions. prepares for phase 2 (PaneContent enum) and phase 3 (DataStore separation).

     

       28
       28
       +
       

     

       8
       29
        
       ---

     

       9
       30
        
       

     

       10
       31
        
       2025-10-25

+193

src/channels_view.rs

···

       1
       1
       +
       use crate::channel::Channel;

     

       2
       2
       +
       use crate::palette::Palette;

     

       3
       3
       +
       use crate::view;

     

       4
       4
       +
       use iced::widget::{column, container, horizontal_rule, scrollable, text};

     

       5
       5
       +
       use iced::{Element, Length, Theme};

     

       6
       6
       +
       

     

       7
       7
       +
       #[derive(Debug, Clone)]

     

       8
       8
       +
       pub struct State {

     

       9
       9
       +
           pub selected_channel: Option<usize>,

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       impl Default for State {

     

       13
       13
       +
           fn default() -> Self {

     

       14
       14
       +
               Self {

     

       15
       15
       +
                   selected_channel: None,

     

       16
       16
       +
               }

     

       17
       17
       +
           }

     

       18
       18
       +
       }

     

       19
       19
       +
       

     

       20
       20
       +
       #[derive(Debug, Clone)]

     

       21
       21
       +
       pub enum Message {

     

       22
       22
       +
           ChannelSelected(usize),

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       #[derive(Debug, Clone)]

     

       26
       26
       +
       pub enum Action {

     

       27
       27
       +
           None,

     

       28
       28
       +
           ShowChannelTracks(String, String),

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       impl State {

     

       32
       32
       +
           pub fn new() -> Self {

     

       33
       33
       +
               Self::default()

     

       34
       34
       +
           }

     

       35
       35
       +
       

     

       36
       36
       +
           pub fn update(&mut self, message: Message, channels: &[Channel]) -> Action {

     

       37
       37
       +
               match message {

     

       38
       38
       +
                   Message::ChannelSelected(idx) => {

     

       39
       39
       +
                       self.selected_channel = Some(idx);

     

       40
       40
       +
                       if let Some(channel) = channels.get(idx) {

     

       41
       41
       +
                           Action::ShowChannelTracks(channel.slug.clone(), channel.name.clone())

     

       42
       42
       +
                       } else {

     

       43
       43
       +
                           Action::None

     

       44
       44
       +
                       }

     

       45
       45
       +
                   }

     

       46
       46
       +
               }

     

       47
       47
       +
           }

     

       48
       48
       +
       

     

       49
       49
       +
           pub fn view<'a>(

     

       50
       50
       +
               &'a self,

     

       51
       51
       +
               all_channels: &'a [Channel],

     

       52
       52
       +
               view_def: &'a view::View,

     

       53
       53
       +
               all_tracks: &'a [crate::track::Track],

     

       54
       54
       +
               palette: &'a Palette,

     

       55
       55
       +
           ) -> Element<'a, Message> {

     

       56
       56
       +
               let channels = sorted_channels(

     

       57
       57
       +
                   filtered_channels(all_channels, view_def),

     

       58
       58
       +
                   view_def,

     

       59
       59
       +
                   all_tracks,

     

       60
       60
       +
               );

     

       61
       61
       +
               let list = channels

     

       62
       62
       +
                   .iter()

     

       63
       63
       +
                   .fold(column![].spacing(0), |col, (idx, channel)| {

     

       64
       64
       +
                       let is_selected = self.selected_channel == Some(*idx);

     

       65
       65
       +
                       let channel_info = format!("{} ({})", channel.name, channel.track_count);

     

       66
       66
       +
       

     

       67
       67
       +
                       let item = container(text(channel_info).size(14))

     

       68
       68
       +
                           .padding(8)

     

       69
       69
       +
                           .width(Length::Fill)

     

       70
       70
       +
                           .style(move |_theme: &Theme| {

     

       71
       71
       +
                               if is_selected {

     

       72
       72
       +
                                   container::Style {

     

       73
       73
       +
                                       background: Some(iced::Background::Color(palette.gray3)),

     

       74
       74
       +
                                       ..Default::default()

     

       75
       75
       +
                                   }

     

       76
       76
       +
                               } else {

     

       77
       77
       +
                                   container::Style::default()

     

       78
       78
       +
                               }

     

       79
       79
       +
                           });

     

       80
       80
       +
       

     

       81
       81
       +
                       let button = iced::widget::button(item)

     

       82
       82
       +
                           .on_press(Message::ChannelSelected(*idx))

     

       83
       83
       +
                           .padding(0)

     

       84
       84
       +
                           .style(|theme: &Theme, _status| iced::widget::button::Style {

     

       85
       85
       +
                               background: None,

     

       86
       86
       +
                               text_color: theme.palette().text,

     

       87
       87
       +
                               border: iced::Border::default(),

     

       88
       88
       +
                               shadow: iced::Shadow::default(),

     

       89
       89
       +
                           });

     

       90
       90
       +
       

     

       91
       91
       +
                       let col = col.push(button);

     

       92
       92
       +
                       col.push(

     

       93
       93
       +
                           horizontal_rule(1).style(move |_theme: &Theme| iced::widget::rule::Style {

     

       94
       94
       +
                               color: palette.gray3,

     

       95
       95
       +
                               width: 1,

     

       96
       96
       +
                               radius: 0.0.into(),

     

       97
       97
       +
                               fill_mode: iced::widget::rule::FillMode::Full,

     

       98
       98
       +
                           }),

     

       99
       99
       +
                       )

     

       100
       100
       +
                   });

     

       101
       101
       +
       

     

       102
       102
       +
               let content = scrollable(list);

     

       103
       103
       +
       

     

       104
       104
       +
               container(content)

     

       105
       105
       +
                   .width(Length::Fill)

     

       106
       106
       +
                   .height(Length::Fill)

     

       107
       107
       +
                   .style(move |_theme: &Theme| container::Style {

     

       108
       108
       +
                       background: Some(iced::Background::Color(palette.gray4)),

     

       109
       109
       +
                       ..Default::default()

     

       110
       110
       +
                   })

     

       111
       111
       +
                   .into()

     

       112
       112
       +
           }

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       115
       115
       +
       pub fn filtered_channels<'a>(

     

       116
       116
       +
           channels: &'a [Channel],

     

       117
       117
       +
           view: &view::View,

     

       118
       118
       +
       ) -> Vec<(usize, &'a Channel)> {

     

       119
       119
       +
           channels

     

       120
       120
       +
               .iter()

     

       121
       121
       +
               .enumerate()

     

       122
       122
       +
               .filter(|(_idx, channel)| {

     

       123
       123
       +
                   if let Some(ref slug) = view.filter.slug {

     

       124
       124
       +
                       if &channel.slug != slug {

     

       125
       125
       +
                           return false;

     

       126
       126
       +
                       }

     

       127
       127
       +
                   }

     

       128
       128
       +
       

     

       129
       129
       +
                   if let Some(min) = view.filter.track_count_min {

     

       130
       130
       +
                       if channel.track_count < min {

     

       131
       131
       +
                           return false;

     

       132
       132
       +
                       }

     

       133
       133
       +
                   }

     

       134
       134
       +
       

     

       135
       135
       +
                   if let Some(max) = view.filter.track_count_max {

     

       136
       136
       +
                       if channel.track_count > max {

     

       137
       137
       +
                           return false;

     

       138
       138
       +
                       }

     

       139
       139
       +
                   }

     

       140
       140
       +
       

     

       141
       141
       +
                   if !view.filter.search_query.is_empty()

     

       142
       142
       +
                       && !matches_query(&channel.name, &view.filter.search_query)

     

       143
       143
       +
                       && !matches_query(&channel.slug, &view.filter.search_query)

     

       144
       144
       +
                   {

     

       145
       145
       +
                       return false;

     

       146
       146
       +
                   }

     

       147
       147
       +
       

     

       148
       148
       +
                   true

     

       149
       149
       +
               })

     

       150
       150
       +
               .collect()

     

       151
       151
       +
       }

     

       152
       152
       +
       

     

       153
       153
       +
       pub fn sorted_channels<'a>(

     

       154
       154
       +
           channels: Vec<(usize, &'a Channel)>,

     

       155
       155
       +
           view: &view::View,

     

       156
       156
       +
           all_tracks: &[crate::track::Track],

     

       157
       157
       +
       ) -> Vec<(usize, &'a Channel)> {

     

       158
       158
       +
           let mut sorted = channels;

     

       159
       159
       +
       

     

       160
       160
       +
           match view.sort.field {

     

       161
       161
       +
               view::SortField::Name => {

     

       162
       162
       +
                   sorted.sort_by(|(_, a), (_, b)| a.name.cmp(&b.name));

     

       163
       163
       +
               }

     

       164
       164
       +
               view::SortField::TrackCount => {

     

       165
       165
       +
                   sorted.sort_by_key(|(_, ch)| ch.track_count);

     

       166
       166
       +
               }

     

       167
       167
       +
               view::SortField::LatestTrack => {

     

       168
       168
       +
                   sorted.sort_by_key(|(_, channel)| {

     

       169
       169
       +
                       all_tracks

     

       170
       170
       +
                           .iter()

     

       171
       171
       +
                           .filter(|t| t.slug == channel.slug)

     

       172
       172
       +
                           .map(|t| &t.created_at)

     

       173
       173
       +
                           .max()

     

       174
       174
       +
                           .cloned()

     

       175
       175
       +
                           .unwrap_or_default()

     

       176
       176
       +
                   });

     

       177
       177
       +
               }

     

       178
       178
       +
               view::SortField::CreatedAt => {}

     

       179
       179
       +
           }

     

       180
       180
       +
       

     

       181
       181
       +
           if matches!(view.sort.direction, view::SortDirection::Desc) {

     

       182
       182
       +
               sorted.reverse();

     

       183
       183
       +
           }

     

       184
       184
       +
       

     

       185
       185
       +
           sorted

     

       186
       186
       +
       }

     

       187
       187
       +
       

     

       188
       188
       +
       fn matches_query(text: &str, query: &str) -> bool {

     

       189
       189
       +
           if query.is_empty() {

     

       190
       190
       +
               return true;

     

       191
       191
       +
           }

     

       192
       192
       +
           text.to_lowercase().contains(&query.to_lowercase())

     

       193
       193
       +
       }

+40 -291

src/main.rs

···

       1
       1
        
       mod channel;

     

       2
       2
       +
       mod channels_view;

     

       2
       3
        
       mod palette;

     

       3
       4
        
       mod panel;

     

       4
       5
        
       mod track;

     

       6
       6
       +
       mod tracks_view;

     

       5
       7
        
       mod view;

     

       6
       8
        
       mod view_editor;

     

       7
       9
        
       

     

       8
       10
        
       use iced::font::Font;

     

       9
       9
       -
       use iced::widget::{

     

       10
       10
       -
           button, column, container, horizontal_rule, pane_grid, row, scrollable, text, text_input,

     

       11
       11
       -
       };

     

       11
       11
       +
       use iced::widget::{button, column, container, pane_grid, row, text, text_input};

     

       12
       12
        
       use iced::{Length, Padding, Theme};

     

       13
       13
        
       use channel::Channel;

     

       14
       14
        
       use palette::Palette;

     
···

       62
       62
        
           panes: pane_grid::State<PaneContent>,

     

       63
       63
        
           channels: Vec<Channel>,

     

       64
       64
        
           tracks: Vec<Track>,

     

       65
       65
       -
           selected_channel: Option<usize>,

     

       66
       66
       -
           selected_tracks: Vec<usize>,

     

       65
       65
       +
           channels_view_state: channels_view::State,

     

       66
       66
       +
           tracks_view_state: tracks_view::State,

     

       67
       67
        
           modifiers: iced::keyboard::Modifiers,

     

       68
       68
        
           palette: Palette,

     

       69
       69
        
           views: Vec<view::View>,

     
···

       103
       103
        
                   panes,

     

       104
       104
        
                   channels,

     

       105
       105
        
                   tracks,

     

       106
       106
       -
                   selected_channel: None,

     

       107
       107
       -
                   selected_tracks: Vec::new(),

     

       106
       106
       +
                   channels_view_state: channels_view::State::new(),

     

       107
       107
       +
                   tracks_view_state: tracks_view::State::new(),

     

       108
       108
        
                   modifiers: iced::keyboard::Modifiers::default(),

     

       109
       109
        
                   palette: Palette::default(),

     

       110
       110
        
                   views,

     
···

       115
       115
        
       

     

       116
       116
        
       #[derive(Debug, Clone)]

     

       117
       117
        
       enum Message {

     

       118
       118
       -
           ChannelSelected(usize),

     

       119
       119
       -
           TrackClicked(usize),

     

       118
       118
       +
           ChannelsView(channels_view::Message),

     

       119
       119
       +
           TracksView(tracks_view::Message),

     

       120
       120
        
           ModifiersChanged(iced::keyboard::Modifiers),

     

       121
       121
        
           Pane(PaneMessage),

     

       122
       122
        
           SearchChanged(pane_grid::Pane, String),

     
···

       127
       127
        
           ViewEditor(view_editor::Message),

     

       128
       128
        
       }

     

       129
       129
        
       

     

       130
       130
       -
       fn matches_query(text: &str, query: &str) -> bool {

     

       131
       131
       -
           if query.is_empty() {

     

       132
       132
       -
               return true;

     

       133
       133
       -
           }

     

       134
       134
       -
           text.to_lowercase().contains(&query.to_lowercase())

     

       135
       135
       -
       }

     

       136
       136
       -
       

     

       137
       130
        
       fn update(state: &mut State, message: Message) {

     

       138
       131
        
           match message {

     

       139
       139
       -
               Message::ChannelSelected(idx) => {

     

       140
       140
       -
                   state.selected_channel = Some(idx);

     

       141
       141
       -
       

     

       142
       142
       -
                   if let Some(channel) = state.channels.get(idx) {

     

       143
       143
       -
                       let view = view::View::channel_tracks(&channel.slug, &channel.name);

     

       144
       144
       -
                       let view_id = view.id.clone();

     

       145
       145
       -
       

     

       146
       146
       -
                       if !state.views.iter().any(|v| v.id == view_id) {

     

       147
       147
       -
                           state.views.push(view);

     

       148
       148
       -
                       }

     

       132
       132
       +
               Message::ChannelsView(msg) => {

     

       133
       133
       +
                   let action = state.channels_view_state.update(msg, &state.channels);

     

       134
       134
       +
                   match action {

     

       135
       135
       +
                       channels_view::Action::ShowChannelTracks(slug, name) => {

     

       136
       136
       +
                           let view = view::View::channel_tracks(&slug, &name);

     

       137
       137
       +
                           let view_id = view.id.clone();

     

       138
       138
       +
       

     

       139
       139
       +
                           if !state.views.iter().any(|v| v.id == view_id) {

     

       140
       140
       +
                               state.views.push(view);

     

       141
       141
       +
                           }

     

       149
       142
        
       

     

       150
       150
       -
                       if let Some((_pane_id, content)) = state.panes.iter_mut().find(|(_, c)| {

     

       151
       151
       -
                           c.current_view_id()

     

       152
       152
       -
                               .map(|id| id != "all-channels")

     

       153
       153
       -
                               .unwrap_or(false)

     

       154
       154
       -
                       }) {

     

       155
       155
       -
                           content.push_view(view_id);

     

       143
       143
       +
                           if let Some((_pane_id, content)) = state.panes.iter_mut().find(|(_, c)| {

     

       144
       144
       +
                               c.current_view_id()

     

       145
       145
       +
                                   .map(|id| id != "all-channels")

     

       146
       146
       +
                                   .unwrap_or(false)

     

       147
       147
       +
                           }) {

     

       148
       148
       +
                               content.push_view(view_id);

     

       149
       149
       +
                           }

     

       156
       150
        
                       }

     

       151
       151
       +
                       channels_view::Action::None => {}

     

       157
       152
        
                   }

     

       158
       153
        
               }

     

       159
       159
       -
               Message::TrackClicked(index) => {

     

       160
       160
       -
                   let ctrl = state.modifiers.command() || state.modifiers.control();

     

       161
       161
       -
                   let shift = state.modifiers.shift();

     

       162
       162
       -
       

     

       163
       163
       -
                   if ctrl {

     

       164
       164
       -
                       if state.selected_tracks.contains(&index) {

     

       165
       165
       -
                           state.selected_tracks.retain(|&i| i != index);

     

       166
       166
       -
                       } else {

     

       167
       167
       -
                           state.selected_tracks.push(index);

     

       168
       168
       -
                       }

     

       169
       169
       -
                   } else if shift {

     

       170
       170
       -
                       if let Some(&last) = state.selected_tracks.last() {

     

       171
       171
       -
                           let start = last.min(index);

     

       172
       172
       -
                           let end = last.max(index);

     

       173
       173
       -
                           state.selected_tracks.clear();

     

       174
       174
       -
                           state.selected_tracks.extend(start..=end);

     

       175
       175
       -
                       } else {

     

       176
       176
       -
                           state.selected_tracks = vec![index];

     

       177
       177
       -
                       }

     

       178
       178
       -
                   } else {

     

       179
       179
       -
                       state.selected_tracks = vec![index];

     

       180
       180
       -
                   }

     

       154
       154
       +
               Message::TracksView(msg) => {

     

       155
       155
       +
                   let _action = state.tracks_view_state.update(msg);

     

       181
       156
        
               }

     

       182
       157
        
               Message::ModifiersChanged(modifiers) => {

     

       183
       158
        
                   state.modifiers = modifiers;

     

       159
       159
       +
                   state.tracks_view_state.modifiers = modifiers;

     

       184
       160
        
               }

     

       185
       161
        
               Message::SearchChanged(pane, query) => {

     

       186
       162
        
                   if let Some(content) = state.panes.get(pane) {

     
···

       425
       401
        
           };

     

       426
       402
        
       

     

       427
       403
        
           let result_count = match view.source {

     

       428
       428
       -
               view::DataSource::Channels => filtered_channels(state, view).len(),

     

       429
       429
       -
               view::DataSource::Tracks => filtered_tracks(state, view).len(),

     

       404
       404
       +
               view::DataSource::Channels => channels_view::filtered_channels(&state.channels, view).len(),

     

       405
       405
       +
               view::DataSource::Tracks => tracks_view::filtered_tracks(&state.tracks, view).len(),

     

       430
       406
        
           };

     

       431
       407
        
       

     

       432
       408
        
           let search_placeholder = match view.source {

     
···

       458
       434
        
               });

     

       459
       435
        
       

     

       460
       436
        
           let view_content = match view.source {

     

       461
       461
       -
               view::DataSource::Channels => render_channels_view(view, state, palette),

     

       462
       462
       -
               view::DataSource::Tracks => render_tracks_view(view, state, palette),

     

       437
       437
       +
               view::DataSource::Channels => state

     

       438
       438
       +
                   .channels_view_state

     

       439
       439
       +
                   .view(&state.channels, view, &state.tracks, palette)

     

       440
       440
       +
                   .map(Message::ChannelsView),

     

       441
       441
       +
               view::DataSource::Tracks => state

     

       442
       442
       +
                   .tracks_view_state

     

       443
       443
       +
                   .view(&state.tracks, view, palette)

     

       444
       444
       +
                   .map(Message::TracksView),

     

       463
       445
        
           };

     

       464
       446
        
       

     

       465
       447
        
           column![tabs, search_bar, view_content]

     
···

       468
       450
        
               .into()

     

       469
       451
        
       }

     

       470
       452
        
       

     

       471
       471
       -
       fn filtered_channels<'a>(state: &'a State, view: &view::View) -> Vec<(usize, &'a Channel)> {

     

       472
       472
       -
           state

     

       473
       473
       -
               .channels

     

       474
       474
       -
               .iter()

     

       475
       475
       -
               .enumerate()

     

       476
       476
       -
               .filter(|(_idx, channel)| {

     

       477
       477
       -
                   if let Some(ref slug) = view.filter.slug {

     

       478
       478
       -
                       if &channel.slug != slug {

     

       479
       479
       -
                           return false;

     

       480
       480
       -
                       }

     

       481
       481
       -
                   }

     

       482
       482
       -
       

     

       483
       483
       -
                   if let Some(min) = view.filter.track_count_min {

     

       484
       484
       -
                       if channel.track_count < min {

     

       485
       485
       -
                           return false;

     

       486
       486
       -
                       }

     

       487
       487
       -
                   }

     

       488
       488
       -
       

     

       489
       489
       -
                   if let Some(max) = view.filter.track_count_max {

     

       490
       490
       -
                       if channel.track_count > max {

     

       491
       491
       -
                           return false;

     

       492
       492
       -
                       }

     

       493
       493
       -
                   }

     

       494
       494
       -
       

     

       495
       495
       -
                   if !view.filter.search_query.is_empty()

     

       496
       496
       -
                       && !matches_query(&channel.name, &view.filter.search_query)

     

       497
       497
       -
                       && !matches_query(&channel.slug, &view.filter.search_query)

     

       498
       498
       -
                   {

     

       499
       499
       -
                       return false;

     

       500
       500
       -
                   }

     

       501
       501
       -
       

     

       502
       502
       -
                   true

     

       503
       503
       -
               })

     

       504
       504
       -
               .collect()

     

       505
       505
       -
       }

     

       506
       506
       -
       

     

       507
       507
       -
       fn render_channels_view<'a>(

     

       508
       508
       -
           view: &'a view::View,

     

       509
       509
       -
           state: &'a State,

     

       510
       510
       -
           palette: &'a Palette,

     

       511
       511
       -
       ) -> iced::Element<'a, Message> {

     

       512
       512
       -
           let mut sorted_channels = filtered_channels(state, view);

     

       513
       513
       -
       

     

       514
       514
       -
           match view.sort.field {

     

       515
       515
       -
               view::SortField::Name => {

     

       516
       516
       -
                   sorted_channels.sort_by(|(_, a), (_, b)| a.name.cmp(&b.name));

     

       517
       517
       -
               }

     

       518
       518
       -
               view::SortField::TrackCount => {

     

       519
       519
       -
                   sorted_channels.sort_by_key(|(_, ch)| ch.track_count);

     

       520
       520
       -
               }

     

       521
       521
       -
               view::SortField::LatestTrack => {

     

       522
       522
       -
                   sorted_channels.sort_by_key(|(_, channel)| {

     

       523
       523
       -
                       state

     

       524
       524
       -
                           .tracks

     

       525
       525
       -
                           .iter()

     

       526
       526
       -
                           .filter(|t| t.slug == channel.slug)

     

       527
       527
       -
                           .map(|t| &t.created_at)

     

       528
       528
       -
                           .max()

     

       529
       529
       -
                           .cloned()

     

       530
       530
       -
                           .unwrap_or_default()

     

       531
       531
       -
                   });

     

       532
       532
       -
               }

     

       533
       533
       -
               view::SortField::CreatedAt => {}

     

       534
       534
       -
           }

     

       535
       535
       -
       

     

       536
       536
       -
           if matches!(view.sort.direction, view::SortDirection::Desc) {

     

       537
       537
       -
               sorted_channels.reverse();

     

       538
       538
       -
           }

     

       539
       539
       -
       

     

       540
       540
       -
           let list = sorted_channels

     

       541
       541
       -
               .iter()

     

       542
       542
       -
               .fold(column![].spacing(0), |col, (idx, channel)| {

     

       543
       543
       -
                   let is_selected = state.selected_channel == Some(*idx);

     

       544
       544
       -
                   let channel_info = format!("{} ({})", channel.name, channel.track_count);

     

       545
       545
       -
       

     

       546
       546
       -
                   let item = container(text(channel_info).size(14))

     

       547
       547
       -
                       .padding(8)

     

       548
       548
       -
                       .width(Length::Fill)

     

       549
       549
       -
                       .style(move |_theme: &Theme| {

     

       550
       550
       -
                           if is_selected {

     

       551
       551
       -
                               container::Style {

     

       552
       552
       -
                                   background: Some(iced::Background::Color(palette.gray3)),

     

       553
       553
       -
                                   ..Default::default()

     

       554
       554
       -
                               }

     

       555
       555
       -
                           } else {

     

       556
       556
       -
                               container::Style::default()

     

       557
       557
       -
                           }

     

       558
       558
       -
                       });

     

       559
       559
       -
       

     

       560
       560
       -
                   let button = iced::widget::button(item)

     

       561
       561
       -
                       .on_press(Message::ChannelSelected(*idx))

     

       562
       562
       -
                       .padding(0)

     

       563
       563
       -
                       .style(|theme: &Theme, _status| iced::widget::button::Style {

     

       564
       564
       -
                           background: None,

     

       565
       565
       -
                           text_color: theme.palette().text,

     

       566
       566
       -
                           border: iced::Border::default(),

     

       567
       567
       -
                           shadow: iced::Shadow::default(),

     

       568
       568
       -
                       });

     

       569
       569
       -
       

     

       570
       570
       -
                   let col = col.push(button);

     

       571
       571
       -
                   col.push(

     

       572
       572
       -
                       horizontal_rule(1).style(move |_theme: &Theme| iced::widget::rule::Style {

     

       573
       573
       -
                           color: palette.gray3,

     

       574
       574
       -
                           width: 1,

     

       575
       575
       -
                           radius: 0.0.into(),

     

       576
       576
       -
                           fill_mode: iced::widget::rule::FillMode::Full,

     

       577
       577
       -
                       }),

     

       578
       578
       -
                   )

     

       579
       579
       -
               });

     

       580
       580
       -
       

     

       581
       581
       -
           let content = scrollable(list);

     

       582
       582
       -
       

     

       583
       583
       -
           container(content)

     

       584
       584
       -
               .width(Length::Fill)

     

       585
       585
       -
               .height(Length::Fill)

     

       586
       586
       -
               .style(move |_theme: &Theme| container::Style {

     

       587
       587
       -
                   background: Some(iced::Background::Color(palette.gray4)),

     

       588
       588
       -
                   ..Default::default()

     

       589
       589
       -
               })

     

       590
       590
       -
               .into()

     

       591
       591
       -
       }

     

       592
       592
       -
       

     

       593
       593
       -
       fn filtered_tracks<'a>(state: &'a State, view: &view::View) -> Vec<(usize, &'a Track)> {

     

       594
       594
       -
           state

     

       595
       595
       -
               .tracks

     

       596
       596
       -
               .iter()

     

       597
       597
       -
               .enumerate()

     

       598
       598
       -
               .filter(|(_idx, track)| {

     

       599
       599
       -
                   if let Some(ref slug) = view.filter.slug {

     

       600
       600
       -
                       if &track.slug != slug {

     

       601
       601
       -
                           return false;

     

       602
       602
       -
                       }

     

       603
       603
       -
                   }

     

       604
       604
       -
       

     

       605
       605
       -
                   if !view.filter.search_query.is_empty()

     

       606
       606
       -
                       && !matches_query(&track.title, &view.filter.search_query)

     

       607
       607
       -
                       && !matches_query(&track.description, &view.filter.search_query)

     

       608
       608
       -
                       && !matches_query(&track.slug, &view.filter.search_query)

     

       609
       609
       -
                   {

     

       610
       610
       -
                       return false;

     

       611
       611
       -
                   }

     

       612
       612
       -
       

     

       613
       613
       -
                   true

     

       614
       614
       -
               })

     

       615
       615
       -
               .collect()

     

       616
       616
       -
       }

     

       617
       617
       -
       

     

       618
       618
       -
       fn render_tracks_view<'a>(

     

       619
       619
       -
           view: &'a view::View,

     

       620
       620
       -
           state: &'a State,

     

       621
       621
       -
           palette: &'a Palette,

     

       622
       622
       -
       ) -> iced::Element<'a, Message> {

     

       623
       623
       -
           let mut sorted_tracks = filtered_tracks(state, view);

     

       624
       624
       -
       

     

       625
       625
       -
           match view.sort.field {

     

       626
       626
       -
               view::SortField::Name => {

     

       627
       627
       -
                   sorted_tracks.sort_by(|(_, a), (_, b)| a.title.cmp(&b.title));

     

       628
       628
       -
               }

     

       629
       629
       -
               view::SortField::CreatedAt => {

     

       630
       630
       -
                   sorted_tracks.sort_by(|(_, a), (_, b)| a.created_at.cmp(&b.created_at));

     

       631
       631
       -
               }

     

       632
       632
       -
               view::SortField::TrackCount | view::SortField::LatestTrack => {}

     

       633
       633
       -
           }

     

       634
       634
       -
       

     

       635
       635
       -
           if matches!(view.sort.direction, view::SortDirection::Desc) {

     

       636
       636
       -
               sorted_tracks.reverse();

     

       637
       637
       -
           }

     

       638
       638
       -
       

     

       639
       639
       -
           sorted_tracks.truncate(5000);

     

       640
       640
       -
       

     

       641
       641
       -
           let list = sorted_tracks

     

       642
       642
       -
               .iter()

     

       643
       643
       -
               .fold(column![].spacing(0), |col, (index, track)| {

     

       644
       644
       -
                   let is_selected = state.selected_tracks.contains(index);

     

       645
       645
       -
       

     

       646
       646
       -
                   let slug_part = text(format!("@{}", track.slug))

     

       647
       647
       -
                       .size(13)

     

       648
       648
       -
                       .color(palette.red);

     

       649
       649
       -
       

     

       650
       650
       -
                   let title_part = text(format!(" {}", track.title))

     

       651
       651
       -
                       .size(13);

     

       652
       652
       -
       

     

       653
       653
       -
                   let track_content = if track.description.is_empty() {

     

       654
       654
       -
                       row![slug_part, title_part].spacing(0)

     

       655
       655
       -
                   } else {

     

       656
       656
       -
                       let desc_part = text(format!(" {}", track.description))

     

       657
       657
       -
                           .size(13)

     

       658
       658
       -
                           .color(palette.text_dim);

     

       659
       659
       -
                       row![slug_part, title_part, desc_part].spacing(0)

     

       660
       660
       -
                   };

     

       661
       661
       -
       

     

       662
       662
       -
                   let item = container(track_content)

     

       663
       663
       -
                       .padding(8)

     

       664
       664
       -
                       .width(Length::Fill)

     

       665
       665
       -
                       .style(move |_theme: &Theme| {

     

       666
       666
       -
                           if is_selected {

     

       667
       667
       -
                               container::Style {

     

       668
       668
       -
                                   background: Some(iced::Background::Color(palette.gray3)),

     

       669
       669
       -
                                   ..Default::default()

     

       670
       670
       -
                               }

     

       671
       671
       -
                           } else {

     

       672
       672
       -
                               container::Style::default()

     

       673
       673
       -
                           }

     

       674
       674
       -
                       });

     

       675
       675
       -
       

     

       676
       676
       -
                   let button = iced::widget::button(item)

     

       677
       677
       -
                       .on_press(Message::TrackClicked(*index))

     

       678
       678
       -
                       .padding(0)

     

       679
       679
       -
                       .style(|theme: &Theme, _status| iced::widget::button::Style {

     

       680
       680
       -
                           background: None,

     

       681
       681
       -
                           text_color: theme.palette().text,

     

       682
       682
       -
                           border: iced::Border::default(),

     

       683
       683
       -
                           shadow: iced::Shadow::default(),

     

       684
       684
       -
                       });

     

       685
       685
       -
       

     

       686
       686
       -
                   let col = col.push(button);

     

       687
       687
       -
                   col.push(

     

       688
       688
       -
                       horizontal_rule(1).style(move |_theme: &Theme| iced::widget::rule::Style {

     

       689
       689
       -
                           color: palette.gray3,

     

       690
       690
       -
                           width: 1,

     

       691
       691
       -
                           radius: 0.0.into(),

     

       692
       692
       -
                           fill_mode: iced::widget::rule::FillMode::Full,

     

       693
       693
       -
                       }),

     

       694
       694
       -
                   )

     

       695
       695
       -
               });

     

       696
       696
       -
       

     

       697
       697
       -
           let content = scrollable(list);

     

       698
       698
       -
       

     

       699
       699
       -
           container(content)

     

       700
       700
       -
               .width(Length::Fill)

     

       701
       701
       -
               .height(Length::Fill)

     

       702
       702
       -
               .into()

     

       703
       703
       -
       }

+200

src/tracks_view.rs

···

       1
       1
       +
       use crate::palette::Palette;

     

       2
       2
       +
       use crate::track::Track;

     

       3
       3
       +
       use crate::view;

     

       4
       4
       +
       use iced::keyboard::Modifiers;

     

       5
       5
       +
       use iced::widget::{column, container, horizontal_rule, row, scrollable, text};

     

       6
       6
       +
       use iced::{Element, Length, Theme};

     

       7
       7
       +
       

     

       8
       8
       +
       #[derive(Debug, Clone)]

     

       9
       9
       +
       pub struct State {

     

       10
       10
       +
           pub selected_tracks: Vec<usize>,

     

       11
       11
       +
           pub modifiers: Modifiers,

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       impl Default for State {

     

       15
       15
       +
           fn default() -> Self {

     

       16
       16
       +
               Self {

     

       17
       17
       +
                   selected_tracks: Vec::new(),

     

       18
       18
       +
                   modifiers: Modifiers::default(),

     

       19
       19
       +
               }

     

       20
       20
       +
           }

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       #[derive(Debug, Clone)]

     

       24
       24
       +
       pub enum Message {

     

       25
       25
       +
           TrackClicked(usize),

     

       26
       26
       +
           ModifiersChanged(Modifiers),

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       #[derive(Debug, Clone)]

     

       30
       30
       +
       pub enum Action {

     

       31
       31
       +
           None,

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       impl State {

     

       35
       35
       +
           pub fn new() -> Self {

     

       36
       36
       +
               Self::default()

     

       37
       37
       +
           }

     

       38
       38
       +
       

     

       39
       39
       +
           pub fn update(&mut self, message: Message) -> Action {

     

       40
       40
       +
               match message {

     

       41
       41
       +
                   Message::TrackClicked(index) => {

     

       42
       42
       +
                       let ctrl = self.modifiers.command() || self.modifiers.control();

     

       43
       43
       +
                       let shift = self.modifiers.shift();

     

       44
       44
       +
       

     

       45
       45
       +
                       if ctrl {

     

       46
       46
       +
                           if self.selected_tracks.contains(&index) {

     

       47
       47
       +
                               self.selected_tracks.retain(|&i| i != index);

     

       48
       48
       +
                           } else {

     

       49
       49
       +
                               self.selected_tracks.push(index);

     

       50
       50
       +
                           }

     

       51
       51
       +
                       } else if shift {

     

       52
       52
       +
                           if let Some(&last) = self.selected_tracks.last() {

     

       53
       53
       +
                               let start = last.min(index);

     

       54
       54
       +
                               let end = last.max(index);

     

       55
       55
       +
                               self.selected_tracks.clear();

     

       56
       56
       +
                               self.selected_tracks.extend(start..=end);

     

       57
       57
       +
                           } else {

     

       58
       58
       +
                               self.selected_tracks = vec![index];

     

       59
       59
       +
                           }

     

       60
       60
       +
                       } else {

     

       61
       61
       +
                           self.selected_tracks = vec![index];

     

       62
       62
       +
                       }

     

       63
       63
       +
                       Action::None

     

       64
       64
       +
                   }

     

       65
       65
       +
                   Message::ModifiersChanged(modifiers) => {

     

       66
       66
       +
                       self.modifiers = modifiers;

     

       67
       67
       +
                       Action::None

     

       68
       68
       +
                   }

     

       69
       69
       +
               }

     

       70
       70
       +
           }

     

       71
       71
       +
       

     

       72
       72
       +
           pub fn view<'a>(

     

       73
       73
       +
               &'a self,

     

       74
       74
       +
               all_tracks: &'a [Track],

     

       75
       75
       +
               view_def: &'a view::View,

     

       76
       76
       +
               palette: &'a Palette,

     

       77
       77
       +
           ) -> Element<'a, Message> {

     

       78
       78
       +
               let tracks = sorted_tracks(filtered_tracks(all_tracks, view_def), view_def);

     

       79
       79
       +
               let list = tracks

     

       80
       80
       +
                   .iter()

     

       81
       81
       +
                   .fold(column![].spacing(0), |col, (index, track)| {

     

       82
       82
       +
                       let is_selected = self.selected_tracks.contains(index);

     

       83
       83
       +
       

     

       84
       84
       +
                       let slug_part = text(format!("@{}", track.slug))

     

       85
       85
       +
                           .size(13)

     

       86
       86
       +
                           .color(palette.red);

     

       87
       87
       +
       

     

       88
       88
       +
                       let title_part = text(format!(" {}", track.title)).size(13);

     

       89
       89
       +
       

     

       90
       90
       +
                       let track_content = if track.description.is_empty() {

     

       91
       91
       +
                           row![slug_part, title_part].spacing(0)

     

       92
       92
       +
                       } else {

     

       93
       93
       +
                           let desc_part = text(format!(" {}", track.description))

     

       94
       94
       +
                               .size(13)

     

       95
       95
       +
                               .color(palette.text_dim);

     

       96
       96
       +
                           row![slug_part, title_part, desc_part].spacing(0)

     

       97
       97
       +
                       };

     

       98
       98
       +
       

     

       99
       99
       +
                       let item = container(track_content)

     

       100
       100
       +
                           .padding(8)

     

       101
       101
       +
                           .width(Length::Fill)

     

       102
       102
       +
                           .style(move |_theme: &Theme| {

     

       103
       103
       +
                               if is_selected {

     

       104
       104
       +
                                   container::Style {

     

       105
       105
       +
                                       background: Some(iced::Background::Color(palette.gray3)),

     

       106
       106
       +
                                       ..Default::default()

     

       107
       107
       +
                                   }

     

       108
       108
       +
                               } else {

     

       109
       109
       +
                                   container::Style::default()

     

       110
       110
       +
                               }

     

       111
       111
       +
                           });

     

       112
       112
       +
       

     

       113
       113
       +
                       let button = iced::widget::button(item)

     

       114
       114
       +
                           .on_press(Message::TrackClicked(*index))

     

       115
       115
       +
                           .padding(0)

     

       116
       116
       +
                           .style(|theme: &Theme, _status| iced::widget::button::Style {

     

       117
       117
       +
                               background: None,

     

       118
       118
       +
                               text_color: theme.palette().text,

     

       119
       119
       +
                               border: iced::Border::default(),

     

       120
       120
       +
                               shadow: iced::Shadow::default(),

     

       121
       121
       +
                           });

     

       122
       122
       +
       

     

       123
       123
       +
                       let col = col.push(button);

     

       124
       124
       +
                       col.push(

     

       125
       125
       +
                           horizontal_rule(1).style(move |_theme: &Theme| iced::widget::rule::Style {

     

       126
       126
       +
                               color: palette.gray3,

     

       127
       127
       +
                               width: 1,

     

       128
       128
       +
                               radius: 0.0.into(),

     

       129
       129
       +
                               fill_mode: iced::widget::rule::FillMode::Full,

     

       130
       130
       +
                           }),

     

       131
       131
       +
                       )

     

       132
       132
       +
                   });

     

       133
       133
       +
       

     

       134
       134
       +
               let content = scrollable(list);

     

       135
       135
       +
       

     

       136
       136
       +
               container(content)

     

       137
       137
       +
                   .width(Length::Fill)

     

       138
       138
       +
                   .height(Length::Fill)

     

       139
       139
       +
                   .into()

     

       140
       140
       +
           }

     

       141
       141
       +
       }

     

       142
       142
       +
       

     

       143
       143
       +
       pub fn filtered_tracks<'a>(

     

       144
       144
       +
           tracks: &'a [Track],

     

       145
       145
       +
           view: &view::View,

     

       146
       146
       +
       ) -> Vec<(usize, &'a Track)> {

     

       147
       147
       +
           tracks

     

       148
       148
       +
               .iter()

     

       149
       149
       +
               .enumerate()

     

       150
       150
       +
               .filter(|(_idx, track)| {

     

       151
       151
       +
                   if let Some(ref slug) = view.filter.slug {

     

       152
       152
       +
                       if &track.slug != slug {

     

       153
       153
       +
                           return false;

     

       154
       154
       +
                       }

     

       155
       155
       +
                   }

     

       156
       156
       +
       

     

       157
       157
       +
                   if !view.filter.search_query.is_empty()

     

       158
       158
       +
                       && !matches_query(&track.title, &view.filter.search_query)

     

       159
       159
       +
                       && !matches_query(&track.description, &view.filter.search_query)

     

       160
       160
       +
                       && !matches_query(&track.slug, &view.filter.search_query)

     

       161
       161
       +
                   {

     

       162
       162
       +
                       return false;

     

       163
       163
       +
                   }

     

       164
       164
       +
       

     

       165
       165
       +
                   true

     

       166
       166
       +
               })

     

       167
       167
       +
               .collect()

     

       168
       168
       +
       }

     

       169
       169
       +
       

     

       170
       170
       +
       pub fn sorted_tracks<'a>(

     

       171
       171
       +
           tracks: Vec<(usize, &'a Track)>,

     

       172
       172
       +
           view: &view::View,

     

       173
       173
       +
       ) -> Vec<(usize, &'a Track)> {

     

       174
       174
       +
           let mut sorted = tracks;

     

       175
       175
       +
       

     

       176
       176
       +
           match view.sort.field {

     

       177
       177
       +
               view::SortField::Name => {

     

       178
       178
       +
                   sorted.sort_by(|(_, a), (_, b)| a.title.cmp(&b.title));

     

       179
       179
       +
               }

     

       180
       180
       +
               view::SortField::CreatedAt => {

     

       181
       181
       +
                   sorted.sort_by(|(_, a), (_, b)| a.created_at.cmp(&b.created_at));

     

       182
       182
       +
               }

     

       183
       183
       +
               view::SortField::TrackCount | view::SortField::LatestTrack => {}

     

       184
       184
       +
           }

     

       185
       185
       +
       

     

       186
       186
       +
           if matches!(view.sort.direction, view::SortDirection::Desc) {

     

       187
       187
       +
               sorted.reverse();

     

       188
       188
       +
           }

     

       189
       189
       +
       

     

       190
       190
       +
           sorted.truncate(5000);

     

       191
       191
       +
       

     

       192
       192
       +
           sorted

     

       193
       193
       +
       }

     

       194
       194
       +
       

     

       195
       195
       +
       fn matches_query(text: &str, query: &str) -> bool {

     

       196
       196
       +
           if query.is_empty() {

     

       197
       197
       +
               return true;

     

       198
       198
       +
           }

     

       199
       199
       +
           text.to_lowercase().contains(&query.to_lowercase())

     

       200
       200
       +
       }

+46

todo.txt

···

       11
       11
        
           → DONE: GPU scrolling verified with 60k items, instant performance (CHANGELOG.md:38)

     

       12
       12
        
       

     

       13
       13
        
       

     

       14
       14
       +
       refactor: scale architecture (iced best practices)

     

       15
       15
       +
       ----------------------------------------------------

     

       16
       16
       +
       

     

       17
       17
       +
       goal: follow iced docs "Scaling Applications" pattern + halloy real-world structure

     

       18
       18
       +
       reason: current flat state/message architecture becoming tangled as app grows

     

       19
       19
       +
       

     

       20
       20
       +
       phase 1: extract view modules with Action pattern

     

       21
       21
       +
           [ ] channels_view.rs

     

       22
       22
       +
               - struct State { selected_channel: Option<usize> }

     

       23
       23
       +
               - enum Message { ChannelSelected(usize) }

     

       24
       24
       +
               - enum Action { None, ShowChannelTracks(String, String) }

     

       25
       25
       +
               - fn update(&mut self, msg) -> Action

     

       26
       26
       +
               - fn view(&self, channels: &[Channel]) -> Element

     

       27
       27
       +
           [ ] tracks_view.rs

     

       28
       28
       +
               - struct State { selected_tracks: Vec<usize>, modifiers: Modifiers }

     

       29
       29
       +
               - enum Message { TrackClicked(usize), ModifiersChanged(Modifiers) }

     

       30
       30
       +
               - enum Action { None }

     

       31
       31
       +
               - fn update(&mut self, msg) -> Action

     

       32
       32
       +
               - fn view(&self, tracks: &[Track]) -> Element

     

       33
       33
       +
           [ ] update main.rs to route messages, handle Actions

     

       34
       34
       +
       

     

       35
       35
       +
       phase 2: convert PaneContent to view enum

     

       36
       36
       +
           [ ] change PaneContent from view_stack to:

     

       37
       37
       +
               enum PaneContent {

     

       38
       38
       +
                   ChannelsView(channels_view::State),

     

       39
       39
       +
                   TracksView(tracks_view::State),

     

       40
       40
       +
                   ViewEditor(ViewEditor),

     

       41
       41
       +
               }

     

       42
       42
       +
           [ ] each pane contains instantiated view state (not string ID indirection)

     

       43
       43
       +
           [ ] remove views: Vec<View> registry from main State

     

       44
       44
       +
           [ ] view definitions become constructors for view states

     

       45
       45
       +
       

     

       46
       46
       +
       phase 3: separate data from view concerns

     

       47
       47
       +
           [ ] struct DataStore { channels: Vec<Channel>, tracks: Vec<Track> }

     

       48
       48
       +
           [ ] read-only, shared across all views

     

       49
       49
       +
           [ ] view state = selections, scroll, input only

     

       50
       50
       +
       

     

       51
       51
       +
       benefits:

     

       52
       52
       +
       - follows iced docs pattern exactly (Action enum, composable update/view)

     

       53
       53
       +
       - follows halloy Buffer enum pattern (pane content = enum of view types)

     

       54
       54
       +
       - eliminates view ID indirection

     

       55
       55
       +
       - clear separation: data vs view state

     

       56
       56
       +
       - testable view logic (pure update functions)

     

       57
       57
       +
       - type-safe screen transitions via Action

     

       58
       58
       +
       

     

       59
       59
       +
       

     

       14
       60
        
       note

     

       15
       61
        
       ----

     

       16
       62
        
       when completing tasks, update CHANGELOG.md with what changed