removes debug code

Author: n1LS

sources/Application/Persistency/PersistencyService.cpp

@@ -14,9 +14,6 @@
 #include "Persistent.h"
 #include "System/Console/Trace.h"
 #include "System/FileSystem/FileSystem.h"
-#include "System/FileSystem/I_File.h"
-#include "Adapters/picoTracker/gui/picoRemoteUI.h"
-#include "System/Console/nanoprintf.h"
 
 #define PROJECT_STATE_FILE "/.current"
 
@@ -37,62 +34,30 @@ void PersistencyService::PurgeUnnamedProject() {
 
 void PersistencyService::DeleteProject(const char *projectName) {
   auto fs = FileSystem::GetInstance();
-  char buffer[128];
-  bool status;
-  
-  Trace::Log("PERSISTENCYSERVICE", "Deleting project: %s", projectName);
-  
-  status = fs->chdir(PROJECTS_DIR);
-  
-  if (!status) {
-    Trace::Error("PERSISTENCYSERVICE", "Failed to change to projects directory");
-    return;
-  }
 
+  Trace::Debug("PERSISTENCYSERVICE", "Deleting project: %s", projectName);
+
+  fs->chdir(PROJECTS_DIR);
   fs->chdir(projectName);
-  fs->DeleteFile(PROJECT_DATA_FILE);                                                                                                                                                                       
-  fs->DeleteFile(AUTO_SAVE_FILENAME);                                                                                                                                                                      
-                                                                                                                                                                                                          
+  fs->DeleteFile(PROJECT_DATA_FILE);
+  fs->DeleteFile(AUTO_SAVE_FILENAME);
+
   fs->chdir(PROJECT_SAMPLES_DIR);
-  etl::vector<int, MAX_SAMPLES> fileIndexes;                                                                                                                                                               
-  fs->list(&fileIndexes, ".wav", false);                                                                                                                                                                   
-
-  // delete all samples                                                                                                                                                                                    
-  char filename[128];                                                                                                                                                                                      
-  for (size_t i = 0; i < fileIndexes.size(); i++) {                                                                                                                                                        
-    fs->getFileName(fileIndexes[i], filename, MAX_PROJECT_SAMPLE_PATH_LENGTH);                                                                                                                             
-    fs->DeleteFile(filename);                                                                                                                                                                              
+  etl::vector<int, MAX_SAMPLES> fileIndexes;
+  fs->list(&fileIndexes, ".wav", false);
+
+  // delete all samples
+  char filename[128];
+  for (size_t i = 0; i < fileIndexes.size(); i++) {
+    fs->getFileName(fileIndexes[i], filename, MAX_PROJECT_SAMPLE_PATH_LENGTH);
+    fs->DeleteFile(filename);
   };
 
   fs->chdir(".."); // up to project dir
-  status = fs->DeleteDir(PROJECT_SAMPLES_DIR);
-
-  if (status) {
-    Trace::Log("PERSISTENCYSERVICE", "Successfully deleted the samples directory");
-
-    npf_snprintf(buffer, sizeof(buffer), "Successfully deleted the samples directory\n\r");
-    sendToUSBCDC(buffer, strlen(buffer));
-  } else {
-    Trace::Log("PERSISTENCYSERVICE", "Failed to delete the samples directory");
-
-    npf_snprintf(buffer, sizeof(buffer), "Failed to delete the samples directory\n\r");
-    sendToUSBCDC(buffer, strlen(buffer));
-  }
+  fs->DeleteDir(PROJECT_SAMPLES_DIR);
 
   fs->chdir(".."); // up to projects dir
-  status = fs->DeleteDir(projectName);
-  
-  if (status) {
-    Trace::Log("PERSISTENCYSERVICE", "Successfully deleted project: %s", projectName);
-
-    npf_snprintf(buffer, sizeof(buffer), "Successfully deleted project: %s\n\r", projectName);
-    sendToUSBCDC(buffer, strlen(buffer));
-  } else {
-    Trace::Error("PERSISTENCYSERVICE", "Failed to delete project: %s", projectName);
-
-    npf_snprintf(buffer, sizeof(buffer), "Failed deleting project: %s\n\r", projectName);
-    sendToUSBCDC(buffer, strlen(buffer));
-  }
+  fs->DeleteDir(projectName);
 }
 
 PersistencyResult

sources/Application/Views/SelectProjectView.cpp

@@ -24,7 +24,7 @@ static void DeleteProjectCallback(View &v, ModalView &dialog) {
     char buffer[MAX_PROJECT_NAME_LENGTH + 1];
     ((SelectProjectView &)v).getHighlightedProjectName(buffer);
     ps->DeleteProject(buffer);
-    
+
     // reload list
     ((SelectProjectView &)v).setCurrentFolder();
   }
@@ -48,23 +48,22 @@ void SelectProjectView::DrawView() {
   const char *title = "Load Project";
   SetColor(CD_INFO);
   DrawString(pos._x + 1, pos._y, title, props);
-  
   SetColor(CD_NORMAL);
-  
+
   // Draw projects
   int x = 1;
   int y = pos._y + 2;
-  
+
   for (size_t i = topIndex_;
-    i < topIndex_ + LIST_PAGE_SIZE && (i < fileIndexList_.size()); i++) {
-      if (i == currentIndex_) {
-        props.invert_ = true;
-        SetColor(CD_HILITE2);
-      } else {
-        SetColor(CD_NORMAL);
-        props.invert_ = false;
-      }
-      
+       i < topIndex_ + LIST_PAGE_SIZE && (i < fileIndexList_.size()); i++) {
+    if (i == currentIndex_) {
+      props.invert_ = true;
+      SetColor(CD_HILITE2);
+    } else {
+      SetColor(CD_NORMAL);
+      props.invert_ = false;
+    }
+
     char buffer[MAX_PROJECT_NAME_LENGTH + 1];
     memset(buffer, '\0', sizeof(buffer));
     unsigned fileIndex = fileIndexList_[i];
@@ -95,7 +94,7 @@ void SelectProjectView::DeleteProject() {
 
   char buffer[32];
   npf_snprintf(buffer, sizeof(buffer), "Delete \"%s\"?", projectName);
-  
+
   MessageBox *mb = new MessageBox(*this, buffer, MBBF_YES | MBBF_NO);
   DoModal(mb, DeleteProjectCallback);
 }

sources/Application/Views/SelectProjectView.h

@@ -39,6 +39,5 @@ class SelectProjectView : public ScreenView {
   etl::vector<int, MAX_FILE_INDEX_SIZE> fileIndexList_;
 
   void DeleteProject();
-
 };
 #endif

sources/Externals/SdFat/src/FatLib/FatFile.cpp

@@ -1088,7 +1088,6 @@ bool FatFile::rmdir() {
       goto fail;
     }
   }
-  
   // convert empty directory to normal file for remove
   m_attributes = FILE_ATTR_FILE;
   m_flags |= FILE_FLAG_WRITE;