Changeset 93581 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 3, 2022 1:52:21 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

149717

Message:

Main/Unattended: Extract the languages from the XML too. bugref:9781

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -197 +197 @@
 const Utf8Str &WIMImage::formatName(Utf8Str &r_strName) const
 {
-    if (mVersion.isEmpty() && mArch.isEmpty())
+    if (mVersion.isEmpty() && mArch.isEmpty() && mDefaultLanguage.isEmpty() && mLanguages.size() == 0)
         return mName;
 
@@ -212 +212 @@
         fFirst = false;
     }
+    if (mDefaultLanguage.isNotEmpty())
+    {
+        r_strName.appendPrintf(fFirst ? " (%s" : " / %s", mDefaultLanguage.c_str());
+        fFirst = false;
+    }
+    else
+        for (size_t i = 0; i < mLanguages.size(); i++)
+        {
+            r_strName.appendPrintf(fFirst ? " (%s" : " / %s", mLanguages[i].c_str());
+            fFirst = false;
+        }
     r_strName.append(")");
     return r_strName;
@@ -444 +455 @@
 
 /**
+ * Tries to parse a LANGUAGES element, with the following structure.
+ * @verbatim
+ * <LANGUAGES>
+ *     <LANGUAGE>
+ *         en-US
+ *     </LANGUAGE>
+ *     <DEFAULT>
+ *         en-US
+ *     </DEFAULT>
+ * </LANGUAGES>
+ * @endverbatim
+ *
+ * Will set mLanguages and mDefaultLanguage success.
+ *
+ * @param   pElmLanguages   Points to the LANGUAGES XML node.
+ * @param   rImage          Out reference to an WIMImage instance.
+ */
+static void parseLangaguesElement(const xml::ElementNode *pElmLanguages, WIMImage &rImage)
+{
+    /*
+     * The languages.
+     */
+    ElementNodesList children;
+    int cChildren = pElmLanguages->getChildElements(children, "LANGUAGE");
+    if (cChildren == 0)
+        cChildren = pElmLanguages->getChildElements(children, "language");
+    if (cChildren == 0)
+        cChildren = pElmLanguages->getChildElements(children, "Language");
+    for (ElementNodesList::iterator iterator = children.begin(); iterator != children.end(); ++iterator)
+    {
+        const ElementNode * const pElmLanguage = *(iterator);
+        if (pElmLanguage)
+        {
+            const char *pszValue = pElmLanguage->getValue();
+            if (pszValue && *pszValue != '\0')
+                rImage.mLanguages.append(pszValue);
+        }
+    }
+
+    /*
+     * Default language.
+     */
+    const xml::ElementNode *pElmDefault;
+    if (   (pElmDefault = pElmLanguages->findChildElement("DEFAULT")) != NULL
+        || (pElmDefault = pElmLanguages->findChildElement("default")) != NULL
+        || (pElmDefault = pElmLanguages->findChildElement("Default")) != NULL)
+        rImage.mDefaultLanguage = pElmDefault->getValue();
+}
+
+
+/**
  * Tries to set the image architecture.
  *
@@ -454 +516 @@
  * Will set mArch and update mOSType on success.
  *
- * @param   pElmArch    Points to the vesion XML node,
+ * @param   pElmArch    Points to the ARCH XML node.
  * @param   rImage      Out reference to an WIMImage instance.
  */
@@ -670 +732 @@
                 || (pElmArch = pElmWindows->findChildElement("Arch")) != NULL)
                 parseArchElement(pElmArch, newImage);
+
+            /* Extract languages and default language: */
+            const ElementNode *pElmLang;
+            if (   (pElmLang = pElmWindows->findChildElement("LANGUAGES")) != NULL
+                || (pElmLang = pElmWindows->findChildElement("languages")) != NULL
+                || (pElmLang = pElmWindows->findChildElement("Languages")) != NULL)
+                parseLangaguesElement(pElmLang, newImage);
         }