Improve formatting. Rename GameDatabase to Library

kifu/core/src/ui/elements/game_preview.rs

@@ -1,36 +1,45 @@
 use serde::{Deserialize, Serialize};
-use sgf::{
+use sgf::go::Game;
-    go::{Game, Rank},
-    Date,
-};
 use typeshare::typeshare;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[typeshare]
 pub struct GamePreviewElement {
-    pub date: Vec<Date>,
+    pub date: Vec<String>,
     pub black_player: String,
-    pub black_rank: Option<Rank>,
     pub white_player: String,
-    pub white_rank: Option<Rank>,
 }
 
 impl GamePreviewElement {
     pub fn new(game: &Game) -> GamePreviewElement {
+        let black_player = match game.info.black_player {
+            Some(ref black_player) => black_player.clone(),
+            None => "unknown".to_owned(),
+        };
+        let white_player = match game.info.white_player {
+            Some(ref white_player) => white_player.clone(),
+            None => "unknown".to_owned(),
+        };
+
+        let black_player = match game.info.black_rank {
+            Some(rank) => format!("{} ({})", black_player, rank.to_string()),
+            None => black_player,
+        };
+
+        let white_player = match game.info.white_rank {
+            Some(rank) => format!("{} ({})", white_player, rank.to_string()),
+            None => white_player,
+        };
+
         GamePreviewElement {
-            date: game.info.date.clone(),
+            date: game
-            black_player: game
                 .info
-                .black_player
+                .date
-                .clone()
+                .iter()
-                .unwrap_or("black_player".to_owned()),
+                .map(|dt| dt.to_string())
-            black_rank: game.info.black_rank.clone(),
+                .collect::<Vec<String>>(),
-            white_player: game
+            black_player,
-                .info
+            white_player,
-                .white_player
-                .clone()
-                .unwrap_or("white_player".to_owned()),
-            white_rank: game.info.white_rank.clone(),
         }
     }
 }

kifu/gtk/src/ui/game_preview.rs

@@ -3,7 +3,12 @@ use gtk::{glib, prelude::*, subclass::prelude::*};
 use kifu_core::ui::GamePreviewElement;
 
 #[derive(Default)]
