refactor: rename data_collection to collection

src/app.rs

@@ -20,8 +20,8 @@ use unicode_segmentation::{GraphemeCursor, UnicodeSegmentation};
 
 use crate::{
     canvas::components::time_chart::LegendPosition,
+    collection::{processes::Pid, temperature},
     constants,
-    data_collection::{processes::Pid, temperature},
     utils::data_units::DataUnit,
     widgets::{ProcWidgetColumn, ProcWidgetMode},
 };

src/app/data/process.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, vec::Vec};
 
-use crate::data_collection::processes::{Pid, ProcessHarvest};
+use crate::collection::processes::{Pid, ProcessHarvest};
 use hashbrown::HashMap;
 
 #[derive(Clone, Debug, Default)]

src/app/data/store.rs

@@ -4,9 +4,9 @@ use std::{
 };
 
 #[cfg(feature = "battery")]
-use crate::data_collection::batteries;
+use crate::collection::batteries;
 use crate::{
-    data_collection::{cpu, disks, memory::MemHarvest, network, Data},
+    collection::{cpu, disks, memory::MemHarvest, network, Data},
     dec_bytes_per_second_string,
     widgets::TempWidgetData,
 };

src/app/data/time_series.rs

@@ -10,7 +10,7 @@ use std::{
 use hashbrown::{HashMap, HashSet}; // TODO: Try fxhash again.
 use timeless::data::ChunkedData;
 
-use crate::data_collection::Data;
+use crate::collection::Data;
 
 /// Values corresponding to a time slice.
 pub type Values = ChunkedData<f64>;

src/app/process_killer.rs

@@ -10,7 +10,7 @@ use windows::Win32::{
     },
 };
 
-use crate::data_collection::processes::Pid;
+use crate::collection::processes::Pid;
 
 /// Based from [this SO answer](https://stackoverflow.com/a/55231715).
 #[cfg(target_os = "windows")]

src/canvas/widgets/battery_display.rs

@@ -11,8 +11,8 @@ use unicode_width::UnicodeWidthStr;
 use crate::{
     app::App,
     canvas::{drawing_utils::widget_block, Painter},
+    collection::batteries::BatteryState,
     constants::*,
-    data_collection::batteries::BatteryState,
 };
 
 /// Calculate how many bars are to be drawn within basic mode's components.

src/canvas/widgets/cpu_basic.rs

@@ -13,7 +13,7 @@ use crate::{
         drawing_utils::widget_block,
         Painter,
     },
-    data_collection::cpu::{CpuData, CpuDataType},
+    collection::cpu::{CpuData, CpuDataType},
 };
 
 impl Painter {

src/canvas/widgets/cpu_graph.rs

@@ -16,7 +16,7 @@ use crate::{
         drawing_utils::should_hide_x_label,
         Painter,
     },
-    data_collection::cpu::CpuData,
+    collection::cpu::CpuData,
     to_points,
     widgets::CpuWidgetState,
 };

src/canvas/widgets/mem_basic.rs

@@ -8,7 +8,7 @@ use tui::{
 use crate::{
     app::App,
     canvas::{components::pipe_gauge::PipeGauge, drawing_utils::widget_block, Painter},
-    data_collection::memory::MemHarvest,
+    collection::memory::MemHarvest,
     get_binary_unit_and_denominator,
 };
 

src/canvas/widgets/mem_graph.rs

@@ -14,7 +14,7 @@ use crate::{
         drawing_utils::should_hide_x_label,
         Painter,
     },
-    data_collection::memory::MemHarvest,
+    collection::memory::MemHarvest,
     get_binary_unit_and_denominator, to_points,
 };
 

src/data_collection.rs → src/collection.rs

@@ -1,6 +1,6 @@
 //! This is the main file to house data collection functions.
 //!
-//! TODO: Rename this to intake?
+//! TODO: Rename this to intake? Collection?
 
 #[cfg(feature = "nvidia")]
 pub mod nvidia;
@@ -238,7 +238,7 @@ impl DataCollector {
         self.data.cleanup();
     }
 
