From fdbaec6f822b4e7cdbdf63aabceb4d92b6a12326 Mon Sep 17 00:00:00 2001 From: Ricky Kresslein Date: Thu, 16 Jun 2022 11:51:18 +0300 Subject: Fix date bug --- Cargo.lock | 10 ++++++++++ src/ui/task_details.rs | 1 - src/ui/tasks_page.rs | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 66fa5c3..f5675f5 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,6 +259,7 @@ dependencies = [ "gtk4-macros", "itertools", "libadwaita", + "libc-strftime", "log", "num-derive", "num-traits", @@ -698,6 +699,15 @@ version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94" +[[package]] +name = "libc-strftime" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3badb12f3d8623017f2cff9de476ff32f426ef45419253366fa088b8df6364cf" +dependencies = [ + "libc", +] + [[package]] name = "libdbus-sys" version = "0.2.2" diff --git a/src/ui/task_details.rs b/src/ui/task_details.rs index 685e261..b8771ac 100755 --- a/src/ui/task_details.rs +++ b/src/ui/task_details.rs @@ -126,7 +126,6 @@ impl FurTaskDetails { task_box.set_homogeneous(true); let start_time = DateTime::parse_from_rfc3339(&task.start_time).unwrap(); - Local.from_local_datetime(&start_time).unwrap(); let mut start_time_str = start_time.format("%H:%M:%S").to_string(); if !settings_manager::get_bool("show-seconds") { start_time_str = start_time.format("%H:%M").to_string(); diff --git a/src/ui/tasks_page.rs b/src/ui/tasks_page.rs index 911b005..bdee606 100755 --- a/src/ui/tasks_page.rs +++ b/src/ui/tasks_page.rs @@ -20,6 +20,7 @@ use chrono::{DateTime, Duration, Local}; use gettextrs::*; use gtk::subclass::prelude::*; use gtk::{glib, prelude::*}; +use libc_strftime::{epoch, strftime_local}; use crate::database::{self, SortOrder, TaskSort}; use crate::settings_manager; @@ -87,6 +88,10 @@ impl FurTasksPage { pub fn build_task_list(&self) { let imp = imp::FurTasksPage::from_instance(&self); + let now = epoch(); // most likely a u64 + let local = strftime_local("%h %e", now); + println!("On est: {}", local); + let tasks_list = database::retrieve(TaskSort::StartTime, SortOrder::Descending).unwrap(); let mut uniq_date_list: Vec = Vec::new(); -- cgit 1.4.1