Add month photos view

blissd · Mar 26, 2024 · 6e76295 · 6e76295
1 parent 6142fd1
commit 6e76295
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 15 deletions.
diff --git a/core/src/repo.rs b/core/src/repo.rs
@@ -32,6 +32,25 @@ impl Display for PictureId {
     }
 }
 
+#[derive(Debug, PartialOrd, PartialEq)]
+pub struct YearMonth(i32, chrono::Month);
+
+impl Display for YearMonth {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{} {}", self.1.name(), self.0)
+    }
+}
+
+impl YearMonth {
+    pub fn year(&self) -> i32 {
+        self.0
+    }
+
+    pub fn month(&self) -> chrono::Month {
+        self.1
+    }
+}
+
 /// A picture in the repository
 #[derive(Debug)]
 pub struct Picture {
@@ -54,6 +73,19 @@ impl Picture {
             .map(|ts| ts.date_naive().year_ce().1)
             .unwrap_or(0)
     }
+
+    pub fn year_month(&self) -> YearMonth {
+        self.order_by_ts
+            .map(|ts| {
+                let y = ts.date_naive().year();
+                let m = ts.date_naive().month();
+                YearMonth(
+                    y,
+                    chrono::Month::try_from(u8::try_from(m).unwrap()).unwrap(),
+                )
+            })
+            .unwrap_or(YearMonth(0, chrono::Month::January))
+    }
 }
 
 /// Repository of picture metadata.

diff --git a/src/app.rs b/src/app.rs
@@ -17,11 +17,13 @@ use relm4::adw::prelude::AdwApplicationWindowExt;
 use crate::all_photos::AllPhotos;
 use crate::config::{APP_ID, PROFILE};
 use crate::modals::about::AboutDialog;
+use crate::month_photos::MonthPhotos;
 use crate::year_photos::YearPhotos;
 
 pub(super) struct App {
     about_dialog: Controller<AboutDialog>,
     all_photos: Controller<AllPhotos>,
+    month_photos: Controller<MonthPhotos>,
     year_photos: Controller<YearPhotos>,
 }
 
@@ -108,11 +110,7 @@ impl SimpleComponent for App {
 
                     add_titled_with_icon[None, "Year", "year-symbolic"] = model.year_photos.widget(),
 
-                    add_titled_with_icon[None, "Month", "month-symbolic"] = &gtk::Box {
-                        gtk::Label {
-                            set_label: "Hello",
-                        }
-                    },
+                    add_titled_with_icon[None, "Month", "month-symbolic"] = model.month_photos.widget(),
 
                     add_titled_with_icon[None, "All", "today-symbolic"] = model.all_photos.widget(),
                 },
@@ -138,11 +136,13 @@ impl SimpleComponent for App {
             .detach();
 
         let all_photos = AllPhotos::builder().launch(()).detach();
+        let month_photos = MonthPhotos::builder().launch(()).detach();
         let year_photos = YearPhotos::builder().launch(()).detach();
 
         let model = Self {
             about_dialog,
             all_photos,
+            month_photos,
             year_photos,
         };
 

diff --git a/src/main.rs b/src/main.rs
@@ -7,6 +7,7 @@ mod config;
 mod all_photos;
 mod app;
 mod modals;
+mod month_photos;
 mod year_photos;
 
 use app::App;

diff --git a/src/year_photos.rs b/src/year_photos.rs
@@ -8,7 +8,6 @@ use photos_core;
 
 use itertools::Itertools;
 use relm4::gtk;
-use relm4::gtk::prelude::FrameExt;
 use relm4::gtk::prelude::WidgetExt;
 use relm4::typed_view::grid::{RelmGridItem, TypedGridView};
 use relm4::*;
@@ -41,19 +40,19 @@ impl RelmGridItem for PicturePreview {
                 gtk::Label {},
 
                 adw::Clamp {
-                        set_maximum_size: 200,
+                    set_maximum_size: 200,
 
-                gtk::Frame {
+                    gtk::Frame {
 
-                    #[name(picture)]
-                    gtk::Picture {
-                        set_can_shrink: true,
-                        set_valign: gtk::Align::Center,
-                        set_width_request: 200,
-                        set_height_request: 200,
+                        #[name(picture)]
+                        gtk::Picture {
+                            set_can_shrink: true,
+                            set_valign: gtk::Align::Center,
+                            set_width_request: 200,
+                            set_height_request: 200,
+                        }
                     }
                 }
-                }
             }
         }