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

Move sorting functionality into collated grid, reuse existing widgets

Browse source
This commit is contained in:
Reinout Meliesie 2024-11-27 11:47:20 +01:00
commit 64fc8ba425
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
6 changed files with 147 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

155
src/ui/collated_grid.rs
View file

@ -4,66 +4,145 @@ use {
Align :: * ,
Orientation :: * ,
gdk :: Texture ,
glib :: * ,
prelude :: * ,
} ,
std :: path :: * ,
std :: { cell :: * , iter :: * , path :: * } ,
} ;
use crate :: collection :: * ;
pub struct CollatedFilmsGrid { widget : FlowBox }
pub struct CollatedSeriesGrid { widget : FlowBox }
pub enum FilmsSortedBy { Name , ReleaseDate , Runtime }
pub enum SeriesSortedBy { Name , FirstReleaseDate }
pub struct CollatedFilmsGrid {
film_widget_pairs : RefCell < Vec < ( Film , Box ) > > ,
grid_widget : FlowBox ,
}
pub struct CollatedSeriesGrid {
series_widget_pairs : RefCell < Vec < ( Series , Box ) > > ,
grid_widget : FlowBox ,
}
impl CollatedFilmsGrid {
pub fn new ( films : & [Film] ) -> Self {
let widget = create_collection_flow_box () ;
pub fn new ( films : Vec <Film> , sorting : FilmsSortedBy ) -> Self {
let grid_widget = create_flow_box () ;
let film_widgets = films . iter ()
. map (create_film_entry)
. collect :: < Vec <_> > () ;
let film_widget_pairs = RefCell :: new ( zip ( films , film_widgets )
. collect :: < Vec <_> > () ) ;
for film in films {
widget . append ( & create_film_item (film) ) ;
let film_widget_pairs_sorted = sort_film_widget_pairs (
film_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
grid_widget . append (film_widget) ;
}
Self { widget }
Self { film_widget_pairs , grid_widget }
}
pub fn set_films ( & self , films : & [Film] ) {
self . widget . remove_all () ;
for film in films {
let widget = self . widget . clone () ;
let film = film . clone () ;
pub fn set_films ( & self , films : Vec <Film> , sorting : FilmsSortedBy ) {
let film_widgets = films . iter ()
. map (create_film_entry)
. collect :: < Vec <_> > () ;
* self . film_widget_pairs . borrow_mut () = zip ( films , film_widgets )
. collect :: < Vec <_> > () ;
spawn_future_local ( async move {
widget . append ( & create_film_item ( & film ) ) ;
} ) ;
let film_widget_pairs_sorted = sort_film_widget_pairs (
self . film_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
self . grid_widget . append (film_widget) ;
}
}
pub fn get_widget ( & self ) -> & FlowBox { & self . widget }
pub fn set_sorting ( & self , sorting : FilmsSortedBy ) {
self . grid_widget . remove_all () ;
let film_widget_pairs_sorted = sort_film_widget_pairs (
self . film_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , film_widget ) in & film_widget_pairs_sorted {
self . grid_widget . append (film_widget) ;
}
}
pub fn get_widget ( & self ) -> & FlowBox { & self . grid_widget }
}
impl CollatedSeriesGrid {
pub fn new ( series : & [Series] ) -> Self {
let widget = create_collection_flow_box () ;
pub fn new ( series : Vec <Series> , sorting : SeriesSortedBy ) -> Self {
let grid_widget = create_flow_box () ;
let series_widgets = series . iter ()
. map (create_series_entry)
. collect :: < Vec <_> > () ;
let series_widget_pairs = RefCell :: new ( zip ( series , series_widgets )
. collect :: < Vec <_> > () ) ;
for series in series {
widget . append ( & create_series_item (series) ) ;
let series_widget_pairs_sorted = sort_series_widget_pairs (
series_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
grid_widget . append (series_widget) ;
}
Self { widget }
Self { series_widget_pairs , grid_widget }
}
pub fn set_series ( & self , series : & [Series] ) {
self . widget . remove_all () ;
for series in series {
self . widget . append ( & create_series_item (series) ) ;
pub fn set_series ( & self , series : Vec <Series> , sorting : SeriesSortedBy ) {
let series_widgets = series . iter ()
. map (create_series_entry)
. collect :: < Vec <_> > () ;
* self . series_widget_pairs . borrow_mut () = zip ( series , series_widgets )
. collect :: < Vec <_> > () ;
let series_widget_pairs_sorted = sort_series_widget_pairs (
self . series_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
self . grid_widget . append (series_widget) ;
}
}
pub fn get_widget ( & self ) -> & FlowBox { & self . widget }
pub fn set_sorting ( & self , sorting : SeriesSortedBy ) {
self . grid_widget . remove_all () ;
let series_widget_pairs_sorted = sort_series_widget_pairs (
self . series_widget_pairs . borrow () . as_slice () , sorting ) ;
for ( _ , series_widget ) in & series_widget_pairs_sorted {
self . grid_widget . append (series_widget) ;
}
}
pub fn get_widget ( & self ) -> & FlowBox { & self . grid_widget }
}
fn create_collection_flow_box () -> FlowBox {
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 {
FlowBox :: builder ()
. orientation (Horizontal)
. homogeneous (true)
@ -71,7 +150,7 @@ fn create_collection_flow_box () -> FlowBox {
. build ()
}
pub fn create_film_item ( film : & Film ) -> gtk4 :: Box {
pub fn create_film_entry ( film : & Film ) -> Box {
create_collection_item (
film . name . as_str () ,
film . original_name . as_deref () ,
@ -79,7 +158,7 @@ pub fn create_film_item ( film : & Film ) -> gtk4 :: Box {
& create_film_details (film) ,
)
}
pub fn create_series_item ( series : & Series ) -> gtk4 :: Box {
pub fn create_series_entry ( series : & Series ) -> Box {
create_collection_item (
series . name . as_str () ,
series . original_name . as_deref () ,
@ -92,9 +171,9 @@ fn create_collection_item (
name : & str ,
original_name : Option < & str > ,
poster_file_path : Option < & Path > ,
details_widget : & gtk4 :: Box ,
) -> gtk4 :: Box {
let container = gtk4 :: Box :: builder ()
details_widget : & Box ,
) -> Box {
let container = Box :: builder ()
. orientation (Vertical)
. margin_top (20)
. margin_bottom (20)
@ -138,8 +217,8 @@ fn create_collection_item (
container
}
fn create_film_details ( film : & Film ) -> gtk4 :: Box {
let container = gtk4 :: Box :: builder ()
fn create_film_details ( film : & Film ) -> Box {
let container = Box :: builder ()
. orientation (Horizontal)
. halign (Center)
. spacing (20)
@ -154,8 +233,8 @@ fn create_film_details ( film : & Film ) -> gtk4 :: Box {
container
}
fn create_series_details ( series : & Series ) -> gtk4 :: Box {
let container = gtk4 :: Box :: builder ()
fn create_series_details ( series : & Series ) -> Box {
let container = Box :: builder ()
. orientation (Horizontal)
. halign (Center)
. spacing (20)