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

Include static lifetime in MediaAdapter trait, formatting

Browse source
This commit is contained in:
Reinout Meliesie 2025-02-12 14:32:16 +01:00
commit 2c40217497
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
5 changed files with 162 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use crate :: ui :: component :: * ;
pub struct CollatedMediaGrid < A : MediaAdapter + 'static > {
pub struct CollatedMediaGrid < A : MediaAdapter > {
media_widget_pairs : RefCell < Vec < ( A :: Overview , Button ) > > ,
grid_widget : FlowBox ,
on_media_selected : & 'static dyn Fn ( A :: Overview ) ,
@ -29,7 +29,7 @@ impl < A : MediaAdapter > CollatedMediaGrid <A> {
@ homogeneous : true ;
@ selection_mode : SelectionMode :: None ;
) ;
let media_widget_pairs = RefCell :: new ( vec ! () ) ;
let media_widget_pairs = RefCell :: new ( Vec :: new () ) ;
let on_media_selected = leak (on_media_selected) ;
Self { media_widget_pairs , grid_widget , on_media_selected }
@ -127,8 +127,8 @@ impl < A : MediaAdapter > CollatedMediaGrid <A> {
self . media_widget_pairs . borrow () . as_slice () ,
) ;
sorted . sort_by ( | ( media_1 , _ ) , ( media_2 , _ ) |
A :: compare_by ( media_1 , media_2 , sorting ) ,
sorted . sort_by (
| ( media_1 , _ ) , ( media_2 , _ ) | A :: compare_by ( media_1 , media_2 , sorting ) ,
) ;
// See it, say it, ...

2
src/ui/collatable_container/collation_menu/mod.rs
View file

@ -16,7 +16,7 @@ use crate :: ui :: collatable_container :: collation_menu :: sort_button :: * ;
pub struct MediaCollationMenu { widget : Box }
impl MediaCollationMenu {
pub fn new < A : MediaAdapter + 'static > ( on_sort : impl Fn ( A :: Sorting ) + 'static ) -> Self {
pub fn new < A : MediaAdapter > ( on_sort : impl Fn ( A :: Sorting ) + 'static ) -> Self {
let sort_button = MediaSortButton :: <A> :: new (on_sort) ;
let widget = g_box ! (

13
src/ui/collatable_container/collation_menu/sort_button.rs
View file

@ -10,7 +10,7 @@ use crate :: ui :: collatable_container :: SortingDirection :: * ;
pub struct MediaSortButton < A : MediaAdapter + 'static > {
pub struct MediaSortButton < A : MediaAdapter > {
widget : SplitButton ,
previous_sorting : & 'static RefCell < A :: Sorting > ,
}
@ -28,8 +28,13 @@ impl < A : MediaAdapter > MediaSortButton <A> {
Box :: leak ( sort_icons . into_boxed_slice () ) as & 'static _
} ;
let list_box = list_box ! ( @ connect_row_activated : move | _ , row |
on_media_sort_activated :: <A> ( row . index () , previous_sorting , & on_sort , sort_icons ) ;
let list_box = list_box ! (
@ connect_row_activated : move | _ , row | on_media_sort_activated :: <A> (
row . index () ,
previous_sorting ,
& on_sort ,
sort_icons ,
) ;
) ;
for ( index , ( _ , description ) ) in property_descriptions . iter () . enumerate () {
list_box . append ( & g_box ! (
@ -52,7 +57,7 @@ impl < A : MediaAdapter > Component for MediaSortButton <A> {
fn get_widget ( & self ) -> & SplitButton { & self . widget }
}
fn on_media_sort_activated < A : MediaAdapter + 'static > (
fn on_media_sort_activated < A : MediaAdapter > (
row : i32 ,
previous_sorting_mut : & RefCell < A :: Sorting > ,
on_sort : & impl Fn ( A :: Sorting ) ,

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

@ -61,7 +61,7 @@ impl MediaSorting <SeriesProperty> for SeriesSorting {
impl MediaProperty for FilmProperty {}
impl MediaProperty for SeriesProperty {}
pub struct CollatableMediaContainer < A : MediaAdapter + 'static > {
pub struct CollatableMediaContainer < A : MediaAdapter > {
collated_grid : & 'static CollatedMediaGrid <A> ,
widget : Box ,
}
@ -69,8 +69,8 @@ pub struct CollatableMediaContainer < A : MediaAdapter + 'static > {
impl < A : MediaAdapter > CollatableMediaContainer <A> {
pub fn new ( on_media_selected : impl Fn ( A :: Overview ) + 'static ) -> Self {
let collated_grid = leak ( CollatedMediaGrid :: new (on_media_selected) ) ;
let collation_menu = MediaCollationMenu :: new :: <A> ( |sorting|
collated_grid . set_sorting (sorting) ,
let collation_menu = MediaCollationMenu :: new :: <A> (
|sorting| collated_grid . set_sorting (sorting) ,
) ;
let widget = g_box ! (
@ -90,7 +90,7 @@ impl < A : MediaAdapter > CollatableMediaContainer <A> {
}
}
pub trait MediaAdapter {
pub trait MediaAdapter : 'static {
type Overview : MediaOverview ;
type Sorting : MediaSorting < Self :: Property > ;
type Property : MediaProperty ;
@ -120,9 +120,12 @@ impl MediaAdapter for FilmsAdapter {
sorting : FilmsSorting ,
) -> Ordering {
let ordering = match sorting . property {
FilmProperty :: Name => film_1 . name . cmp ( & film_2 . name ) ,
FilmProperty :: ReleaseDate => film_1 . release_date . cmp ( & film_2 . release_date ) ,
FilmProperty :: Runtime => film_1 . runtime_minutes . cmp ( & film_2 . runtime_minutes ) ,
FilmProperty :: Name =>
film_1 . name . cmp ( & film_2 . name ) ,
FilmProperty :: ReleaseDate =>
film_1 . release_date . cmp ( & film_2 . release_date ) ,
FilmProperty :: Runtime =>
film_1 . runtime_minutes . cmp ( & film_2 . runtime_minutes ) ,
} ;
match sorting . direction {
SortingDirection :: Ascending => ordering ,
@ -149,8 +152,10 @@ impl MediaAdapter for SeriesAdapter {
sorting : SeriesSorting ,
) -> Ordering {
let ordering = match sorting . property {
SeriesProperty :: Name => series_1 . name . cmp ( & series_2 . name ) ,
SeriesProperty :: FirstReleaseDate => series_1 . first_release_date . cmp ( & series_2 . first_release_date ) ,
SeriesProperty :: Name =>
series_1 . name . cmp ( & series_2 . name ) ,
SeriesProperty :: FirstReleaseDate =>
series_1 . first_release_date . cmp ( & series_2 . first_release_date ) ,
} ;
match sorting . direction {
SortingDirection :: Ascending => ordering ,