Extracting the code responsible for determining the length of the update file from the filesystem.

Author: aentinger

src/Arduino_Portenta_OTA.cpp

@@ -71,6 +71,27 @@ void Arduino_Portenta_OTA::reset()
   NVIC_SystemReset();
 }
 
+/******************************************************************************
+ * PROTECTED MEMBER FUNCTIONS
+ ******************************************************************************/
+
+bool Arduino_Portenta_OTA::findProgramLength(DIR * dir, uint32_t & program_length)
+{
+  struct dirent * entry = NULL;
+  while ((entry = readdir(dir)) != NULL)
+  {
+    if (String(entry->d_name) == "UPDATE.BIN")
+    {
+      struct stat stat_buf;
+      stat("/fs/UPDATE.BIN", &stat_buf);
+      program_length = stat_buf.st_size;
+      return true;
+    }
+  }
+
+  return false;
+}
+
 /******************************************************************************
  * PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/

src/Arduino_Portenta_OTA.h

@@ -103,6 +103,7 @@ class Arduino_Portenta_OTA
     virtual bool init() = 0;
     virtual bool open() = 0;
 
+    static bool findProgramLength(DIR * dir, uint32_t & program_length);
 
   private:
 

src/Arduino_Portenta_OTA_InternalFlash.cpp

@@ -77,23 +77,15 @@ bool Arduino_Portenta_OTA_InternalFlash::init()
 bool Arduino_Portenta_OTA_InternalFlash::open()
 {
   DIR * dir = NULL;
-  struct dirent *entry = NULL;
 
   if (_storage_type == INTERNAL_FLASH_FATFS)
   {
     if ((dir = opendir("/fs")) != NULL)
     {
-      /* print all the files and directories within directory */
-      while ((entry = readdir(dir)) != NULL)
+      if (Arduino_Portenta_OTA::findProgramLength(dir, _program_length))
       {
-        if (String(entry->d_name) == "UPDATE.BIN")
-        {
-          struct stat stat_buf;
-          stat("/fs/UPDATE.BIN", &stat_buf);
-          _program_length = stat_buf.st_size;
-          closedir(dir);
-          return true;
-        }
+        closedir(dir);
+        return true;
       }
       closedir(dir);
     }
@@ -104,17 +96,10 @@ bool Arduino_Portenta_OTA_InternalFlash::open()
   {
     if ((dir = opendir("/little_fs")) != NULL)
     {
-      /* print all the files and directories within directory */
-      while ((entry = readdir(dir)) != NULL)
+      if (Arduino_Portenta_OTA::findProgramLength(dir, _program_length))
       {
-        if (String(entry->d_name) == "UPDATE.BIN")
-        {
-          struct stat stat_buf;
-          stat("/little_fs/UPDATE.BIN", &stat_buf);
-          _program_length = stat_buf.st_size;
-          closedir(dir);
-          return true;
-        }
+        closedir(dir);
+        return true;
       }
       closedir(dir);
     }

src/Arduino_Portenta_OTA_QSPI.cpp

@@ -86,18 +86,10 @@ bool Arduino_Portenta_OTA_QSPI::open()
     DIR * dir = NULL;
     if ((dir = opendir("/fs")) != NULL)
     {
-      /* print all the files and directories within directory */
-      struct dirent * entry = NULL;
-      while ((entry = readdir(dir)) != NULL)
+      if (Arduino_Portenta_OTA::findProgramLength(dir, _program_length))
       {
-        if (String(entry->d_name) == "UPDATE.BIN")
-        {
-          struct stat stat_buf;
-          stat("/fs/UPDATE.BIN", &stat_buf);
-          _program_length = stat_buf.st_size;
-          closedir(dir);
-          return true;
-        }
+        closedir(dir);
+        return true;
       }
       closedir(dir);
     }

src/Arduino_Portenta_OTA_SD.cpp

@@ -95,22 +95,13 @@ bool Arduino_Portenta_OTA_SD::open()
     DIR * dir = NULL;
     if ((dir = opendir("/fs")) != NULL)
     {
-      /* print all the files and directories within directory */
-      struct dirent * entry = NULL;
-      while ((entry = readdir(dir)) != NULL)
+      if (Arduino_Portenta_OTA::findProgramLength(dir, _program_length))
       {
-        if (String(entry->d_name) == "UPDATE.BIN")
-        {
-          struct stat stat_buf;
-          stat("/fs/UPDATE.BIN", &stat_buf);
-          _program_length = stat_buf.st_size;
-          closedir(dir);
-          return true;
-        }
+        closedir(dir);
+        return true;
       }
       closedir(dir);
     }
-    return false;
   }
 
   return false;