add support for reading language files from all devices (#1)

ps2homebrew · Aug 22, 2019 · 1d3c470 · 1d3c470
1 parent 38e50a0
commit 1d3c470
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,7 @@ USB modes:
 | "CFG" | for saving per-game configuration files | all |
 | "ART" | for game art images | all |
 | "THM" | for themes support | all |
+| "LNG" | for translation support | all |
 | "CHT" | for cheats files | all |
 | "CFG-DEV" | for saving per-game configuration files, when used from a OPL dev build - aka beta build | all |
 

diff --git a/include/lang.h b/include/lang.h
@@ -283,6 +283,7 @@ typedef struct
     char *name;
 } language_t;
 
+int lngAddLanguages(char *path, const char *separator);
 void lngInit(void);
 char *lngGetValue(void);
 void lngEnd(void);

diff --git a/src/ethsupport.c b/src/ethsupport.c
@@ -258,6 +258,9 @@ static void ethInitSMB(void)
         sprintf(path, "%sTHM", ethPrefix);
         thmAddElements(path, "\\", ethGameList.mode);
 
+        sprintf(path, "%sLNG", ethPrefix);
+        lngAddLanguages(path, "\\");
+
         sbCreateFolders(ethPrefix, 1);
     } else if (gPCShareName[0] || !(gNetworkStartup >= ERROR_ETH_SMB_OPENSHARE)) {
         ethDisplayErrorStatus();

diff --git a/src/hddsupport.c b/src/hddsupport.c
@@ -41,6 +41,8 @@ static void hddInitModules(void)
     char path[256];
     sprintf(path, "%sTHM", hddPrefix);
     thmAddElements(path, "/", hddGameList.mode);
+    sprintf(path, "%sLNG", hddPrefix);
+    lngAddLanguages(path, "/");
 
     sbCreateFolders(hddPrefix, 0);
 }

diff --git a/src/lang.c b/src/lang.c
@@ -351,10 +351,10 @@ static int lngLoadFromFile(char *path, char *name)
         }
 
         if (lngLoadFont(gBaseMCDir, name) != 0) {
-            if (lngLoadFont("mass0:", name) != 0) {
+            if (lngLoadFont("mass0:LNG", name) != 0) {
                 if (configGetInt(configGetByType(CONFIG_OPL), CONFIG_OPL_HDD_MODE, &HddStartMode) && (HddStartMode == START_MODE_AUTO)) {
                     hddLoadModules();
-                    lngLoadFont("pfs0:", name);
+                    lngLoadFont("pfs0:LNG", name);
                 }
             }
         }
@@ -388,24 +388,23 @@ static int lngReadEntry(int index, const char *path, const char *separator, cons
             currLang->name[length - 1] = '\0';
 
             /*file_buffer_t* fileBuffer = openFileBuffer(currLang->filePath, 1, 1024);
-			if (fileBuffer) {
-				// read localized name of language from file
-				if (readLineContext(fileBuffer, &currLang->name))
-					readLineContext(fileBuffer, &currLang->fontName);
-				closeFileBuffer(fileBuffer);
-			}*/
+            if (fileBuffer) {
+                // read localized name of language from file
+                if (readLineContext(fileBuffer, &currLang->name))
+                    readLineContext(fileBuffer, &currLang->fontName);
+                closeFileBuffer(fileBuffer);
+            }*/
 
             index++;
         }
     }
     return index;
 }
 
-void lngInit(void)
+static void lngRebuildLangNames(void)
 {
-    fntInit();
-
-    nLanguages = listDir(gBaseMCDir, "/", MAX_LANGUAGE_FILES, &lngReadEntry);
+    if (guiLangNames)
+        free(guiLangNames);
 
     // build the languages name list
     guiLangNames = (char **)malloc((nLanguages + 2) * sizeof(char **));
@@ -421,6 +420,29 @@ void lngInit(void)
     guiLangNames[nLanguages + 1] = NULL;
 }
 
+int lngAddLanguages(char *path, const char *separator)
+{
+    int result;
+
+    result = listDir(path, separator, MAX_LANGUAGE_FILES - nLanguages, &lngReadEntry);
+    nLanguages += result;
+    lngRebuildLangNames();
+
+    const char *temp;
+    if (configGetStr(configGetByType(CONFIG_OPL), "language_text", &temp)) {
+        lngSetGuiValue(lngFindGuiID(temp));
+    }
+
+    return result;
+}
+
+void lngInit(void)
+{
+    fntInit();
+
+    lngAddLanguages(gBaseMCDir, "/");
+}
+
 void lngEnd(void)
 {
     lngFreeFromFile();

diff --git a/src/supportbase.c b/src/supportbase.c
@@ -751,7 +751,7 @@ static void sbCreateFoldersFromList(const char *path, const char **folders)
 
 void sbCreateFolders(const char *path, int createDiscImgFolders)
 {
-    const char *basicFolders[] = { OPL_FOLDER, "THM", "ART", "VMC", "CHT", "APPS", NULL };
+    const char *basicFolders[] = { OPL_FOLDER, "THM", "LNG", "ART", "VMC", "CHT", "APPS", NULL };
     const char *discImgFolders[] = { "CD", "DVD", NULL };
 
     sbCreateFoldersFromList(path, basicFolders);

diff --git a/src/usbsupport.c b/src/usbsupport.c
@@ -117,6 +117,7 @@ static int usbNeedsUpdate(void)
     char path[256];
     static unsigned int OldGeneration = 0;
     static unsigned char ThemesLoaded = 0;
+    static unsigned char LanguagesLoaded = 0;
     int result = 0;
     iox_stat_t stat;
 
@@ -152,6 +153,13 @@ static int usbNeedsUpdate(void)
             ThemesLoaded = 1;
     }
 
+    // update Languages
+    if (!LanguagesLoaded) {
+        sprintf(path, "%sLNG", usbPrefix);
+        if (lngAddLanguages(path, "/") > 0)
+            LanguagesLoaded = 1;
+    }
+
     sbCreateFolders(usbPrefix, 1);
 
     return result;