zedfrigg/zoodex
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Deduplicate collated grid sorting logic

Browse source
This commit is contained in:
Reinout Meliesie 2024-11-28 21:35:55 +01:00
parent 4778d879f4
commit e3984b0ffb
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
1 changed files with 50 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/ui/collated_grid.rs
View file

@ -28,86 +28,92 @@ pub struct CollatedSeriesGrid {
impl CollatedFilmsGrid { impl CollatedFilmsGrid {
pub fn new ( films : Vec <Film> , sorting : FilmsSortedBy ) -> Self { pub fn new ( films : Vec <Film> , sorting : FilmsSortedBy ) -> Self {
let grid_widget = create_flow_box () ; let grid_widget = create_flow_box () ;
let film_widgets = films . iter () let film_widget_pairs = RefCell :: new ( vec ! () ) ;
. map (create_film_entry)
. collect :: < Vec <_> > () ;
let film_widget_pairs = RefCell :: new ( zip ( films , film_widgets )
. collect :: < Vec <_> > () ) ;
let film_widget_pairs_sorted = sort_film_widget_pairs ( let component = Self { film_widget_pairs , grid_widget } ;
film_widget_pairs . borrow () . as_slice () , sorting ) ; component . set_films ( films , sorting ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
grid_widget . append (film_widget) ;
}
Self { film_widget_pairs , grid_widget } component
} }
pub fn set_films ( & self , films : Vec <Film> , sorting : FilmsSortedBy ) { pub fn set_films ( & self , films : Vec <Film> , sorting : FilmsSortedBy ) {
let film_widgets = films . iter () let widgets = films . iter ()
. map (create_film_entry) . map (create_film_entry)
. collect :: < Vec <_> > () ; . collect :: < Vec <_> > () ;
* self . film_widget_pairs . borrow_mut () = zip ( films , film_widgets ) * self . film_widget_pairs . borrow_mut () = zip ( films , widgets )
. collect :: < Vec <_> > () ; . collect () ;
let film_widget_pairs_sorted = sort_film_widget_pairs ( for ( _ , film_widget ) in self . sort_film_widget_pairs (sorting) {
self . film_widget_pairs . borrow () . as_slice () , sorting ) ; self . grid_widget . append ( & film_widget ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
self . grid_widget . append (film_widget) ;
} }
} }
pub fn set_sorting ( & self , sorting : FilmsSortedBy ) { pub fn set_sorting ( & self , sorting : FilmsSortedBy ) {
self . grid_widget . remove_all () ; self . grid_widget . remove_all () ;
let film_widget_pairs_sorted = sort_film_widget_pairs ( for ( _ , film_widget ) in self . sort_film_widget_pairs (sorting) {
self . film_widget_pairs . borrow () . as_slice () , sorting ) ; self . grid_widget . append ( & film_widget ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
self . grid_widget . append (film_widget) ;
} }
} }
fn sort_film_widget_pairs ( & self , sorting : FilmsSortedBy ) -> Vec < ( Film , Box ) > {
let mut sorted = Vec :: from (
self . film_widget_pairs . borrow () . as_slice () ) ;
sorted . sort_by ( | ( film_1 , _ ) , ( film_2 , _ ) | match sorting {
FilmsSortedBy :: Name =>
film_1 . name . cmp ( & film_2 . name ) ,
FilmsSortedBy :: ReleaseDate =>
film_1 . release_date . cmp ( & film_2 . release_date ) ,
FilmsSortedBy :: Runtime =>
film_1 . runtime_minutes . cmp ( & film_2 . runtime_minutes ) ,
} ) ;
sorted
}
} }
impl CollatedSeriesGrid { impl CollatedSeriesGrid {
pub fn new ( series : Vec <Series> , sorting : SeriesSortedBy ) -> Self { pub fn new ( series : Vec <Series> , sorting : SeriesSortedBy ) -> Self {
let grid_widget = create_flow_box () ; let grid_widget = create_flow_box () ;
let series_widgets = series . iter () let series_widget_pairs = RefCell :: new ( vec ! () ) ;
. map (create_series_entry)
. collect :: < Vec <_> > () ;
let series_widget_pairs = RefCell :: new ( zip ( series , series_widgets )
. collect :: < Vec <_> > () ) ;
let series_widget_pairs_sorted = sort_series_widget_pairs ( let component = Self { series_widget_pairs , grid_widget } ;
series_widget_pairs . borrow () . as_slice () , sorting ) ; component . set_series ( series, sorting ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
grid_widget . append (series_widget) ;
}
Self { series_widget_pairs , grid_widget } component
} }
pub fn set_series ( & self , series : Vec <Series> , sorting : SeriesSortedBy ) { pub fn set_series ( & self , series : Vec <Series> , sorting : SeriesSortedBy ) {
let series_widgets = series . iter () let widgets = series . iter ()
. map (create_series_entry) . map (create_series_entry)
. collect :: < Vec <_> > () ; . collect :: < Vec <_> > () ;
* self . series_widget_pairs . borrow_mut () = zip ( series , series_widgets ) * self . series_widget_pairs . borrow_mut () = zip ( series , widgets )
. collect :: < Vec <_> > () ; . collect () ;
let series_widget_pairs_sorted = sort_series_widget_pairs ( for ( _ , series_widget ) in self . sort_series_widget_pairs (sorting) {
self . series_widget_pairs . borrow () . as_slice () , sorting ) ; self . grid_widget . append ( & series_widget ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
self . grid_widget . append (series_widget) ;
} }
} }
pub fn set_sorting ( & self , sorting : SeriesSortedBy ) { pub fn set_sorting ( & self , sorting : SeriesSortedBy ) {
self . grid_widget . remove_all () ; self . grid_widget . remove_all () ;
let series_widget_pairs_sorted = sort_series_widget_pairs ( for ( _ , series_widget ) in self . sort_series_widget_pairs (sorting) {
self . series_widget_pairs . borrow () . as_slice () , sorting ) ; self . grid_widget . append ( & series_widget ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
self . grid_widget . append (series_widget) ;
} }
} }
fn sort_series_widget_pairs ( & self , sorting : SeriesSortedBy ) -> Vec < ( Series , Box ) > {
let mut sorted = Vec :: from (
self . series_widget_pairs . borrow () . as_slice () ) ;
sorted . sort_by ( | ( series_1 , _ ) , ( series_2 , _ ) | match sorting {
SeriesSortedBy :: Name => series_1 . name . cmp ( & series_2 . name ) ,
SeriesSortedBy :: FirstReleaseDate => todo ! () ,
} ) ;
sorted
}
} }
impl Component <FlowBox> for CollatedFilmsGrid { impl Component <FlowBox> for CollatedFilmsGrid {
@ -117,34 +123,6 @@ impl Component <FlowBox> for CollatedSeriesGrid {
fn get_widget ( & self ) -> & FlowBox { & self . grid_widget } fn get_widget ( & self ) -> & FlowBox { & self . grid_widget }
} }
fn sort_film_widget_pairs (
film_widget_pairs : & [ ( Film , Box ) ] ,
sorting : FilmsSortedBy ,
) -> Vec < ( Film , Box ) > {
let mut sorted = Vec :: from (film_widget_pairs) ;
sorted . sort_by ( | ( film_1 , _ ) , ( film_2 , _ ) | match sorting {
FilmsSortedBy :: Name => film_1 . name . cmp ( & film_2 . name ) ,
FilmsSortedBy :: ReleaseDate => film_1 . release_date . cmp ( & film_2 . release_date ) ,
FilmsSortedBy :: Runtime => film_1 . runtime_minutes . cmp ( & film_2 . runtime_minutes ) ,
} ) ;
sorted
}
fn sort_series_widget_pairs (
series_widget_pairs : & [ ( Series, Box ) ] ,
sorting : SeriesSortedBy ,
) -> Vec < ( Series , Box ) > {
let mut sorted = Vec :: from (series_widget_pairs) ;
sorted . sort_by ( | ( series_1 , _ ) , ( series_2 , _ ) | match sorting {
SeriesSortedBy :: Name => series_1 . name . cmp ( & series_2 . name ) ,
SeriesSortedBy :: FirstReleaseDate => todo ! () ,
} ) ;
sorted
}
fn create_flow_box () -> FlowBox { fn create_flow_box () -> FlowBox {
FlowBox :: builder () FlowBox :: builder ()
. orientation (Horizontal) . orientation (Horizontal)