-pub struct GamePreviewPrivate;
+pub struct GamePreviewPrivate {
+    title: gtk::Label,
+    black_player: gtk::Label,
+    white_player: gtk::Label,
+    date: gtk::Label,
+}
 
 #[glib::object_subclass]
 impl ObjectSubclass for GamePreviewPrivate {
@@ -21,22 +26,25 @@ glib::wrapper! {
 }
 
 impl GamePreview {
-    pub fn new(element: GamePreviewElement) -> GamePreview {
+    pub fn new() -> GamePreview {
         let s: Self = Object::builder().build();
         s.set_orientation(gtk::Orientation::Horizontal);
+        s.set_homogeneous(true);
+        s.set_hexpand(true);
 
-        println!("game_preview: {:?}", element);
+        s.append(&s.imp().date);
-        let black_player = match element.black_rank {
+        s.append(&s.imp().title);
-            Some(rank) => format!("{} ({})", element.black_player, rank.to_string()),
+        s.append(&s.imp().black_player);
-            None => element.black_player,
+        s.append(&s.imp().white_player);
-        };
-        let white_player = match element.white_rank {
-            Some(rank) => format!("{} ({})", element.white_player, rank.to_string()),
-            None => element.white_player,
-        };
-        s.append(&gtk::Label::new(Some(&black_player)));
-        s.append(&gtk::Label::new(Some(&white_player)));
 
         s
     }
+
+    pub fn set_game(&self, element: GamePreviewElement) {
+        self.imp().black_player.set_text(&element.black_player);
+        self.imp().white_player.set_text(&element.white_player);
+        if let Some(date) = element.date.first() {
+            self.imp().date.set_text(&date);
+        }
+    }
 }

kifu/gtk/src/ui/home.rs

@@ -1,4 +1,4 @@
-use crate::CoreApi;
+use crate::{ui::Library, CoreApi};
 use glib::Object;
 use gtk::{glib, prelude::*, subclass::prelude::*};
 use kifu_core::{
@@ -7,8 +7,6 @@ use kifu_core::{
 };
 use std::{cell::RefCell, rc::Rc};
 
-use super::GameDatabase;
-
 struct PlayerDataEntryPrivate {
     name: gtk::Text,
     rank: gtk::DropDown,
@@ -136,7 +134,7 @@ impl Home {
         let new_game_button = gtk::Button::builder().label(&view.start_game.label).build();
         s.append(&new_game_button);
 
-        let library = GameDatabase::new();
+        let library = Library::new();
         let library_view = gtk::ScrolledWindow::builder()
             .hscrollbar_policy(gtk::PolicyType::Never)
             .min_content_width(360)

kifu/gtk/src/ui/library.rs

@@ -1,3 +1,4 @@
+use crate::ui::GamePreview;
 use glib::Object;
 use gtk::{glib, prelude::*, subclass::prelude::*};
 use kifu_core::ui::GamePreviewElement;
@@ -32,12 +33,12 @@ impl GameObject {
     }
 }
 
-pub struct GameDatabasePrivate {
+pub struct LibraryPrivate {
     model: gio::ListStore,
     list_view: gtk::ListView,
 }
 
-impl Default for GameDatabasePrivate {
+impl Default for LibraryPrivate {
     fn default() -> Self {
         let vector: Vec<GameObject> = vec![];
         let model = gio::ListStore::new(glib::types::Type::OBJECT);
@@ -45,69 +46,59 @@ impl Default for GameDatabasePrivate {
         let factory = gtk::SignalListItemFactory::new();
 
         factory.connect_setup(move |_, list_item| {
-            let label = gtk::Label::new(Some("some kind of text"));
+            let preview = GamePreview::new();
             list_item
                 .downcast_ref::<gtk::ListItem>()
                 .expect("Needs to be a ListItem")
-                .set_child(Some(&label));
+                .set_child(Some(&preview));
         });
         factory.connect_bind(move |_, list_item| {
-            let game_object = list_item
+            let game_element = list_item
                 .downcast_ref::<gtk::ListItem>()
                 .expect("Needs to be ListItem")
                 .item()
                 .and_downcast::<GameObject>()
-                .expect("The item has to be an IntegerObject.");
+                .expect("The item has to be a GameObject.");
 
-            let label = list_item
+            let preview = list_item
                 .downcast_ref::<gtk::ListItem>()
                 .expect("Needs to be ListItem")
                 .child()
-                .and_downcast::<gtk::Label>()
+                .and_downcast::<GamePreview>()
-                .expect("The child has to be an Label.");
+                .expect("The child has to be a GamePreview object.");
 
-            label.set_label(
+            match game_element.game() {
-                format!(
+                Some(game) => preview.set_game(game),
-                    "{} vs. {}",
+                None => (),
-                    game_object
+            };
-                        .game()
-                        .map(|g| g.black_player)
-                        .unwrap_or("black".to_owned()),
-                    game_object
-                        .game()
-                        .map(|g| g.white_player)
-                        .unwrap_or("white".to_owned())
-                )
-                .as_ref(),
-            );
         });
 
         let selection_model = gtk::NoSelection::new(Some(model.clone()));
         let list_view = gtk::ListView::new(Some(selection_model), Some(factory));
+        list_view.set_hexpand(true);
         Self { model, list_view }
     }
 }
 
 #[glib::object_subclass]
-impl ObjectSubclass for GameDatabasePrivate {
+impl ObjectSubclass for LibraryPrivate {
-    const NAME: &'static str = "GameDatabase";
+    const NAME: &'static str = "Library";
-    type Type = GameDatabase;
+    type Type = Library;
     type ParentType = gtk::Box;
 }
 
-impl ObjectImpl for GameDatabasePrivate {}
+impl ObjectImpl for LibraryPrivate {}
-impl WidgetImpl for GameDatabasePrivate {}
+impl WidgetImpl for LibraryPrivate {}
-impl BoxImpl for GameDatabasePrivate {}
+impl BoxImpl for LibraryPrivate {}
 
 glib::wrapper! {
-    pub struct GameDatabase(ObjectSubclass<GameDatabasePrivate>) @extends gtk::Widget, gtk::Box;
+    pub struct Library(ObjectSubclass<LibraryPrivate>) @extends gtk::Widget, gtk::Box;
 }
 
-impl GameDatabase {
+impl Library {
     pub fn new() -> Self {
         let s: Self = Object::builder().build();
-        s.set_width_request(200);
+        s.set_hexpand(true);
-        s.set_height_request(200);
         s.append(&s.imp().list_view);
         s
     }

kifu/gtk/src/ui/mod.rs

@@ -1,12 +1,12 @@
 mod chat;
 pub use chat::Chat;
 
-mod game_database;
-pub use game_database::GameDatabase;
-
 mod game_preview;
 pub use game_preview::GamePreview;
 
+mod library;
+pub use library::Library;
+
 mod player_card;
 pub use player_card::PlayerCard;
 

sgf/src/date.rs

@@ -24,6 +24,16 @@ pub enum Date {
     Date(chrono::NaiveDate),
 }
 
+impl Date {
+    pub fn to_string(&self) -> String {
+        match self {
+            Date::Year(y) => format!("{}", y),
+            Date::YearMonth(y, m) => format!("{}-{}", y, m),
+            Date::Date(date) => format!("{}-{}-{}", date.year(), date.month(), date.day()),
+        }
+    }
+}
+
 /*
 impl TryFrom<&str> for Date {
     type Error = String;