Update: SD-Updater corresponds to jpg/json dir in bin dir.

lovyan03 · Apr 1, 2019 · f7b8dee · f7b8dee
1 parent 194a38b
commit f7b8dee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/LovyanLauncher/build/LovyanLauncher.bin b/LovyanLauncher/build/LovyanLauncher.bin
diff --git a/LovyanLauncher/src/CBSDUpdater.h b/LovyanLauncher/src/CBSDUpdater.h
@@ -26,15 +26,14 @@ class CBSDUpdater : public MenuCallBack
       M5.Lcd.drawFastHLine(0, 10 + i, M5.Lcd.width(), i << 1);
     }
     M5.Lcd.drawString("SD Updater : " + mi->name, 10, 10, 2);
-
-    iconName = "/jpg/" + mi->name + ".jpg";
-    faceName = "/jpg/" + mi->name + "_gh.jpg";
-    metaName = "/json/" + mi->name + ".json";
-
+    iconName = mi->getSubFilePath("jpg", ".jpg");
+    faceName = mi->getSubFilePath("jpg", "_gh.jpg");
+    metaName = mi->getSubFilePath("json", ".json");
+/*
     File file = SD.open( mi->path );
     fileSize = file.size();
     file.close();
-
+*/
     hasIcon = SD.exists(iconName.c_str());
     hasMeta = SD.exists(metaName.c_str());
     hasFace = SD.exists(faceName.c_str());

diff --git a/LovyanLauncher/src/MenuItemSDUpdater.cpp b/LovyanLauncher/src/MenuItemSDUpdater.cpp
@@ -34,7 +34,7 @@ void MenuItemSDUpdater::onEnter() {
           if (lastBin == fn) setFocusItem(mi);
         }
       } else {
-        if (fn.endsWith("bin")) {
+        if (fn.startsWith("bin") || fn.endsWith("bin")) {
           addItem(new MenuItemSDUpdater(fn, ptmp, true, ""));
         }
       }
@@ -52,9 +52,20 @@ void MenuItemSDUpdater::onEnter() {
   MenuItem::onEnter();
 }
 
+String MenuItemSDUpdater::getSubFilePath(String subDir, String suffix) {
+  MenuItemSDUpdater* pi = static_cast<MenuItemSDUpdater*>(_parentItem);
+  if (pi && pi->path.length()) {
+    String filename = pi->path + "/" + subDir + "/" + name + suffix;
+    if (SD.exists(filename.c_str())) {
+      return filename;
+    }
+  }
+  return "/" + subDir + "/" + name + suffix;
+}
+
 void MenuItemSDUpdater::onFocus() {
   if (name.length()) {
-    String filename = "/jpg/" + name + ".jpg";
+    String filename = getSubFilePath("jpg", ".jpg");
     if (SD.exists(filename.c_str())) {
       M5.Lcd.drawJpgFile(SD, filename.c_str(), 200, 40);
     } else {

diff --git a/LovyanLauncher/src/MenuItemSDUpdater.h b/LovyanLauncher/src/MenuItemSDUpdater.h
@@ -14,6 +14,8 @@ class MenuItemSDUpdater : public MenuItemSD {
   MenuItemSDUpdater(const String& t, const String& p, bool isdir, const String& n)
   : MenuItemSD(t, p, isdir), name(n) {};
 
+  String getSubFilePath(String subDir, String suffix);
+
   virtual void onFocus();
   virtual void onDefocus();
   virtual void onEnter();