fix: package comparison now includes revisions

Author: ZigTag

src/database/src/output/fix.rs

@@ -60,20 +60,16 @@ impl Fix {
         airport_ident: Option<String>,
         ref_table: Option<String>,
     ) -> Self {
-        let fix_type = if let Some(ref_table) = ref_table {
-            Some(match ref_table.as_str() {
-                "PA" => FixType::Airport,
-                "PN" | "DB" => FixType::NdbNavaid,
-                "PG" => FixType::RunwayThreshold,
-                "PT" => FixType::GlsNavaid,
-                "PI" => FixType::IlsNavaid,
-                "D " => FixType::VhfNavaid,
-                "EA" | "PC" => FixType::Waypoint,
-                x => panic!("Unexpected table: '{x}'"),
-            })
-        } else {
-            None
-        };
+        let fix_type = ref_table.map(|ref_table| match ref_table.as_str() {
+            "PA" => FixType::Airport,
+            "PN" | "DB" => FixType::NdbNavaid,
+            "PG" => FixType::RunwayThreshold,
+            "PT" => FixType::GlsNavaid,
+            "PI" => FixType::IlsNavaid,
+            "D " => FixType::VhfNavaid,
+            "EA" | "PC" => FixType::Waypoint,
+            x => panic!("Unexpected table: '{x}'"),
+        });
 
         Self {
             fix_type,

src/database/src/output/procedure/approach.rs

@@ -20,7 +20,7 @@ pub struct Approach {
     ///
     /// For approaches which are for a specific runway, it will have a format such as `I08L` or `R12-M`.
     /// - The first character identifies the type of approach, however this will not always match the `approach_type`
-    /// field. The next three characters represent the runway identifier, such as `08L` or `12`.
+    ///   field. The next three characters represent the runway identifier, such as `08L` or `12`.
     /// - The 5th character (optional) is the multiple indicator of the approach, it can be any capital letter.
     /// - For approaches with a multiple indicator and no `LCR` on the runway, the 4th character will be a `-`
     ///

src/wasm/src/dispatcher.rs

@@ -51,7 +51,7 @@ pub struct Dispatcher<'a> {
     queue: Rc<RefCell<Vec<Rc<RefCell<Task>>>>>,
 }
 
-impl<'a> Dispatcher<'a> {
+impl Dispatcher<'_> {
     pub fn new() -> Self {
         Dispatcher {
             commbus: CommBus::default(),
@@ -128,23 +128,27 @@ impl<'a> Dispatcher<'a> {
         let installed_cycle = match meta::get_installed_cycle_from_json(
             &Path::new(consts::NAVIGATION_DATA_WORK_LOCATION).join("cycle.json"),
         ) {
-            Ok(cycle) => Some(cycle.cycle),
+            Ok(cycle) => Some(cycle),
             Err(_) => None,
         };
 
         // Get the bundled cycle (if it exists)
         let bundled_cycle = match meta::get_installed_cycle_from_json(
             &Path::new(consts::NAVIGATION_DATA_DEFAULT_LOCATION).join("cycle.json"),
         ) {
-            Ok(cycle) => Some(cycle.cycle),
+            Ok(cycle) => Some(cycle),
             Err(_) => None,
         };
 
         // Determine if we are bundled ONLY and the bundled cycle is newer than the installed (old bundled) cycle
         let bundled_updated = if is_bundled.is_some_and(|x| x) {
             // Clippy yells but this isn't good to switch until if-let chaining is implemented (Rust 2024)
-            if installed_cycle.is_some() && bundled_cycle.is_some() {
-                bundled_cycle.unwrap() > installed_cycle.unwrap()
+            if let (Some(installed_cycle), Some(bundled_cycle)) = (installed_cycle, bundled_cycle) {
+                bundled_cycle
+                    .cycle
+                    .cmp(&installed_cycle.cycle)
+                    .then(bundled_cycle.revision.cmp(&installed_cycle.revision))
+                    .is_gt()
             } else {
                 false
             }