Plumbing for source locator (#36)

StanfordLegion · Oct 27, 2023 · 1ef7f65 · 1ef7f65
1 parent 56ccfb9
commit 1ef7f65
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ rand = { version = "0.8" }
 # transitive depedency, required for rand to support wasm
 getrandom = { version = "0.2", features = ["js"] }
 
+itertools = "0.11.0"
 percentage = "0.1.0"
 regex = "1.10.0"
 

diff --git a/src/app.rs b/src/app.rs
@@ -8,6 +8,8 @@ use egui::{
     Align2, Color32, NumExt, Pos2, Rect, RichText, ScrollArea, Slider, Stroke, TextStyle, Vec2,
 };
 use egui_extras::{Column, TableBuilder};
+#[cfg(not(target_arch = "wasm32"))]
+use itertools::Itertools;
 use percentage::{Percentage, PercentageInteger};
 use regex::{escape, Regex};
 use serde::{Deserialize, Serialize};
@@ -2542,9 +2544,24 @@ impl UiExtra for egui::Ui {
 pub fn start(data_sources: Vec<Box<dyn DeferredDataSource>>) {
     env_logger::try_init().unwrap_or(()); // Log to stderr (if you run with `RUST_LOG=debug`).
 
+    let all_locators = data_sources
+        .iter()
+        .flat_map(|x| x.fetch_description().source_locator)
+        .collect::<Vec<_>>();
+
+    let unique_locators = all_locators.into_iter().unique().collect_vec();
+
+    let locator = match &unique_locators[..] {
+        [] => "No data source".to_string(),
+        [x] => x.to_string(),
+        [x, ..] => format!("{} and {} other sources", x, unique_locators.len() - 1),
+    };
+
+    let app_name = format!("{locator} - Legion Prof");
+
     let native_options = eframe::NativeOptions::default();
     eframe::run_native(
-        "Legion Prof",
+        &app_name,
         native_options,
         Box::new(|cc| Box::new(ProfApp::new(cc, data_sources))),
     )

diff --git a/src/data.rs b/src/data.rs
@@ -206,7 +206,13 @@ pub struct SlotMetaTile {
     pub data: SlotMetaTileData,
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct DataSourceDescription {
+    pub source_locator: Vec<String>,
+}
+
 pub trait DataSource {
+    fn fetch_description(&self) -> DataSourceDescription;
     fn fetch_info(&self) -> DataSourceInfo;
     fn fetch_summary_tile(&self, entry_id: &EntryID, tile_id: TileID, full: bool) -> SummaryTile;
     fn fetch_slot_tile(&self, entry_id: &EntryID, tile_id: TileID, full: bool) -> SlotTile;
@@ -215,6 +221,7 @@ pub trait DataSource {
 }
 
 pub trait DataSourceMut {
+    fn fetch_description(&self) -> DataSourceDescription;
     fn fetch_info(&mut self) -> DataSourceInfo;
     fn fetch_summary_tile(
         &mut self,
@@ -232,6 +239,9 @@ pub trait DataSourceMut {
 }
 
 impl<T: DataSource> DataSourceMut for T {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSource::fetch_description(self)
+    }
     fn fetch_info(&mut self) -> DataSourceInfo {
         DataSource::fetch_info(self)
     }

diff --git a/src/deferred_data.rs b/src/deferred_data.rs
@@ -1,8 +1,10 @@
 use crate::data::{
-    DataSourceInfo, DataSourceMut, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID,
+    DataSourceDescription, DataSourceInfo, DataSourceMut, EntryID, SlotMetaTile, SlotTile,
+    SummaryTile, TileID,
 };
 
 pub trait DeferredDataSource {
+    fn fetch_description(&self) -> DataSourceDescription;
     fn fetch_info(&mut self);
     fn get_infos(&mut self) -> Vec<DataSourceInfo>;
     fn fetch_summary_tile(&mut self, entry_id: &EntryID, tile_id: TileID, full: bool);
@@ -34,6 +36,10 @@ impl<T: DataSourceMut> DeferredDataSourceWrapper<T> {
 }
 
 impl<T: DataSourceMut> DeferredDataSource for DeferredDataSourceWrapper<T> {
+    fn fetch_description(&self) -> DataSourceDescription {
+        self.data_source.fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         self.infos.push(self.data_source.fetch_info());
     }
@@ -102,6 +108,10 @@ impl<T: DeferredDataSource> CountingDeferredDataSource<T> {
 }
 
 impl<T: DeferredDataSource> DeferredDataSource for CountingDeferredDataSource<T> {
+    fn fetch_description(&self) -> DataSourceDescription {
+        self.data_source.fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         self.start_request();
         self.data_source.fetch_info()
@@ -145,6 +155,10 @@ impl<T: DeferredDataSource> DeferredDataSource for CountingDeferredDataSource<T>
 }
 
 impl DeferredDataSource for Box<dyn DeferredDataSource> {
+    fn fetch_description(&self) -> DataSourceDescription {
+        self.as_ref().fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         self.as_mut().fetch_info()
     }

diff --git a/src/file_data.rs b/src/file_data.rs
@@ -4,7 +4,8 @@ use std::path::{Path, PathBuf};
 use serde::Deserialize;
 
 use crate::data::{
-    DataSource, DataSourceInfo, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID,
+    DataSource, DataSourceDescription, DataSourceInfo, EntryID, SlotMetaTile, SlotTile,
+    SummaryTile, TileID,
 };
 use crate::http::schema::TileRequestRef;
 
@@ -30,6 +31,11 @@ impl FileDataSource {
 }
 
 impl DataSource for FileDataSource {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSourceDescription {
+            source_locator: vec![String::from(self.basedir.to_string_lossy())],
+        }
+    }
     fn fetch_info(&self) -> DataSourceInfo {
         let path = self.basedir.join("info");
         self.read_file::<DataSourceInfo>(&path)

diff --git a/src/http/client.rs b/src/http/client.rs
@@ -13,7 +13,9 @@ use serde::Deserialize;
 
 use url::Url;
 
-use crate::data::{DataSourceInfo, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID};
+use crate::data::{
+    DataSourceDescription, DataSourceInfo, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID,
+};
 use crate::deferred_data::DeferredDataSource;
 use crate::http::fetch::{fetch, DataSourceResponse};
 use crate::http::schema::TileRequestRef;
@@ -62,6 +64,12 @@ impl HTTPClientDataSource {
 }
 
 impl DeferredDataSource for HTTPClientDataSource {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSourceDescription {
+            source_locator: vec![self.baseurl.to_string()],
+        }
+    }
+
     fn fetch_info(&mut self) {
         let url = self.baseurl.join("info").expect("invalid baseurl");
         self.request::<DataSourceInfo>(url, self.infos.clone());

diff --git a/src/main.rs b/src/main.rs
@@ -6,9 +6,9 @@ use rand::Rng;
 use std::collections::BTreeMap;
 
 use legion_prof_viewer::data::{
-    DataSourceInfo, DataSourceMut, EntryID, EntryInfo, Field, FieldID, FieldSchema, Item, ItemMeta,
-    ItemUID, SlotMetaTile, SlotMetaTileData, SlotTile, SlotTileData, SummaryTile, SummaryTileData,
-    TileID, TileSet, UtilPoint,
+    DataSourceDescription, DataSourceInfo, DataSourceMut, EntryID, EntryInfo, Field, FieldID,
+    FieldSchema, Item, ItemMeta, ItemUID, SlotMetaTile, SlotMetaTileData, SlotTile, SlotTileData,
+    SummaryTile, SummaryTileData, TileID, TileSet, UtilPoint,
 };
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -268,6 +268,11 @@ impl RandomDataSource {
 }
 
 impl DataSourceMut for RandomDataSource {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSourceDescription {
+            source_locator: vec!["Random Data Source".to_string()],
+        }
+    }
     fn fetch_info(&mut self) -> DataSourceInfo {
         self.info.clone()
     }

diff --git a/src/merge_data.rs b/src/merge_data.rs
@@ -1,8 +1,8 @@
 use std::collections::VecDeque;
 
 use crate::data::{
-    DataSourceInfo, EntryID, EntryIndex, EntryInfo, Field, ItemLink, ItemUID, SlotMetaTile,
-    SlotTile, SummaryTile, TileID,
+    DataSourceDescription, DataSourceInfo, EntryID, EntryIndex, EntryInfo, Field, ItemLink,
+    ItemUID, SlotMetaTile, SlotTile, SummaryTile, TileID,
 };
 use crate::deferred_data::DeferredDataSource;
 use crate::timestamp::Interval;
@@ -192,6 +192,16 @@ impl MergeDeferredDataSource {
 }
 
 impl DeferredDataSource for MergeDeferredDataSource {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSourceDescription {
+            source_locator: self
+                .data_sources
+                .iter()
+                .flat_map(|x| x.fetch_description().source_locator)
+                .collect::<Vec<_>>(),
+        }
+    }
+
     fn fetch_info(&mut self) {
         for data_source in &mut self.data_sources {
             data_source.fetch_info();

diff --git a/src/parallel_data.rs b/src/parallel_data.rs
@@ -1,7 +1,8 @@
 use std::sync::{Arc, Mutex};
 
 use crate::data::{
-    DataSource, DataSourceInfo, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID,
+    DataSource, DataSourceDescription, DataSourceInfo, EntryID, SlotMetaTile, SlotTile,
+    SummaryTile, TileID,
 };
 use crate::deferred_data::DeferredDataSource;
 
@@ -26,6 +27,10 @@ impl<T: DataSource + Send + Sync + 'static> ParallelDeferredDataSource<T> {
 }
 
 impl<T: DataSource + Send + Sync + 'static> DeferredDataSource for ParallelDeferredDataSource<T> {
+    fn fetch_description(&self) -> DataSourceDescription {
+        self.data_source.fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         let data_source = self.data_source.clone();
         let infos = self.infos.clone();