Only create "don't index" files if not there

Author: tyeth

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -105,7 +105,7 @@ Wippersnapper_FS::Wippersnapper_FS() {
 
   // If a filesystem does not already exist - attempt to initialize a new
   // filesystem
-  if (!initFilesystem() && !initFilesystem(true)) {
+  if (!initFilesystem()){ //} && !initFilesystem(true)) {
     setStatusLEDColor(RED);
     fsHalt("ERROR Initializing Filesystem");
   }
@@ -115,7 +115,7 @@ Wippersnapper_FS::Wippersnapper_FS() {
 
   // If we created a new filesystem, halt until user RESETs device.
   if (_freshFS)
-    fsHalt("New filesystem created! Press the reset button on your board.");
+    fsHalt("New filesystem created! Press the reset button on your board."); // TODO: just reset here after printing message then a delay/countdown.
 }
 
 /************************************************************/
@@ -159,29 +159,40 @@ bool Wippersnapper_FS::initFilesystem(bool force_format) {
   if (!wipperFatFs.begin(&flash))
     return false;
 
+  //TODO: Don't do this unless we need the space and createSecrets fails
   // If CircuitPython was previously installed - erase CPY FS
   eraseCPFS();
 
+  //TODO: don't do this every time, only if content differs?
   // If WipperSnapper was previously installed - remove the
   // wippersnapper_boot_out.txt file
   eraseBootFile();
 
+  //TODO: don't do this every time, only if missing (less power usage? less block wear)
   // No file indexing on macOS
-  wipperFatFs.mkdir("/.fseventsd/");
-  File32 writeFile = wipperFatFs.open("/.fseventsd/no_log", FILE_WRITE);
-  if (!writeFile)
-    return false;
-  writeFile.close();
-
-  writeFile = wipperFatFs.open("/.metadata_never_index", FILE_WRITE);
-  if (!writeFile)
-    return false;
-  writeFile.close();
+  if (!wipperFatFs.exists("/.fseventsd/no_log"))
+  {
+    wipperFatFs.mkdir("/.fseventsd/");
+    File32 writeFile = wipperFatFs.open("/.fseventsd/no_log", FILE_WRITE);
+    if (!writeFile)
+      return false;
+    writeFile.close();
+  }
 
-  writeFile = wipperFatFs.open("/.Trashes", FILE_WRITE);
-  if (!writeFile)
-    return false;
-  writeFile.close();
+  if (!wipperFatFs.exists("/.metadata_never_index"))
+  {
+    File32 writeFile = wipperFatFs.open("/.metadata_never_index", FILE_WRITE);
+    if (!writeFile)
+      return false;
+    writeFile.close();
+  }
+  if (!wipperFatFs.exists("/.Trashes"))
+  {
+    File32 writeFile = wipperFatFs.open("/.Trashes", FILE_WRITE);
+    if (!writeFile)
+      return false;
+    writeFile.close();
+  }
 
   // Create wippersnapper_boot_out.txt file
   if (!createBootFile())

testplan.md

@@ -0,0 +1,13 @@
+copy and analyse the hex difference for a corrupted file system versus freshly saved secrets + hunky dorey
+
+retest first secrets.json acces on a new device on tinyUF2 0.18.2 and WS 88, versus tinyUF2 0.20.1 and WS88, then with no-ds-format-nor-file-recreation instead of WS88
+
+then add the metro-s3
+Update step images in ws_boards for metro-s3
+
+then add FT usb-to-gpio to ws_python
+
+
+Test ws_boards c6-aVref branch (esp32 aref=1.1 instead of 3.3, and C6 from 1.1 to 2.5v)
+
+Fix pin numbers + names for Metro S2 (all digital etc, tx/rx and D1 [etc] seem wrong, analog5 is wrong etc)