fix(date-range): Fix issues with date filters

Author: mingue

src-tauri/src/journal.rs

@@ -75,8 +75,8 @@ impl Journal {
             sd_journal_seek_tail(self.ptr)?;
         }
 
-        if q.reset_position && q.no_more_recent_than_epoch > 0 {
-            sd_journal_seek_realtime_usec(self.ptr, q.no_more_recent_than_epoch)?;
+        if q.reset_position && q.date_less_than > 0 {
+            sd_journal_seek_realtime_usec(self.ptr, q.date_less_than)?;
         }
 
         let mut count: u64 = 0;
@@ -112,8 +112,8 @@ impl Journal {
                 break;
             }
 
-            if q.not_older_than_epoch > 0 && q.not_older_than_epoch >= last_timestamp {
-                debug!("Reached epoch time of {}", q.not_older_than_epoch);
+            if q.date_more_than > 0 && q.date_more_than >= last_timestamp {
+                debug!("Reached epoch time of {}", q.date_more_than);
                 break;
             }
 

src-tauri/src/main.rs

@@ -106,14 +106,14 @@ async fn get_logs(
     let date_to = DateTime::parse_from_rfc3339(&query.datetime_to).ok();
 
     if let Some(x) = date_from {
-        q.with_date_not_more_recent_than(x.timestamp_micros() as u64);
-    } else {
-        let datetime_to = Utc::now() - Duration::days(1);
-        q.with_date_not_more_recent_than(datetime_to.timestamp_micros() as u64);
+        q.with_date_more_than(x.timestamp_micros() as u64);
     }
 
     if let Some(x) = date_to {
-        q.with_date_not_older_than(x.timestamp_micros() as u64);
+        q.with_date_less_than(x.timestamp_micros() as u64);
+    } else {
+        let datetime_to = Utc::now() + Duration::days(1);
+        q.with_date_less_than(datetime_to.timestamp_micros() as u64);
     }
 
     let q = q.build();
@@ -159,14 +159,14 @@ async fn get_summary(query: SummaryQuery) -> Result<JournalEntries, JournalError
     )
     .unwrap();
 
-    let datetime_to = Utc::now() - Duration::days(5);
-    let datetime_from = Utc::now() + Duration::days(1);
+    let datetime_from = Utc::now() - Duration::days(5);
+    let datetime_to = Utc::now() + Duration::days(1);
     let mut qb = QueryBuilder::default();
     let q = qb
         .with_fields(vec!["__REALTIME".into()])
         .with_limit(10_000)
-        .with_date_not_older_than(datetime_to.timestamp_micros() as u64)
-        .with_date_not_more_recent_than(datetime_from.timestamp_micros() as u64)
+        .with_date_more_than(datetime_from.timestamp_micros() as u64)
+        .with_date_less_than(datetime_to.timestamp_micros() as u64)
         .with_priority_above_or_equal_to(query.priority)
         .build();
 

src-tauri/src/query.rs

@@ -6,8 +6,8 @@ pub struct Query {
     pub(crate) units: Vec<String>,
     pub(crate) slice: String,
     pub(crate) limit: u64,
-    pub(crate) no_more_recent_than_epoch: u64,
-    pub(crate) not_older_than_epoch: u64,
+    pub(crate) date_less_than: u64,
+    pub(crate) date_more_than: u64,
     pub(crate) transports: Vec<String>,
     pub(crate) quick_search: String,
     pub(crate) reset_position: bool,

src-tauri/src/query_builder.rs

@@ -17,8 +17,8 @@ impl QueryBuilder {
             boot_ids: vec![],
             limit: 100,
             transports: vec!["syslog".into(), "journal".into(), "stdout".into()],
-            no_more_recent_than_epoch: 0,
-            not_older_than_epoch: 0,
+            date_less_than: 0,
+            date_more_than: 0,
             quick_search: "".into(),
             reset_position: true,
         };
@@ -84,13 +84,13 @@ impl QueryBuilder {
         self
     }
 
-    pub fn with_date_not_more_recent_than(&mut self, from_epoch: u64) -> &mut Self {
-        self.query.no_more_recent_than_epoch = from_epoch;
+    pub fn with_date_less_than(&mut self, from_epoch: u64) -> &mut Self {
+        self.query.date_less_than = from_epoch;
         self
     }
 
-    pub fn with_date_not_older_than(&mut self, to_epoch: u64) -> &mut Self {
-        self.query.not_older_than_epoch = to_epoch;
+    pub fn with_date_more_than(&mut self, to_epoch: u64) -> &mut Self {
+        self.query.date_more_than = to_epoch;
         self
     }
 

src/App.vue

@@ -96,7 +96,7 @@ function quickSearch(search: string) {
 }
 
 function toggleTheme() {
-  vm.theme == "dark" ? vm.theme = "" : vm.theme = "dark"
+  vm.theme == "dark" ? (vm.theme = "") : (vm.theme = "dark");
 }
 
 function filter(filter: Filter) {