Update the historical view when a change happens in the db

This isn't recording real data. It's basically discarding all
information from the weight edit field. But it is creating a record.

fitnesstrax/app/src/app.rs

@@ -15,118 +15,113 @@ You should have received a copy of the GNU General Public License along with Fit
 */
 
 use crate::types::DayInterval;
+use chrono::NaiveDate;
 use emseries::{time_range, Record, RecordId, Series, Timestamp};
 use ft_core::TraxRecord;
 use std::{
-    path::{Path, PathBuf},
+    path::PathBuf,
     sync::{Arc, RwLock},
 };
+use tokio::runtime::Runtime;
 
-/// Invocations are how parts of the application, primarily the UI, will send requests to the core.
-#[derive(Debug)]
-pub enum AppInvocation {
-    /// Tell the core to try to open a database.
-    OpenDatabase(PathBuf),
-
-    /// Request a set of records from the core.
-    // Note: this will require a time range, but doesn't yet.
-    RequestRecords(DayInterval),
-
-    UpdateRecord(Record<TraxRecord>),
-
-    PutRecord(TraxRecord),
-
-    DeleteRecord(RecordId),
-}
-
-/// Responses are messages that the core sends to the UI. Though they are called responses, the
-/// could actually be pre-emptively sent, such as notifications. The UI will need to be able to
-/// process those any time they arrive.
-///
-/// A typical use would be for the UI to send an [AppInvocation::RequestRecords] request and
-/// receive [AppResponse::Records].
-#[derive(Debug)]
-pub enum AppResponse {
-    /// No database is available. The UI should typically display a placeholder, such as the
-    /// welcome view.
+pub enum AppError {
     NoDatabase,
-
-    /// The database is open and here is a set of records. Typically, the set of records will be
-    /// all of the records within a time frame, but this can actually be any set of records.
-    Records(Vec<Record<TraxRecord>>),
-
-    /// The database has been changed. This message is useful for telling the UI that a significant
-    /// change has happened. Further, the UI needs to save PathBuf to settings, because the
-    /// gio::Settings system can't be run in the fully async background.
-    DatabaseChanged(PathBuf),
-
-    RecordSaved(RecordId),
+    FailedToOpenDatabase,
+    Unhandled,
 }
 
 /// The real, headless application. This is where all of the logic will reside.
 #[derive(Clone)]
 pub struct App {
+    runtime: Arc<Runtime>,
     database: Arc<RwLock<Option<Series<TraxRecord>>>>,
 }
 
 impl App {
     pub fn new(db_path: Option<PathBuf>) -> Self {
         let database = db_path.map(|path| Series::open(path).unwrap());
+        let runtime = Arc::new(
+            tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()
+                .unwrap(),
+        );
+
         let s = Self {
+            runtime,
             database: Arc::new(RwLock::new(database)),
         };
 
         s
     }
 
-    pub async fn process_invocation(&self, invocation: AppInvocation) -> AppResponse {
-        match invocation {
-            AppInvocation::OpenDatabase(db_path) => {
-                self.open_db(&db_path);
-                AppResponse::DatabaseChanged(db_path)
-            }
-            AppInvocation::RequestRecords(interval) => match &*self.database.read().unwrap() {
-                Some(database) => {
-                    let records = database
+    pub async fn records(
+        &self,
+        start: NaiveDate,
+        end: NaiveDate,
+    ) -> Result<Vec<Record<TraxRecord>>, AppError> {
+        let db = self.database.clone();
+        self.runtime
+            .spawn_blocking(move || {
+                if let Some(ref db) = *db.read().unwrap() {
+                    let records = db
                         .search(time_range(
-                            Timestamp::Date(interval.start),
+                            Timestamp::Date(start),
                             true,
-                            Timestamp::Date(interval.end),
+                            Timestamp::Date(end),
                             true,
                         ))
                         .map(|record| record.clone())
                         .collect::<Vec<Record<TraxRecord>>>();
-                    AppResponse::Records(records)
-                }
-                None => AppResponse::NoDatabase,
-            },
-            AppInvocation::UpdateRecord(record) => match *self.database.write().unwrap() {
-                Some(ref mut database) => {
-                    let id = record.id.clone();
-                    database.update(record).unwrap();
-                    AppResponse::RecordSaved(id)
-                }
-                None => AppResponse::NoDatabase,
-            },
-            AppInvocation::PutRecord(record) => match *self.database.write().unwrap() {
-                Some(ref mut database) => {
-                    let id = database.put(record).unwrap();
-                    AppResponse::RecordSaved(id)
-                }
-                None => AppResponse::NoDatabase,
-            },
-            AppInvocation::DeleteRecord(record_id) => match *self.database.write().unwrap() {
-                Some(ref mut database) => {
-                    database.delete(&record_id).unwrap();
-                    AppResponse::Records(vec![])
-                }
-                None => AppResponse::NoDatabase,
-            },
+                    Ok(records)
+                } else {
+                    Err(AppError::NoDatabase)
                 }
+            })
+            .await
+            .unwrap()
     }
 
-    fn open_db(&self, path: &Path) {
-        let db = Series::open(path).unwrap();
-        *self.database.write().unwrap() = Some(db);
+    pub async fn put_record(&self, record: TraxRecord) -> Result<RecordId, AppError> {
+        let db = self.database.clone();
+        self.runtime
+            .spawn_blocking(move || {
+                if let Some(ref mut db) = *db.write().unwrap() {
+                    let id = db.put(record).unwrap();
+                    Ok(id)
+                } else {
+                    Err(AppError::NoDatabase)
+                }
+            })
+            .await
+            .unwrap()
+            .map_err(|_| AppError::Unhandled)
+    }
+
+    pub async fn update_record(&self, record: Record<TraxRecord>) -> Result<(), AppError> {
+        let db = self.database.clone();
+        self.runtime
+            .spawn_blocking(move || {
+                if let Some(ref mut db) = *db.write().unwrap() {
+                    db.update(record).map_err(|_| AppError::Unhandled)
+                } else {
+                    Err(AppError::NoDatabase)
+                }
+            })
+            .await
+            .unwrap()
+            .map_err(|_| AppError::Unhandled)
+    }
+
+    pub async fn open_db(&self, path: PathBuf) -> Result<(), AppError> {
+        let db_ref = self.database.clone();
+        self.runtime
+            .spawn_blocking(move || {
+                let db = Series::open(path).map_err(|_| AppError::FailedToOpenDatabase)?;
+                *db_ref.write().unwrap() = Some(db);
+                Ok(())
+            })
+            .await
+            .unwrap()
     }
 }

fitnesstrax/app/src/app_window.rs

@@ -15,26 +15,23 @@ You should have received a copy of the GNU General Public License along with Fit
 */
 
 use crate::{
-    app::{AppInvocation, AppResponse},
+    app::App,
     components::DayDetail,
-    views::{HistoricalView, PlaceholderView, View, ViewName, WelcomeView},
+    views::{HistoricalView, PlaceholderView, View, WelcomeView},
 };
 use adw::prelude::*;
-use async_channel::Sender;
-use chrono::{FixedOffset, NaiveDate, TimeZone};
-use dimensioned::si::{KG, M, S};
-use emseries::{Record, RecordId};
-use ft_core::{Steps, TimeDistance, TraxRecord, Weight};
+use chrono::{Duration, Local};
+use emseries::Record;
+use ft_core::TraxRecord;
 use gio::resources_lookup_data;
 use gtk::STYLE_PROVIDER_PRIORITY_USER;
-use std::path::PathBuf;
-use std::{cell::RefCell, rc::Rc};
+use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
 /// The application window, or the main window, is the main user interface for the app. Almost
 /// everything occurs here.
 #[derive(Clone)]
 pub struct AppWindow {
-    app_tx: Sender<AppInvocation>,
+    app: App,
     layout: gtk::Box,
     current_view: Rc<RefCell<View>>,
     settings: gio::Settings,
@@ -52,7 +49,7 @@ impl AppWindow {
         app_id: &str,
         resource_path: &str,
         adw_app: &adw::Application,
-        app_tx: Sender<AppInvocation>,
+        ft_app: App,
     ) -> AppWindow {
         let window = adw::ApplicationWindow::builder()
             .application(adw_app)
@@ -107,60 +104,66 @@ impl AppWindow {
         layout.add_controller(gesture);
 
         let s = Self {
-            app_tx,
+            app: ft_app,
             layout,
             current_view: Rc::new(RefCell::new(initial_view)),
             settings: gio::Settings::new(app_id),
             navigation,
         };
 
+        s.load_records();
+
         s
     }
 
-    pub fn change_view(&self, view: ViewName) {
-        self.swap_main(self.construct_view(view));
+    fn show_welcome_view(&self) {
+        let view = View::Welcome(WelcomeView::new({
+            let s = self.clone();
+            move |path| s.on_apply_config(path)
+        }));
+        self.swap_main(view);
     }
 
-    pub fn process_response(&self, response: AppResponse) {
-        println!("processing response: {:?}", response);
-        match response {
-            AppResponse::DatabaseChanged(db_path) => {
-                self.settings
-                    .set_string("series-path", db_path.to_str().unwrap())
-                    .unwrap();
-                self.change_view(ViewName::Historical(vec![]));
-            }
-            AppResponse::NoDatabase => {
-                self.change_view(ViewName::Welcome);
-            }
-            AppResponse::RecordSaved(_) => match *self.current_view.borrow_mut() {
-                View::Historical(ref view) => {
-                    let _ = self
-                        .app_tx
-                        .send_blocking(AppInvocation::RequestRecords(view.time_window()));
-                }
-                _ => {}
+    fn show_historical_view(&self, records: Vec<Record<TraxRecord>>) {
+        let view = View::Historical(HistoricalView::new(records, {
+            let s = self.clone();
+            Rc::new(move |date, records| {
+                let layout = gtk::Box::new(gtk::Orientation::Vertical, 0);
+                layout.append(&adw::HeaderBar::new());
+                layout.append(&DayDetail::new(
+                    date,
+                    records,
+                    {
+                        let s = s.clone();
+                        move |record| s.on_put_record(record)
                     },
-            AppResponse::Records(records) => {
-                let mut current = self.current_view.borrow_mut();
-                if let View::Historical(ref view) = *current {
-                    view.set_records(records);
-                } else {
-                    self.layout.remove(&current.widget());
-                    *current = self.construct_view(ViewName::Historical(records));
-                    self.layout.append(&current.widget());
+                    {
+                        let s = s.clone();
+                        move |record| s.on_update_record(record)
+                    },
+                ));
+                let page = &adw::NavigationPage::builder()
+                    .title(date.format("%Y-%m-%d").to_string())
+                    .child(&layout)
+                    .build();
+                s.navigation.push(page);
+            })
+        }));
+        self.swap_main(view);
     }
-                /*
-                match self.current_view.borrow_mut() {
-                View::Historical(ref view) => view.set_records(records),
-                mut current => {
-                    self.layout.remove(&current.widget());
-                    *current = self.construct_view(ViewName::Historical(records));
-                    self.layout.append(&current.widget());
-                }
-                */
+
+    fn load_records(&self) {
+        glib::spawn_future_local({
+            let s = self.clone();
+            async move {
+                let end = Local::now().date_naive();
+                let start = end - Duration::days(7);
+                match s.app.records(start, end).await {
+                    Ok(records) => s.show_historical_view(records),
+                    Err(_) => s.show_welcome_view(),
                 }
             }
+        });
     }
 
     // Switch views.
@@ -175,51 +178,33 @@ impl AppWindow {
         self.layout.append(&current_widget.widget());
     }
 
-    fn construct_view(&self, view: ViewName) -> View {
-        match view {
-            ViewName::Welcome => View::Welcome(
-                WelcomeView::new({
+    fn on_apply_config(&self, path: PathBuf) {
+        glib::spawn_future_local({
             let s = self.clone();
-                    Box::new(move |path: PathBuf| {
-                        s.app_tx
-                            .send_blocking(AppInvocation::OpenDatabase(path))
-                            .unwrap();
-                    })
-                })
-                .upcast(),
-            ),
-            ViewName::Historical(records) => View::Historical(
-                HistoricalView::new(records, {
+            async move {
+                if s.app.open_db(path.clone()).await.is_ok() {
+                    let _ = s.settings.set("series-path", path.to_str().unwrap());
+                    s.load_records();
+                }
+            }
+        });
+    }
+
+    fn on_put_record(&self, record: TraxRecord) {
+        glib::spawn_future_local({
             let s = self.clone();
-                    Rc::new(move |date: chrono::NaiveDate, records| {
-                        let layout = gtk::Box::new(gtk::Orientation::Vertical, 0);
-                        layout.append(&adw::HeaderBar::new());
-                        layout.append(&DayDetail::new(
-                            date,
-                            records,
-                            {
-                                let app_tx = s.app_tx.clone();
-                                move |record| {
-                                    let _ = app_tx.send_blocking(AppInvocation::PutRecord(record));
+            async move {
+                s.app.put_record(record).await;
             }
-                            },
-                            {
-                                let app_tx = s.app_tx.clone();
-                                move |record| {
-                                    let _ =
-                                        app_tx.send_blocking(AppInvocation::UpdateRecord(record));
-                                }
-                            },
-                        ));
-                        let page = &adw::NavigationPage::builder()
-                            .title(date.format("%Y-%m-%d").to_string())
-                            .child(&layout)
-                            .build();
-                        s.navigation.push(page);
-                    })
-                })
-                .upcast(),
-            ),
+        });
     }
+
+    fn on_update_record(&self, record: Record<TraxRecord>) {
+        glib::spawn_future_local({
+            let s = self.clone();
+            async move {
+                s.app.update_record(record).await;
+            }
+        });
     }
 }

fitnesstrax/app/src/main.rs

@@ -45,7 +45,7 @@ fn main() {
     };
 
     let settings = gio::Settings::new(app_id);
-    let app = app::App::new({
+    let ft_app = app::App::new({
         let path = settings.string("series-path");
         if path.is_empty() {
             None
@@ -59,56 +59,8 @@ fn main() {
         .resource_base_path(RESOURCE_BASE_PATH)
         .build();
 
-    let runtime = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap();
-
     adw_app.connect_activate(move |adw_app| {
-        // These channels are used to send messages to the UI. Anything that needs to send a
-        // message to the UI will send it via `ui_tx`. We will have one single process that owns
-        // `ui_rx`. That process will read messages coming in and send them to [AppWindow] for proper
-        // processing.
-        //
-        // The core app will usually only send messages in response to a request, but this channel
-        // can also be used to tell the UI that something happened in the background, such as
-        // detecting a watch, detecting new tracks to import, and so forth.
-        let (ui_tx, ui_rx) = async_channel::unbounded::<app::AppResponse>();
-
-        // These channels are used for communicating with the app. Already I can see that a lot of
-        // different event handlers will need copies of app_tx in order to send requests into the
-        // UI.
-        let (app_tx, app_rx) = async_channel::unbounded::<app::AppInvocation>();
-
-        let window = AppWindow::new(app_id, RESOURCE_BASE_PATH, adw_app, app_tx.clone());
-
-        // Spawn a future where the UI will receive messages for the app window. Previously, this
-        // would have been done by creating a glib::MainContext::channel(), but that has been
-        // deprecated since gtk 4.10 in favor of using `async_channel`.
-        glib::spawn_future_local(async move {
-            // The app requests data to start with. This kicks everything off. The response from
-            // the app will cause the window to be updated shortly.
-            let _ = app_tx
-                .send(app::AppInvocation::RequestRecords(DayInterval::default()))
-                .await;
-
-            while let Ok(response) = ui_rx.recv().await {
-                window.process_response(response);
-            }
-        });
-
-        // The tokio runtime starts up here and will handle all of the asynchronous operations that
-        // the application needs to do. Messages arrive on `app_rx` and responses will be sent via
-        // `ui_tx`.
-        runtime.spawn({
-            let app = app.clone();
-            async move {
-                while let Ok(invocation) = app_rx.recv().await {
-                    let response = app.process_invocation(invocation).await;
-                    let _ = ui_tx.send(response).await;
-                }
-            }
-        });
+        AppWindow::new(app_id, RESOURCE_BASE_PATH, adw_app, ft_app.clone());
     });
 
     let args: Vec<String> = env::args().collect();

fitnesstrax/app/src/views/mod.rs

@@ -25,15 +25,6 @@ pub use placeholder_view::PlaceholderView;
 mod welcome_view;
 pub use welcome_view::WelcomeView;
 
-use emseries::Record;
-use ft_core::TraxRecord;
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ViewName {
-    Welcome,
-    Historical(Vec<Record<TraxRecord>>),
-}
-
 pub enum View {
     Placeholder(PlaceholderView),
     Welcome(WelcomeView),

fitnesstrax/app/src/views/welcome_view.rs

@@ -14,7 +14,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License along with FitnessTrax. If not, see <https://www.gnu.org/licenses/>.
 */
 
-use crate::components::FileChooserRow;
+use crate::{app::App, components::FileChooserRow};
 use glib::Object;
 use gtk::{prelude::*, subclass::prelude::*};
 use std::path::PathBuf;
@@ -43,9 +43,9 @@ glib::wrapper! {
 }
 
 impl WelcomeView {
-    pub fn new<F>(on_save: Box<F>) -> Self
+    pub fn new<OnSave>(on_save: OnSave) -> Self
     where
-        F: Fn(PathBuf) + 'static,
+        OnSave: Fn(PathBuf) + 'static,
     {
         let s: Self = Object::builder().build();
         s.set_orientation(gtk::Orientation::Vertical);
@@ -79,11 +79,11 @@ impl WelcomeView {
         content.append(&gtk::Label::new(Some("Welcome to FitnessTrax. The application has not yet been configured, so I will walk you through that. Let's start out by selecting your database.")));
         content.append(&db_row);
 
-        let on_save = on_save;
         save_button.connect_clicked({
+            let db_row = db_row.clone();
             move |_| {
                 if let Some(path) = db_row.path() {
-                    on_save(path)
+                    on_save(path);
                 }
             }
         });