wip: restructure reshuffle_apps

Signed-off-by: Eva Cosma <eva.cosma.mail@gmail.com>

Author: eva-cosma

tbf-parser/src/parse.rs

@@ -203,9 +203,10 @@ pub fn parse_tbf_header(
                         }
                         types::TbfHeaderTypes::TbfHeaderWriteableFlashRegions => {
                             // Length must be a multiple of the size of a region definition.
-                            if tlv_header.length as usize
-                                % mem::size_of::<types::TbfHeaderV2WriteableFlashRegion>()
-                                == 0
+                            if (tlv_header.length as usize)
+                                .is_multiple_of(mem::size_of::<
+                                    types::TbfHeaderV2WriteableFlashRegion,
+                                >())
                             {
                                 // Calculate how many writeable flash regions
                                 // there are specified in this header.

tockloader-lib/src/attributes/app_attributes.rs

@@ -21,25 +21,8 @@ use crate::IO;
 #[derive(Debug, Clone)]
 pub struct AppAttributes {
     pub address: u64,
-    pub size: u32,
-    pub index: u8,
     pub tbf_header: TbfHeader,
     pub tbf_footers: Vec<TbfFooter>,
-    pub installed: bool,
-    pub is_padding: bool,
-}
-
-impl std::fmt::Display for AppAttributes {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}. {} - start: {:#x}, size: {}",
-            self.index,
-            self.tbf_header.get_package_name().unwrap_or(""),
-            self.address,
-            self.size
-        )
-    }
 }
 
 /// This structure represents a footer of a Tock application. Currently, footers
@@ -62,20 +45,13 @@ impl TbfFooter {
 impl AppAttributes {
     pub(crate) fn new(
         address: u64,
-        size: u32,
-        index: u8,
         header_data: TbfHeader,
         footers_data: Vec<TbfFooter>,
-        installed: bool,
     ) -> AppAttributes {
         AppAttributes {
             address,
-            size,
-            index,
             tbf_header: header_data,
             tbf_footers: footers_data,
-            installed,
-            is_padding: false,
         }
     }
 
@@ -178,10 +154,9 @@ impl AppAttributes {
                 footer_offset += footer_info.1 + 4;
             }
 
-            let details: AppAttributes =
-                AppAttributes::new(appaddr, total_size, apps_counter, header, footers, true);
+            let details: AppAttributes = AppAttributes::new(appaddr, header, footers);
 
-            apps_details.insert(apps_counter.into(), details);
+            apps_details.insert(apps_counter, details);
             apps_counter += 1;
             appaddr += total_size as u64;
         }
@@ -316,10 +291,9 @@ impl AppAttributes {
                 footer_offset += footer_info.1 + 4;
             }
 
-            let details: AppAttributes =
-                AppAttributes::new(appaddr, total_size, apps_counter, header, footers, true);
+            let details: AppAttributes = AppAttributes::new(appaddr, header, footers);
 
-            apps_details.insert(apps_counter.into(), details);
+            apps_details.insert(apps_counter, details);
             apps_counter += 1;
             appaddr += total_size as u64;
         }

tockloader-lib/src/command_impl/install.rs

@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::attributes::app_attributes::AppAttributes;
 use crate::board_settings::BoardSettings;
-use crate::command_impl::reshuffle_apps::{create_pkt, reconstruct_app, reshuffle_apps};
+use crate::command_impl::reshuffle_apps::{create_pkt, reshuffle_apps};
 use crate::connection::TockloaderConnection;
 use crate::errors::TockloaderError;
 use crate::tabs::tab::Tab;
@@ -15,10 +15,8 @@ impl CommandInstall for TockloaderConnection {
         settings: &BoardSettings,
         tab: Tab,
     ) -> Result<(), TockloaderError> {
-        // get the already installed apps
         let mut installed_apps: Vec<AppAttributes> = self.list(settings).await.unwrap();
 
-        // reconstruct the new app
         if let Some(mut app) = reconstruct_app(Some(&tab), settings) {
             app.index = installed_apps.len() as u8;
             installed_apps.push(app.clone());