Use traits in the extended validator as well

Assumeru · Assumeru · commit cf25f46be8aa · 2024-05-27T21:01:22.000+02:00
diff --git a/src/extended.rs b/src/extended.rs
@@ -1,5 +1,5 @@
 use clap::ArgMatches;
-use tes3::esp::{Dialogue, DialogueInfo, TES3Object, TypeInfo};
+use tes3::esp::{Dialogue, DialogueInfo, TES3Object};
 
 use self::{
     cells::CellValidator,
@@ -19,15 +19,7 @@ pub struct ExtendedValidator {
 
 #[allow(unused_variables)]
 trait ExtendedHandler {
-    fn on_record(
-        &mut self,
-        record: &TES3Object,
-        typename: &'static str,
-        id: &str,
-        file: &str,
-        last: bool,
-    ) {
-    }
+    fn on_record(&mut self, record: &TES3Object, file: &str, last: bool) {}
 
     fn on_info(&mut self, record: &DialogueInfo, topic: &Dialogue, file: &str, last: bool) {}
 
@@ -56,87 +48,19 @@ impl ExtendedValidator {
         let mut current_topic = &dummy;
         for record in records {
             match record {
-                TES3Object::Activator(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Alchemy(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Apparatus(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Armor(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Birthsign(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Bodypart(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Book(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Cell(r) => {
-                    self.on_record(record, r.type_name(), &r.name, file, last);
-                }
-                TES3Object::Class(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Clothing(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Container(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
-                TES3Object::Creature(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
                 TES3Object::Dialogue(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
+                    self.on_record(record, file, last);
                     current_topic = r;
                 }
-                TES3Object::Door(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Enchanting(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Faction(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::GameSetting(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::GlobalVariable(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
                 TES3Object::Header(_) => {}
                 TES3Object::DialogueInfo(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
+                    self.on_record(record, file, last);
                     self.on_info(r, current_topic, file, last);
                 }
-                TES3Object::Ingredient(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
                 TES3Object::Landscape(_) => {}
                 TES3Object::LandscapeTexture(_) => {}
-                TES3Object::LeveledCreature(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
-                TES3Object::LeveledItem(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
-                TES3Object::Light(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Lockpick(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::MagicEffect(r) => self.on_record(record, r.type_name(), "", file, last),
-                TES3Object::MiscItem(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Npc(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
-                TES3Object::PathGrid(r) => self.on_record(record, r.type_name(), "", file, last),
-                TES3Object::Probe(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Race(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Region(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::RepairItem(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Script(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last);
-                }
                 TES3Object::Skill(_) => {}
-                TES3Object::Sound(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::SoundGen(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Spell(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::StartScript(r) => {
-                    self.on_record(record, r.type_name(), &r.id, file, last)
-                }
-                TES3Object::Static(r) => self.on_record(record, r.type_name(), &r.id, file, last),
-                TES3Object::Weapon(r) => self.on_record(record, r.type_name(), &r.id, file, last),
+                _ => self.on_record(record, file, last),
             }
         }
         if last {
@@ -146,16 +70,9 @@ impl ExtendedValidator {
         }
     }
 
-    fn on_record(
-        &mut self,
-        record: &TES3Object,
-        typename: &'static str,
-        id: &str,
-        file: &str,
-        last: bool,
-    ) {
+    fn on_record(&mut self, record: &TES3Object, file: &str, last: bool) {
         for handler in &mut self.handlers {
-            handler.on_record(record, typename, id, file, last);
+            handler.on_record(record, file, last);
         }
     }
 
diff --git a/src/extended/cells.rs b/src/extended/cells.rs
@@ -15,7 +15,7 @@ pub struct CellValidator {
 }
 
 impl ExtendedHandler for CellValidator {
-    fn on_record(&mut self, record: &TES3Object, _: &str, id: &str, _: &str, last: bool) {
+    fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {
         match record {
             TES3Object::PathGrid(pathgrid) => {
                 if !pathgrid.cell.is_empty() {
@@ -29,7 +29,7 @@ impl ExtendedHandler for CellValidator {
                     && !cell.name.starts_with("T_")
                 {
                     self.cells
-                        .push((id.to_ascii_lowercase(), cell.editor_id().into()));
+                        .push((cell.name.to_ascii_lowercase(), cell.editor_id().into()));
                     if !cannot_sleep(cell) {
                         let count = cell
                             .references
@@ -47,16 +47,19 @@ impl ExtendedHandler for CellValidator {
                 }
             }
             TES3Object::LeveledCreature(_) => {
-                self.inhabitants.insert(id.to_ascii_lowercase());
+                self.inhabitants
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Creature(c) => {
                 if !c.is_dead() {
-                    self.inhabitants.insert(id.to_ascii_lowercase());
+                    self.inhabitants
+                        .insert(record.editor_id_ascii_lowercase().into_owned());
                 }
             }
             TES3Object::Npc(n) => {
                 if !n.is_dead() {
-                    self.inhabitants.insert(id.to_ascii_lowercase());
+                    self.inhabitants
+                        .insert(record.editor_id_ascii_lowercase().into_owned());
                 }
             }
             _ => {}
diff --git a/src/extended/items.rs b/src/extended/items.rs
@@ -12,55 +12,69 @@ pub struct OwnershipValidator {
 }
 
 impl ExtendedHandler for OwnershipValidator {
-    fn on_record(&mut self, record: &TES3Object, _: &str, id: &str, _: &str, last: bool) {
+    fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {
         match record {
             TES3Object::Activator(activator) => {
                 if !activator.script.is_empty()
                     && activator.script.eq_ignore_ascii_case("bed_standard")
                 {
-                    self.ownable.insert(id.to_ascii_lowercase());
+                    self.ownable
+                        .insert(record.editor_id_ascii_lowercase().into_owned());
                 }
             }
             TES3Object::Alchemy(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Apparatus(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Armor(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Book(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Clothing(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Container(_) => {
-                self.ownable.insert(id.to_ascii_lowercase());
+                self.ownable
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Ingredient(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Light(light) => {
                 if light.data.flags.contains(LightFlags::CAN_CARRY) {
-                    self.items.insert(id.to_ascii_lowercase());
+                    self.items
+                        .insert(record.editor_id_ascii_lowercase().into_owned());
                 }
             }
             TES3Object::Lockpick(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::MiscItem(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Probe(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::RepairItem(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Weapon(_) => {
-                self.items.insert(id.to_ascii_lowercase());
+                self.items
+                    .insert(record.editor_id_ascii_lowercase().into_owned());
             }
             TES3Object::Cell(cell) => {
                 if !last {
diff --git a/src/extended/names.rs b/src/extended/names.rs
@@ -17,7 +17,7 @@ pub struct QuestNameValidator {
 }
 
 impl ExtendedHandler for NameValidator {
-    fn on_record(&mut self, record: &TES3Object, _: &str, _: &str, _: &str, _: bool) {
+    fn on_record(&mut self, record: &TES3Object, _: &str, _: bool) {
         if let TES3Object::Npc(npc) = record {
             let min_distance = (npc.name.len() as f32 / DISTANCE_DIV).round() as usize;
             if min_distance < 1 {
diff --git a/src/extended/weapons.rs b/src/extended/weapons.rs
@@ -15,7 +15,7 @@ struct BaseWeapon {
 }
 
 impl ExtendedHandler for WeaponValidator {
-    fn on_record(&mut self, record: &TES3Object, _: &str, _: &str, _: &str, last: bool) {
+    fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {
         if let TES3Object::Weapon(weapon) = record {
             if weapon.name.eq_ignore_ascii_case("<deprecated>") {
                 return;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pub struct CellValidator {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`impl ExtendedHandler for CellValidator {`
`18`		`- fn on_record(&mut self, record: &TES3Object, _: &str, id: &str, _: &str, last: bool) {`
	`18`	`+ fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {`
`19`	`19`	`match record {`
`20`	`20`	`TES3Object::PathGrid(pathgrid) => {`
`21`	`21`	`if !pathgrid.cell.is_empty() {`
`@@ -29,7 +29,7 @@ impl ExtendedHandler for CellValidator {`
`29`	`29`	`&& !cell.name.starts_with("T_")`
`30`	`30`	`{`
`31`	`31`	`self.cells`
`32`		`- .push((id.to_ascii_lowercase(), cell.editor_id().into()));`
	`32`	`+ .push((cell.name.to_ascii_lowercase(), cell.editor_id().into()));`
`33`	`33`	`if !cannot_sleep(cell) {`
`34`	`34`	`let count = cell`
`35`	`35`	`.references`
`@@ -47,16 +47,19 @@ impl ExtendedHandler for CellValidator {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`TES3Object::LeveledCreature(_) => {`
`50`		`- self.inhabitants.insert(id.to_ascii_lowercase());`
	`50`	`+ self.inhabitants`
	`51`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`51`	`52`	`}`
`52`	`53`	`TES3Object::Creature(c) => {`
`53`	`54`	`if !c.is_dead() {`
`54`		`- self.inhabitants.insert(id.to_ascii_lowercase());`
	`55`	`+ self.inhabitants`
	`56`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`TES3Object::Npc(n) => {`
`58`	`60`	`if !n.is_dead() {`
`59`		`- self.inhabitants.insert(id.to_ascii_lowercase());`
	`61`	`+ self.inhabitants`
	`62`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`	`_ => {}`
Original file line number	Diff line number	Diff line change
`@@ -12,55 +12,69 @@ pub struct OwnershipValidator {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`impl ExtendedHandler for OwnershipValidator {`
`15`		`- fn on_record(&mut self, record: &TES3Object, _: &str, id: &str, _: &str, last: bool) {`
	`15`	`+ fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {`
`16`	`16`	`match record {`
`17`	`17`	`TES3Object::Activator(activator) => {`
`18`	`18`	`if !activator.script.is_empty()`
`19`	`19`	`&& activator.script.eq_ignore_ascii_case("bed_standard")`
`20`	`20`	`{`
`21`		`- self.ownable.insert(id.to_ascii_lowercase());`
	`21`	`+ self.ownable`
	`22`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`TES3Object::Alchemy(_) => {`
`25`		`- self.items.insert(id.to_ascii_lowercase());`
	`26`	`+ self.items`
	`27`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`26`	`28`	`}`
`27`	`29`	`TES3Object::Apparatus(_) => {`
`28`		`- self.items.insert(id.to_ascii_lowercase());`
	`30`	`+ self.items`
	`31`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`29`	`32`	`}`
`30`	`33`	`TES3Object::Armor(_) => {`
`31`		`- self.items.insert(id.to_ascii_lowercase());`
	`34`	`+ self.items`
	`35`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`32`	`36`	`}`
`33`	`37`	`TES3Object::Book(_) => {`
`34`		`- self.items.insert(id.to_ascii_lowercase());`
	`38`	`+ self.items`
	`39`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`35`	`40`	`}`
`36`	`41`	`TES3Object::Clothing(_) => {`
`37`		`- self.items.insert(id.to_ascii_lowercase());`
	`42`	`+ self.items`
	`43`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`38`	`44`	`}`
`39`	`45`	`TES3Object::Container(_) => {`
`40`		`- self.ownable.insert(id.to_ascii_lowercase());`
	`46`	`+ self.ownable`
	`47`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`41`	`48`	`}`
`42`	`49`	`TES3Object::Ingredient(_) => {`
`43`		`- self.items.insert(id.to_ascii_lowercase());`
	`50`	`+ self.items`
	`51`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`44`	`52`	`}`
`45`	`53`	`TES3Object::Light(light) => {`
`46`	`54`	`if light.data.flags.contains(LightFlags::CAN_CARRY) {`
`47`		`- self.items.insert(id.to_ascii_lowercase());`
	`55`	`+ self.items`
	`56`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`48`	`57`	`}`
`49`	`58`	`}`
`50`	`59`	`TES3Object::Lockpick(_) => {`
`51`		`- self.items.insert(id.to_ascii_lowercase());`
	`60`	`+ self.items`
	`61`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`52`	`62`	`}`
`53`	`63`	`TES3Object::MiscItem(_) => {`
`54`		`- self.items.insert(id.to_ascii_lowercase());`
	`64`	`+ self.items`
	`65`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`55`	`66`	`}`
`56`	`67`	`TES3Object::Probe(_) => {`
`57`		`- self.items.insert(id.to_ascii_lowercase());`
	`68`	`+ self.items`
	`69`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`58`	`70`	`}`
`59`	`71`	`TES3Object::RepairItem(_) => {`
`60`		`- self.items.insert(id.to_ascii_lowercase());`
	`72`	`+ self.items`
	`73`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`61`	`74`	`}`
`62`	`75`	`TES3Object::Weapon(_) => {`
`63`		`- self.items.insert(id.to_ascii_lowercase());`
	`76`	`+ self.items`
	`77`	`+ .insert(record.editor_id_ascii_lowercase().into_owned());`
`64`	`78`	`}`
`65`	`79`	`TES3Object::Cell(cell) => {`
`66`	`80`	`if !last {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ pub struct QuestNameValidator {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl ExtendedHandler for NameValidator {`
`20`		`- fn on_record(&mut self, record: &TES3Object, _: &str, _: &str, _: &str, _: bool) {`
	`20`	`+ fn on_record(&mut self, record: &TES3Object, _: &str, _: bool) {`
`21`	`21`	`if let TES3Object::Npc(npc) = record {`
`22`	`22`	`let min_distance = (npc.name.len() as f32 / DISTANCE_DIV).round() as usize;`
`23`	`23`	`if min_distance < 1 {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct BaseWeapon {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`impl ExtendedHandler for WeaponValidator {`
`18`		`- fn on_record(&mut self, record: &TES3Object, _: &str, _: &str, _: &str, last: bool) {`
	`18`	`+ fn on_record(&mut self, record: &TES3Object, _: &str, last: bool) {`
`19`	`19`	`if let TES3Object::Weapon(weapon) = record {`
`20`	`20`	`if weapon.name.eq_ignore_ascii_case("<deprecated>") {`
`21`	`21`	`return;`