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

Replace single data model with data management struct and views

Browse source
This commit is contained in:
Reinout Meliesie 2025-02-04 23:46:51 +01:00
commit 7610b291a4
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
6 changed files with 88 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ui/collatable_container/collated_grid.rs
View file

@ -9,21 +9,21 @@ use {
std :: { cell :: * , iter :: * , path :: Path } ,
} ;
use crate :: { collection :: * , ui :: { collatable_container :: * , component :: * } } ;
use crate :: ui :: { collatable_container :: * , component :: * } ;
pub struct CollatedFilmsGrid {
film_widget_pairs : RefCell < Vec < ( Film , Box ) > > ,
film_widget_pairs : RefCell < Vec < ( FilmOverview , Box ) > > ,
grid_widget : FlowBox ,
}
pub struct CollatedSeriesGrid {
series_widget_pairs : RefCell < Vec < ( Series , Box ) > > ,
series_widget_pairs : RefCell < Vec < ( SeriesOverview , Box ) > > ,
grid_widget : FlowBox ,
}
impl CollatedFilmsGrid {
pub fn new ( films : Vec <Film> , sorting : FilmsSorting ) -> Self {
pub fn new ( films : Vec <FilmOverview> , sorting : FilmsSorting ) -> Self {
let grid_widget = flow_box ! (
@ orientation : Horizontal ;
@ homogeneous : true ;
@ -37,7 +37,7 @@ impl CollatedFilmsGrid {
component
}
pub fn set_films ( & self , films : Vec <Film> , sorting : FilmsSorting ) {
pub fn set_films ( & self , films : Vec <FilmOverview> , sorting : FilmsSorting ) {
let widgets = films . iter ()
. map (create_film_entry)
. collect :: < Vec <_> > () ;
@ -57,7 +57,7 @@ impl CollatedFilmsGrid {
}
}
fn sort_film_widget_pairs ( & self , sorting : FilmsSorting ) -> Vec < ( Film , Box ) > {
fn sort_film_widget_pairs ( & self , sorting : FilmsSorting ) -> Vec < ( FilmOverview , Box ) > {
let mut sorted = Vec :: from (
self . film_widget_pairs . borrow () . as_slice () ) ;
@ -76,7 +76,7 @@ impl CollatedFilmsGrid {
}
}
impl CollatedSeriesGrid {
pub fn new ( series : Vec <Series> , sorting : SeriesSorting ) -> Self {
pub fn new ( series : Vec <SeriesOverview> , sorting : SeriesSorting ) -> Self {
let grid_widget = flow_box ! (
@ orientation : Horizontal ;
@ homogeneous : true ;
@ -90,7 +90,7 @@ impl CollatedSeriesGrid {
component
}
pub fn set_series ( & self , series : Vec <Series> , sorting : SeriesSorting ) {
pub fn set_series ( & self , series : Vec <SeriesOverview> , sorting : SeriesSorting ) {
let widgets = series . iter ()
. map (create_series_entry)
. collect :: < Vec <_> > () ;
@ -110,7 +110,7 @@ impl CollatedSeriesGrid {
}
}
fn sort_series_widget_pairs ( & self , sorting : SeriesSorting ) -> Vec < ( Series , Box ) > {
fn sort_series_widget_pairs ( & self , sorting : SeriesSorting ) -> Vec < ( SeriesOverview , Box ) > {
let mut sorted = Vec :: from (
self . series_widget_pairs . borrow () . as_slice () ) ;
@ -134,7 +134,7 @@ impl Component <FlowBox> for CollatedSeriesGrid {
fn get_widget ( & self ) -> & FlowBox { & self . grid_widget }
}
pub fn create_film_entry ( film : & Film ) -> Box {
pub fn create_film_entry ( film : & FilmOverview ) -> Box {
create_collection_item (
film . name . as_str () ,
film . original_name . as_deref () ,
@ -142,7 +142,7 @@ pub fn create_film_entry ( film : & Film ) -> Box {
& create_film_details (film) ,
)
}
pub fn create_series_entry ( series : & Series ) -> Box {
pub fn create_series_entry ( series : & SeriesOverview ) -> Box {
create_collection_item (
series . name . as_str () ,
series . original_name . as_deref () ,
@ -201,7 +201,7 @@ fn create_collection_item (
container
}
fn create_film_details ( film : & Film ) -> Box {
fn create_film_details ( film : & FilmOverview ) -> Box {
g_box ! (
@ orientation : Horizontal ;
@ halign : Center ;
@ -210,12 +210,11 @@ fn create_film_details ( film : & Film ) -> Box {
label ! ( format ! ( "{}m" , film . runtime_minutes ) . as_str () ) ,
)
}
fn create_series_details ( series : & Series ) -> Box {
fn create_series_details ( series : & SeriesOverview ) -> Box {
g_box ! (
@ orientation : Horizontal ;
@ halign : Center ;
@ spacing : 20 ;
// TODO
label ! ("????") ,
label ! ( series . first_release_date . as_str () ) ,
)
}

10
src/ui/collatable_container/mod.rs
View file

@ -4,7 +4,7 @@ mod collation_menu ;
use gtk4 :: { * , Orientation :: * , prelude :: * } ;
use crate :: {
collection :: * ,
persistence :: * ,
ui :: {
component :: * , utility :: * ,
collatable_container :: { collated_grid :: * , collation_menu :: * } ,
@ -63,7 +63,7 @@ pub struct CollatableSeriesContainer {
}
impl CollatableFilmsContainer {
pub fn new ( films : Vec <Film> ) -> Self {
pub fn new ( films : Vec <FilmOverview> ) -> Self {
let collated_grid = leak (
CollatedFilmsGrid :: new ( films , FilmsSorting :: default () ) ) ;
let film_collation_menu = FilmCollationMenu :: new ( |sorting|
@ -81,12 +81,12 @@ impl CollatableFilmsContainer {
Self { collated_grid , widget }
}
pub fn set_films ( & self , films : Vec <Film> ) {
pub fn set_films ( & self , films : Vec <FilmOverview> ) {
self . collated_grid . set_films ( films , FilmsSorting :: default () ) ;
}
}
impl CollatableSeriesContainer {
pub fn new ( series : Vec <Series> ) -> Self {
pub fn new ( series : Vec <SeriesOverview> ) -> Self {
let collated_grid = leak (
CollatedSeriesGrid :: new ( series , SeriesSorting :: default () ) ) ;
let series_collation_menu = SeriesCollationMenu :: new ( |sorting| {
@ -105,7 +105,7 @@ impl CollatableSeriesContainer {
Self { collated_grid , widget }
}
pub fn set_series ( & self , series : Vec <Series> ) {
pub fn set_series ( & self , series : Vec <SeriesOverview> ) {
self . collated_grid . set_series ( series , SeriesSorting :: default () ) ;
}
}