plumbing for source locator

StanfordLegion · Oct 20, 2023 · 5a97972 · 5a97972
1 parent 665d9ec
commit 5a97972
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 7 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -2539,12 +2539,21 @@ impl UiExtra for egui::Ui {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-pub fn start(data_sources: Vec<Box<dyn DeferredDataSource>>) {
+pub fn start(mut data_sources: Vec<Box<dyn DeferredDataSource>>) {
     env_logger::try_init().unwrap_or(()); // Log to stderr (if you run with `RUST_LOG=debug`).
 
+    let app_name = if data_sources.len() == 1 {
+        match data_sources[0].get_description().source_locator {
+            Some(source_locator) => source_locator,
+            _ => String::from("Legion Prof"),
+        }
+    } else {
+        String::from("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: Option<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(&mut 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(&mut 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(&mut self);
+    fn get_description(&mut 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,14 @@ impl<T: DataSourceMut> DeferredDataSourceWrapper<T> {
 }
 
 impl<T: DataSourceMut> DeferredDataSource for DeferredDataSourceWrapper<T> {
+    fn fetch_description(&mut self) {
+
+    }
+
+    fn get_description(&mut self) -> DataSourceDescription {
+        self.data_source.fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         self.infos.push(self.data_source.fetch_info());
     }
@@ -102,6 +112,17 @@ impl<T: DeferredDataSource> CountingDeferredDataSource<T> {
 }
 
 impl<T: DeferredDataSource> DeferredDataSource for CountingDeferredDataSource<T> {
+    fn fetch_description(&mut self) {
+        self.start_request();
+        self.data_source.fetch_description()
+    }
+
+    fn get_description(&mut self) -> DataSourceDescription {
+        let result = self.data_source.get_description();
+        self.outstanding_requests -= 1;
+        result
+    }
+
     fn fetch_info(&mut self) {
         self.start_request();
         self.data_source.fetch_info()
@@ -145,6 +166,14 @@ impl<T: DeferredDataSource> DeferredDataSource for CountingDeferredDataSource<T>
 }
 
 impl DeferredDataSource for Box<dyn DeferredDataSource> {
+    fn fetch_description(&mut self) {
+        self.as_mut().fetch_description()
+    }
+
+    fn get_description(&mut self) -> DataSourceDescription {
+        self.as_mut().get_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,7 @@ 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 +30,9 @@ impl FileDataSource {
 }
 
 impl DataSource for FileDataSource {
+    fn fetch_description(&self) -> DataSourceDescription {
+        DataSourceDescription { source_locator: None }
+    }
     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,7 @@ 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 +62,14 @@ impl HTTPClientDataSource {
 }
 
 impl DeferredDataSource for HTTPClientDataSource {
+    fn fetch_description(&mut self) {
+
+    }
+
+    fn get_description(&mut self) -> DataSourceDescription {
+        DataSourceDescription {source_locator: None}
+    }
+
     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,7 +6,7 @@ use rand::Rng;
 use std::collections::BTreeMap;
 
 use legion_prof_viewer::data::{
-    DataSourceInfo, DataSourceMut, EntryID, EntryInfo, Field, FieldID, FieldSchema, Item, ItemMeta,
+    DataSourceDescription, DataSourceInfo, DataSourceMut, EntryID, EntryInfo, Field, FieldID, FieldSchema, Item, ItemMeta,
     ItemUID, SlotMetaTile, SlotMetaTileData, SlotTile, SlotTileData, SummaryTile, SummaryTileData,
     TileID, TileSet, UtilPoint,
 };
@@ -268,6 +268,9 @@ impl RandomDataSource {
 }
 
 impl DataSourceMut for RandomDataSource {
+    fn fetch_description(&mut self) -> DataSourceDescription {
+        DataSourceDescription { source_locator: None }
+    }
     fn fetch_info(&mut self) -> DataSourceInfo {
         self.info.clone()
     }

diff --git a/src/parallel_data.rs b/src/parallel_data.rs
@@ -1,7 +1,7 @@
 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 +26,14 @@ impl<T: DataSource + Send + Sync + 'static> ParallelDeferredDataSource<T> {
 }
 
 impl<T: DataSource + Send + Sync + 'static> DeferredDataSource for ParallelDeferredDataSource<T> {
+    fn fetch_description(&mut self) {
+
+    }
+
+    fn get_description(&mut self) -> DataSourceDescription {
+        self.data_source.fetch_description()
+    }
+
     fn fetch_info(&mut self) {
         let data_source = self.data_source.clone();
         let infos = self.infos.clone();