Cutieguwu/kramer
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from Cutieguwu/rapid-dev

Browse Source 
Merge rapid-dev edits into Main.
This commit was merged in pull request #10.
This commit is contained in:
Olivia Brooks
2025-03-11 18:25:19 -04:00
committed by GitHub
parent f8a98c3743 1c30ed0c51
commit c2767c6547
4 changed files with 88 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "aho-corasick"
@@ -247,9 +247,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.170"
version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "libyml"
@@ -424,18 +424,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.218"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.218"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",

8
Cargo.toml
View File

@@ -10,12 +10,12 @@ edition = "2021"
#
# For clap info, see [dependencies.clap]
# For serde info, see [dependencies.serde]
libc = "0.2.170, >=0.2.169, <=0.2.170"
libc = "0.2.171, ~0.2.169"
ron = "0.8.1, >=0.8, <0.9"
rust-i18n = "3.1.3, >=3.1.3, <3.2"
rust-i18n = "3.1.3, ~3.1.3"
[dependencies.clap]
version = "4.5, >=4.5.27, <=4.6"
version = "4.5, ~4.5.27"
default-features = false
features = [
# From default features collection
@@ -30,5 +30,5 @@ features = [
]
[dependencies.serde]
version = "1.0.218, >=1.0.217, <=1.0.218"
version = "1.0.219, ~1.0.217"
features = ["derive"]

117
src/mapping.rs
View File

@@ -28,9 +28,8 @@ impl Domain {
/// A map for data stored in memory for processing and saving to disk.
#[derive(Clone, Debug, Deserialize)]
#[derive(Clone, Copy, Debug, Deserialize, PartialEq)]
pub struct Cluster {
data: Option<Vec<u8>>,
domain: Domain,
stage: Stage,
}
@@ -38,50 +37,24 @@ pub struct Cluster {
impl Default for Cluster {
fn default() -> Self {
Cluster {
data: None,
domain: Domain::default(),
stage: Stage::default()
}
}
}
/// Map for data stored on disk.
/// Rather have a second cluster type than inflating size
/// of output map by defining Option::None constantly.
#[derive(Clone, Copy, Debug, Deserialize, PartialEq)]
pub struct MapCluster {
pub domain: Domain,
pub stage: Stage,
}
impl Default for MapCluster {
fn default() -> Self {
MapCluster { domain: Domain::default(), stage: Stage::default() }
}
}
impl From<Cluster> for MapCluster {
fn from(cluster: Cluster) -> Self {
MapCluster {
domain: cluster.domain,
stage: cluster.stage,
}
}
}
impl MapCluster {
impl Cluster {
/// Breaks apart into a vec of clusters,
/// each of cluster_size, excepting last.
pub fn subdivide(&mut self, cluster_len: usize) -> Vec<MapCluster> {
pub fn subdivide(&mut self, cluster_len: usize) -> Vec<Cluster> {
let domain_len = self.domain.len();
let mut start = self.domain.start;
let mut clusters: Vec<MapCluster> = vec![];
let mut clusters: Vec<Cluster> = vec![];
for _ in 0..(domain_len as f64 / cluster_len as f64).floor() as usize {
clusters.push(MapCluster {
clusters.push(Cluster {
domain: Domain {
start: start,
start,
end: start + cluster_len,
},
stage: self.stage,
@@ -90,9 +63,9 @@ impl MapCluster {
start += cluster_len;
}
clusters.push(MapCluster {
clusters.push(Cluster {
domain: Domain {
start: start,
start,
end: self.domain.end,
},
stage: self.stage,
@@ -126,7 +99,7 @@ impl Default for Stage {
pub struct MapFile {
pub sector_size: u16,
pub domain: Domain,
pub map: Vec<MapCluster>,
pub map: Vec<Cluster>,
}
impl TryFrom<File> for MapFile {
@@ -142,7 +115,7 @@ impl Default for MapFile {
MapFile {
sector_size: FB_SECTOR_SIZE,
domain: Domain::default(),
map: vec![MapCluster {
map: vec![Cluster {
domain: Domain::default(),
stage: Stage::Untested,
}],
@@ -164,7 +137,7 @@ impl MapFile {
/// Recalculate cluster mappings.
fn update(&mut self, new_cluster: Cluster) -> &mut Self {
let mut new_map: Vec<MapCluster> = vec![MapCluster::from(new_cluster.to_owned())];
let mut new_map: Vec<Cluster> = vec![Cluster::from(new_cluster.to_owned())];
for map_cluster in self.map.iter() {
let mut map_cluster = *map_cluster;
@@ -203,7 +176,7 @@ impl MapFile {
NOTE: Crop completed above.
*/
new_map.push(MapCluster {
new_map.push(Cluster {
domain: Domain {
start: new_cluster.domain.end,
end: domain_end,
@@ -250,7 +223,7 @@ impl MapFile {
}
/// Get clusters of common stage.
pub fn get_clusters(&self, stage: Stage) -> Vec<MapCluster> {
pub fn get_clusters(&self, stage: Stage) -> Vec<Cluster> {
self.map.iter()
.filter_map(|mc| {
if mc.stage == stage { Some(mc.to_owned()) } else { None }
@@ -262,17 +235,17 @@ impl MapFile {
/// I.E. check forwards every cluster from current until stage changes,
/// then group at once.
fn defrag(&mut self) -> &mut Self {
let mut new_map: Vec<MapCluster> = vec![];
let mut new_map: Vec<Cluster> = vec![];
// Fetch first cluster.
let mut start_cluster = *self.map.iter()
let mut start_cluster = self.map.iter()
.find(|c| c.domain.start == 0)
.unwrap();
// Even though this would be initialized by its first read,
// the compiler won't stop whining, and idk how to assert that to it.
let mut end_cluster = MapCluster::default();
let mut new_cluster: MapCluster;
let mut end_cluster = Cluster::default();
let mut new_cluster: Cluster;
let mut stage_common: bool;
let mut is_finished = false;
@@ -282,15 +255,15 @@ impl MapFile {
// Start a new cluster based on the cluster following
// the end of last new_cluster.
new_cluster = start_cluster;
new_cluster = start_cluster.to_owned();
// While stage is common, and not finished,
// find each trailing cluster.
while stage_common && !is_finished {
end_cluster = start_cluster;
end_cluster = start_cluster.to_owned();
if end_cluster.domain.end != self.domain.end {
start_cluster = *self.map.iter()
start_cluster = self.map.iter()
.find(|c| end_cluster.domain.end == c.domain.start)
.unwrap();
@@ -315,7 +288,7 @@ impl MapFile {
mod tests {
use super::*;
// Test for MapCluster::subdivide()
// Test for Cluster::subdivide()
// Test for MapFile::update()
@@ -345,7 +318,7 @@ mod tests {
mf.map = vec![];
for stage in stages {
mf.map.push(*MapCluster::default().set_stage(stage));
mf.map.push(*Cluster::default().set_stage(stage));
mf_stage = mf.get_stage();
@@ -363,14 +336,14 @@ mod tests {
let mut mf = MapFile::default();
mf.map = vec![
*MapCluster::default().set_stage(Stage::Damaged),
*MapCluster::default().set_stage(Stage::ForIsolation(0)),
*MapCluster::default().set_stage(Stage::ForIsolation(1)),
MapCluster::default(),
MapCluster::default(),
*MapCluster::default().set_stage(Stage::ForIsolation(1)),
*MapCluster::default().set_stage(Stage::ForIsolation(0)),
*MapCluster::default().set_stage(Stage::Damaged),
*Cluster::default().set_stage(Stage::Damaged),
*Cluster::default().set_stage(Stage::ForIsolation(0)),
*Cluster::default().set_stage(Stage::ForIsolation(1)),
Cluster::default(),
Cluster::default(),
*Cluster::default().set_stage(Stage::ForIsolation(1)),
*Cluster::default().set_stage(Stage::ForIsolation(0)),
*Cluster::default().set_stage(Stage::Damaged),
];
let stages = vec![
@@ -382,8 +355,8 @@ mod tests {
for stage in stages {
let expected = vec![
*MapCluster::default().set_stage(stage),
*MapCluster::default().set_stage(stage),
*Cluster::default().set_stage(stage),
*Cluster::default().set_stage(stage),
];
let recieved = mf.get_clusters(stage);
@@ -402,35 +375,35 @@ mod tests {
sector_size: 1,
domain: Domain { start: 0, end: 8 },
map: vec![
MapCluster {
Cluster {
domain: Domain { start: 0, end: 1 },
stage: Stage::Untested,
},
MapCluster {
Cluster {
domain: Domain { start: 1, end: 2 },
stage: Stage::Untested,
},
MapCluster {
Cluster {
domain: Domain { start: 2, end: 3 },
stage: Stage::Untested,
},
MapCluster {
Cluster {
domain: Domain { start: 3, end: 4 },
stage: Stage::ForIsolation(0),
},
MapCluster {
Cluster {
domain: Domain { start: 4, end: 5 },
stage: Stage::ForIsolation(0),
},
MapCluster {
Cluster {
domain: Domain { start: 5, end: 6 },
stage: Stage::ForIsolation(1),
},
MapCluster {
Cluster {
domain: Domain { start: 6, end: 7 },
stage: Stage::ForIsolation(0),
},
MapCluster {
Cluster {
domain: Domain { start: 7, end: 8 },
stage: Stage::Damaged,
},
@@ -438,23 +411,23 @@ mod tests {
};
let expected = vec![
MapCluster {
Cluster {
domain: Domain { start: 0, end: 3 },
stage: Stage::Untested,
},
MapCluster {
Cluster {
domain: Domain { start: 3, end: 5 },
stage: Stage::ForIsolation(0),
},
MapCluster {
Cluster {
domain: Domain { start: 5, end: 6 },
stage: Stage::ForIsolation(1),
},
MapCluster {
Cluster {
domain: Domain { start: 6, end: 7 },
stage: Stage::ForIsolation(0),
},
MapCluster {
Cluster {
domain: Domain { start: 7, end: 8 },
stage: Stage::Damaged,
},

34
src/recovery.rs
View File

@@ -5,7 +5,7 @@ use std::{
use crate::{
Args,
mapping::{MapFile, Stage},
mapping::{Cluster, MapFile, Stage},
};
@@ -50,14 +50,44 @@ impl Recover {
r
}
/// Recover media from blank slate.
/// Recover media.
pub fn run(&mut self) -> &mut Self {
let mut is_finished = false;
while !is_finished {
match self.map.get_stage() {
Stage::Untested => { self.copy_untested(); },
Stage::ForIsolation(level) => { self.copy_isolate(level); },
Stage::Damaged => {
println!("Cannot recover further.");
is_finished = true
},
}
}
self
}
/// Attempt to copy all untested blocks.
fn copy_untested(&mut self) -> &mut Self {
let mut untested: Vec<Cluster> = vec![];
for cluster in self.map.get_clusters(Stage::Untested).iter_mut() {
untested.append(&mut cluster.subdivide(self.map.sector_size as usize));
}
todo!("Read and save data.");
self
}
/// Attempt to copy blocks via isolation at pass level.
fn copy_isolate(&mut self, level: u8) -> &mut Self {
todo!();
self
}