feat(runtime): add host wall clock and administrative UTC timestamps
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
This commit is contained in:
@@ -619,7 +619,7 @@ mod tests {
|
||||
app_id: 42,
|
||||
app_version: "1.0.0".to_string(),
|
||||
path: PathBuf::from("test-cartridges/stress-console"),
|
||||
discovered_at: std::time::SystemTime::UNIX_EPOCH,
|
||||
discovered_at: 0,
|
||||
};
|
||||
|
||||
let action = action_for_click(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use prometeu_hal::WallClock;
|
||||
use prometeu_hal::app_mode::AppMode;
|
||||
use prometeu_hal::cartridge::CartridgeManifest;
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::time::SystemTime;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct GameLibraryEntry {
|
||||
@@ -11,11 +11,12 @@ pub struct GameLibraryEntry {
|
||||
pub app_id: u32,
|
||||
pub app_version: String,
|
||||
pub path: PathBuf,
|
||||
pub discovered_at: SystemTime,
|
||||
/// UTC seconds sampled once for the discovery scan, from the selected host clock.
|
||||
pub discovered_at: u64,
|
||||
}
|
||||
|
||||
impl GameLibraryEntry {
|
||||
fn new(path: PathBuf, manifest: CartridgeManifest, discovered_at: SystemTime) -> Self {
|
||||
fn new(path: PathBuf, manifest: CartridgeManifest, discovered_at: u64) -> Self {
|
||||
Self {
|
||||
title: manifest.title.clone(),
|
||||
app_id: manifest.app_id,
|
||||
@@ -91,9 +92,9 @@ impl GameLibrary {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn discover_games_root(root: impl AsRef<Path>) -> GameLibrary {
|
||||
pub fn discover_games_root(root: impl AsRef<Path>, wall_clock: &dyn WallClock) -> GameLibrary {
|
||||
let root = root.as_ref();
|
||||
let discovered_at = SystemTime::now();
|
||||
let discovered_at = wall_clock.utc_unix_seconds();
|
||||
|
||||
if !root.is_dir() {
|
||||
return GameLibrary {
|
||||
@@ -153,7 +154,7 @@ pub fn discover_games_root(root: impl AsRef<Path>) -> GameLibrary {
|
||||
|
||||
fn discover_candidate(
|
||||
path: &Path,
|
||||
discovered_at: SystemTime,
|
||||
discovered_at: u64,
|
||||
) -> Result<GameLibraryEntry, GameLibraryDiagnosticReason> {
|
||||
let manifest_path = path.join("manifest.json");
|
||||
if !manifest_path.exists() {
|
||||
@@ -185,8 +186,26 @@ fn discover_candidate(
|
||||
mod tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
use std::cell::Cell;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
use std::time::UNIX_EPOCH;
|
||||
|
||||
struct CountingClock {
|
||||
seconds: Cell<u64>,
|
||||
calls: Cell<usize>,
|
||||
}
|
||||
|
||||
impl CountingClock {
|
||||
fn new(seconds: u64) -> Self {
|
||||
Self { seconds: Cell::new(seconds), calls: Cell::new(0) }
|
||||
}
|
||||
}
|
||||
|
||||
impl WallClock for CountingClock {
|
||||
fn utc_unix_seconds(&self) -> u64 {
|
||||
self.calls.set(self.calls.get() + 1);
|
||||
self.seconds.get()
|
||||
}
|
||||
}
|
||||
|
||||
static TEST_DIR_COUNTER: AtomicU64 = AtomicU64::new(0);
|
||||
|
||||
@@ -254,7 +273,7 @@ mod tests {
|
||||
fs::write(nested_parent.join("nested-game").join("program.pbx"), [0_u8])
|
||||
.expect("nested program should be written");
|
||||
|
||||
let library = discover_games_root(&root.path);
|
||||
let library = discover_games_root(&root.path, &CountingClock::new(123));
|
||||
|
||||
assert_eq!(library.entries().len(), 2);
|
||||
assert_eq!(library.entries()[0].title, "Alpha");
|
||||
@@ -262,7 +281,7 @@ mod tests {
|
||||
assert_eq!(library.entries()[0].app_version, "1.0.0");
|
||||
assert_eq!(library.entries()[0].manifest.app_mode, AppMode::Game);
|
||||
assert!(library.entries()[0].path.ends_with("alpha"));
|
||||
assert!(library.entries()[0].discovered_at >= UNIX_EPOCH);
|
||||
assert_eq!(library.entries()[0].discovered_at, 123);
|
||||
assert_eq!(library.entries()[1].title, "Zeta");
|
||||
|
||||
assert!(library.diagnostics().iter().any(|diagnostic| {
|
||||
@@ -293,7 +312,7 @@ mod tests {
|
||||
app_mode: AppMode::Game,
|
||||
capabilities: vec![],
|
||||
},
|
||||
UNIX_EPOCH,
|
||||
0,
|
||||
);
|
||||
|
||||
let target = entry.switch_target();
|
||||
@@ -309,7 +328,7 @@ mod tests {
|
||||
let root = TestRoot::new();
|
||||
let missing = root.path.join("missing");
|
||||
|
||||
let library = discover_games_root(&missing);
|
||||
let library = discover_games_root(&missing, &CountingClock::new(0));
|
||||
|
||||
assert!(library.is_empty());
|
||||
assert_eq!(library.diagnostics().len(), 1);
|
||||
@@ -321,7 +340,7 @@ mod tests {
|
||||
let games_root =
|
||||
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../..").join("test-cartridges");
|
||||
|
||||
let library = discover_games_root(games_root);
|
||||
let library = discover_games_root(games_root, &CountingClock::new(0));
|
||||
let entries = library.entries();
|
||||
|
||||
assert!(entries.iter().any(|entry| {
|
||||
@@ -333,4 +352,24 @@ mod tests {
|
||||
entry.app_id == 2 && entry.title == "Dummy Boy" && entry.path.ends_with("dummy-boy")
|
||||
}));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn discovery_samples_once_per_scan_and_preserves_adjustments_and_full_range() {
|
||||
let root = TestRoot::new();
|
||||
root.add_candidate("zeta", manifest("Zeta", 2, "Game"), true);
|
||||
root.add_candidate("alpha", manifest("Alpha", 1, "Game"), true);
|
||||
let clock = CountingClock::new(u64::MAX);
|
||||
let first = discover_games_root(&root.path, &clock);
|
||||
assert_eq!(clock.calls.get(), 1);
|
||||
assert_eq!(first.entries().len(), 2);
|
||||
assert!(first.entries().iter().all(|entry| entry.discovered_at == u64::MAX));
|
||||
|
||||
clock.seconds.set(7);
|
||||
let second = discover_games_root(&root.path, &clock);
|
||||
assert_eq!(clock.calls.get(), 2);
|
||||
assert!(second.entries().iter().all(|entry| entry.discovered_at == 7));
|
||||
assert_eq!(second.entries()[0].app_id, 1);
|
||||
assert_eq!(second.entries()[1].app_id, 2);
|
||||
assert!(first.entries().iter().all(|entry| entry.discovered_at == u64::MAX));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user