-    pub fn set_data_collection(&mut self, used_widgets: UsedWidgets) {
+    pub fn set_collection(&mut self, used_widgets: UsedWidgets) {
         self.widgets_to_harvest = used_widgets;
     }
 

src/data_collection/amd.rs → src/collection/amd.rs

@@ -2,7 +2,7 @@ mod amdgpu_marketing;
 
 use crate::{
     app::{filter::Filter, layout_manager::UsedWidgets},
-    data_collection::{
+    collection::{
         memory::MemHarvest,
         temperature::{TempHarvest, TemperatureType},
     },

src/data_collection/cpu/sysinfo.rs → src/collection/cpu/sysinfo.rs

@@ -6,7 +6,7 @@ use std::collections::VecDeque;
 use sysinfo::System;
 
 use super::{CpuData, CpuDataType, CpuHarvest};
-use crate::data_collection::error::CollectionResult;
+use crate::collection::error::CollectionResult;
 
 pub fn get_cpu_data_list(sys: &System, show_average_cpu: bool) -> CollectionResult<CpuHarvest> {
     let mut cpu_deque: VecDeque<_> = sys
@@ -32,7 +32,7 @@ pub fn get_cpu_data_list(sys: &System, show_average_cpu: bool) -> CollectionResu
 }
 
 #[cfg(target_family = "unix")]
-pub(crate) fn get_load_avg() -> crate::data_collection::cpu::LoadAvgHarvest {
+pub(crate) fn get_load_avg() -> crate::collection::cpu::LoadAvgHarvest {
     // The API for sysinfo apparently wants you to call it like this, rather than
     // using a &System.
     let sysinfo::LoadAvg { one, five, fifteen } = sysinfo::System::load_average();

src/data_collection/disks/freebsd.rs → src/collection/disks/freebsd.rs

@@ -6,9 +6,7 @@ use hashbrown::HashMap;
 use serde::Deserialize;
 
 use super::{keep_disk_entry, DiskHarvest, IoHarvest};
-use crate::data_collection::{
-    deserialize_xo, disks::IoData, error::CollectionResult, DataCollector,
-};
+use crate::collection::{deserialize_xo, disks::IoData, error::CollectionResult, DataCollector};
 
 #[derive(Deserialize, Debug, Default)]
 #[serde(rename_all = "kebab-case")]
@@ -40,7 +38,7 @@ pub fn get_io_usage() -> CollectionResult<IoHarvest> {
 
     #[cfg(feature = "zfs")]
     {
-        use crate::data_collection::disks::zfs_io_counters;
+        use crate::collection::disks::zfs_io_counters;
         if let Ok(zfs_io) = zfs_io_counters::zfs_io_stats() {
             for io in zfs_io.into_iter() {
                 let mount_point = io.device_name().to_string_lossy();

src/data_collection/disks/other.rs → src/collection/disks/other.rs

@@ -1,7 +1,7 @@
 //! Fallback disk info using sysinfo.
 
 use super::{keep_disk_entry, DiskHarvest};
-use crate::data_collection::DataCollector;
+use crate::collection::DataCollector;
 
 pub(crate) fn get_disk_usage(collector: &DataCollector) -> anyhow::Result<Vec<DiskHarvest>> {
     let disks = &collector.sys.disks;

src/data_collection/disks/unix.rs → src/collection/disks/unix.rs

@@ -25,7 +25,7 @@ use file_systems::*;
 use usage::*;
 
 use super::{keep_disk_entry, DiskHarvest};
-use crate::data_collection::DataCollector;
+use crate::collection::DataCollector;
 
 /// Returns the disk usage of the mounted (and for now, physical) disks.
 pub fn get_disk_usage(collector: &DataCollector) -> anyhow::Result<Vec<DiskHarvest>> {

src/data_collection/disks/unix/linux/counters.rs → src/collection/disks/unix/linux/counters.rs

@@ -7,7 +7,7 @@ use std::{
     str::FromStr,
 };
 
-use crate::data_collection::disks::IoCounters;
+use crate::collection::disks::IoCounters;
 
 /// Copied from the `psutil` sources:
 ///
@@ -87,7 +87,7 @@ pub fn io_stats() -> anyhow::Result<Vec<IoCounters>> {
 
     #[cfg(feature = "zfs")]
     {
-        use crate::data_collection::disks::zfs_io_counters;
+        use crate::collection::disks::zfs_io_counters;
         if let Ok(mut zfs_io) = zfs_io_counters::zfs_io_stats() {
             results.append(&mut zfs_io);
         }

src/data_collection/disks/unix/linux/partition.rs → src/collection/disks/unix/linux/partition.rs

@@ -12,7 +12,7 @@ use std::{
 
 use anyhow::bail;
 
-use crate::data_collection::disks::unix::{FileSystem, Usage};
+use crate::collection::disks::unix::{FileSystem, Usage};
 
 /// Representation of partition details. Based on [`heim`](https://github.com/heim-rs/heim/tree/master).
 pub(crate) struct Partition {

src/data_collection/disks/unix/macos/counters.rs → src/collection/disks/unix/macos/counters.rs

@@ -1,7 +1,7 @@
 //! Based on [heim's implementation](https://github.com/heim-rs/heim/blob/master/heim-disk/src/sys/macos/counters.rs).
 
 use super::io_kit::{self, get_dict, get_disks, get_i64, get_string};
-use crate::data_collection::disks::IoCounters;
+use crate::collection::disks::IoCounters;
 
 fn get_device_io(device: io_kit::IoObject) -> anyhow::Result<IoCounters> {
     let parent = device.service_parent()?;

src/data_collection/disks/unix/other/partition.rs → src/collection/disks/unix/other/partition.rs

@@ -8,7 +8,7 @@ use std::{
 use anyhow::bail;
 
 use super::bindings;
-use crate::data_collection::disks::unix::{FileSystem, Usage};
+use crate::collection::disks::unix::{FileSystem, Usage};
 
 pub(crate) struct Partition {
     device: String,

src/data_collection/disks/windows.rs → src/collection/disks/windows.rs

@@ -6,7 +6,7 @@ use bindings::*;
 use itertools::Itertools;
 
 use super::{keep_disk_entry, DiskHarvest};
-use crate::data_collection::{disks::IoCounters, DataCollector};
+use crate::collection::{disks::IoCounters, DataCollector};
 
 /// Returns I/O stats.
 pub(crate) fn io_stats() -> anyhow::Result<Vec<IoCounters>> {

src/data_collection/disks/zfs_io_counters.rs → src/collection/disks/zfs_io_counters.rs

@@ -1,4 +1,4 @@
-use crate::data_collection::disks::IoCounters;
+use crate::collection::disks::IoCounters;
 
 /// Returns zpool I/O stats. Pulls data from `sysctl
 /// kstat.zfs.{POOL}.dataset.{objset-*}`

src/data_collection/memory/sysinfo.rs → src/collection/memory/sysinfo.rs

@@ -2,7 +2,7 @@
 
 use sysinfo::System;
 
-use crate::data_collection::memory::MemHarvest;
+use crate::collection::memory::MemHarvest;
 
 /// Returns RAM usage.
 pub(crate) fn get_ram_usage(sys: &System) -> Option<MemHarvest> {

src/data_collection/memory/windows.rs → src/collection/memory/windows.rs

@@ -2,7 +2,7 @@ use std::mem::{size_of, zeroed};
 
 use windows::Win32::System::ProcessStatus::{GetPerformanceInfo, PERFORMANCE_INFORMATION};
 
-use crate::data_collection::memory::MemHarvest;
+use crate::collection::memory::MemHarvest;
 
 const PERFORMANCE_INFORMATION_SIZE: u32 = size_of::<PERFORMANCE_INFORMATION>() as _;
 

src/data_collection/nvidia.rs → src/collection/nvidia.rs

@@ -7,7 +7,7 @@ use nvml_wrapper::{
 
 use crate::{
     app::{filter::Filter, layout_manager::UsedWidgets},
-    data_collection::{
+    collection::{
         memory::MemHarvest,
         temperature::{TempHarvest, TemperatureType},
     },

src/data_collection/processes.rs → src/collection/processes.rs

@@ -145,7 +145,7 @@ impl DataCollector {
             } else if #[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "windows", target_os = "android", target_os = "ios"))] {
                 sysinfo_process_data(self)
             } else {
-                Err(crate::data_collection::error::CollectionError::Unsupported)
+                Err(crate::collection::error::CollectionError::Unsupported)
             }
         }
     }

src/data_collection/processes/freebsd.rs → src/collection/processes/freebsd.rs

@@ -5,7 +5,7 @@ use std::{io, process::Command};
 use hashbrown::HashMap;
 use serde::{Deserialize, Deserializer};
 
-use crate::data_collection::{deserialize_xo, processes::UnixProcessExt, Pid};
+use crate::collection::{deserialize_xo, processes::UnixProcessExt, Pid};
 
 #[derive(Deserialize, Debug, Default)]
 #[serde(rename_all = "kebab-case")]

src/data_collection/processes/linux.rs → src/collection/processes/linux.rs

@@ -13,7 +13,7 @@ use process::*;
 use sysinfo::ProcessStatus;
 
 use super::{Pid, ProcessHarvest, UserTable};
-use crate::data_collection::{error::CollectionResult, DataCollector};
+use crate::collection::{error::CollectionResult, DataCollector};
 
 /// Maximum character length of a `/proc/<PID>/stat`` process name.
 /// If it's equal or greater, then we instead refer to the command for the name.

src/data_collection/processes/linux/process.rs → src/collection/processes/linux/process.rs

@@ -16,7 +16,7 @@ use rustix::{
     path::Arg,
 };
 
-use crate::data_collection::processes::Pid;
+use crate::collection::processes::Pid;
 
 static PAGESIZE: OnceLock<u64> = OnceLock::new();
 

src/data_collection/processes/macos.rs → src/collection/processes/macos.rs

@@ -8,7 +8,7 @@ use hashbrown::HashMap;
 use itertools::Itertools;
 
 use super::UnixProcessExt;
-use crate::data_collection::Pid;
+use crate::collection::Pid;
 
 pub(crate) struct MacOSProcessExt;
 

src/data_collection/processes/macos/sysctl_bindings.rs → src/collection/processes/macos/sysctl_bindings.rs

@@ -10,7 +10,7 @@ use libc::{
 };
 use mach2::vm_types::user_addr_t;
 
-use crate::data_collection::Pid;
+use crate::collection::Pid;
 
 #[repr(C)]
 pub(crate) struct kinfo_proc {

src/data_collection/processes/unix.rs → src/collection/processes/unix.rs

@@ -12,8 +12,8 @@ cfg_if! {
 
         use super::ProcessHarvest;
 
-        use crate::data_collection::{DataCollector, processes::*};
-        use crate::data_collection::error::CollectionResult;
+        use crate::collection::{DataCollector, processes::*};
+        use crate::collection::error::CollectionResult;
 
         pub fn sysinfo_process_data(collector: &mut DataCollector) -> CollectionResult<Vec<ProcessHarvest>> {
             let sys = &collector.sys.system;

src/data_collection/processes/unix/process_ext.rs → src/collection/processes/unix/process_ext.rs

@@ -6,7 +6,7 @@ use hashbrown::HashMap;
 use sysinfo::{ProcessStatus, System};
 
 use super::ProcessHarvest;
-use crate::data_collection::{error::CollectionResult, processes::UserTable, Pid};
+use crate::collection::{error::CollectionResult, processes::UserTable, Pid};
 
 pub(crate) trait UnixProcessExt {
     fn sysinfo_process_data(

src/data_collection/processes/unix/user_table.rs → src/collection/processes/unix/user_table.rs

@@ -1,6 +1,6 @@
 use hashbrown::HashMap;
 
-use crate::data_collection::error::{CollectionError, CollectionResult};
+use crate::collection::error::{CollectionError, CollectionResult};
 
 #[derive(Debug, Default)]
 pub struct UserTable {

src/data_collection/processes/windows.rs → src/collection/processes/windows.rs

@@ -3,7 +3,7 @@
 use std::time::Duration;
 
 use super::ProcessHarvest;
-use crate::data_collection::{error::CollectionResult, DataCollector};
+use crate::collection::{error::CollectionResult, DataCollector};
 
 // TODO: There's a lot of shared code with this and the unix impl.
 pub fn sysinfo_process_data(

src/data_collection/temperature.rs → src/collection/temperature.rs

@@ -116,7 +116,7 @@ impl Display for TypedTemperature {
 
 #[cfg(test)]
 mod test {
-    use crate::data_collection::temperature::{TemperatureType, TypedTemperature};
+    use crate::collection::temperature::{TemperatureType, TypedTemperature};
 
     #[test]
     fn temp_conversions() {

src/event.rs

@@ -6,7 +6,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKi
 
 use crate::{
     app::{layout_manager::WidgetDirection, App},
-    data_collection::Data,
+    collection::Data,
 };
 
 /// Events sent to the main thread.