Support for more content-types (as discovered in the wild)

Author: fileformat

messages/de.json

@@ -5,7 +5,7 @@
   },
   "HomePage": {
     "cancel_button": "Abbrechen",
-    "demo_button": "Demo",
+    "demo_button": "Demos",
     "return_help": "Standardmäßig an der Wurzel der URL opml.xml",
     "return_label": "Rückkehr-URL (optional)",
     "show_exit_label": "Ausgangswerkzeug anzeigen",

messages/en.json

@@ -5,7 +5,7 @@
   },
   "HomePage": {
     "cancel_button": "Cancel",
-    "demo_button": "Demo",
+    "demo_button": "Demos",
     "return_help": "Defaults to root of opml.xml URL",
     "return_label": "Return URL (optional)",
     "show_exit_label": "Show Exit Tool",

messages/es.json

@@ -5,7 +5,7 @@
   },
   "HomePage": {
     "cancel_button": "Cancelar",
-    "demo_button": "Demostración",
+    "demo_button": "Demostracións",
     "return_help": "Por defecto a la raíz de la URL de opml.xml",
     "return_label": "URL de retorno (opcional)",
     "show_exit_label": "Mostrar herramienta de salida",

messages/fr.json

@@ -5,7 +5,7 @@
   },
   "HomePage": {
     "cancel_button": "Annuler",
-    "demo_button": "Démo",
+    "demo_button": "Démos",
     "return_help": "Par défaut à la racine de l'URL opml.xml",
     "return_label": "URL de retour (optionnel)",
     "show_exit_label": "Afficher l'outil de sortie",

src/components/ConfigForm.tsx

@@ -84,7 +84,7 @@ export default function ConfigForm() {
                     {t("cancel_button")}
                 </Button>
                 <Stack direction="row" flex="1" justifyContent="flex-end" spacing={2} sx={{ backgroundColor: 'transparent' }}>
-                    <Button component={NextLink} variant="contained" href={`/view.html?url=${encodeURIComponent(constants.DEMO_URL)}&showmode=1&showlanguage=1&showexit=1&sort=name&return=/&showexit=1`}>
+                    <Button component={NextLink} variant="outlined" href={`https://www.xml.style/opml/#demos`}>
                         {t("demo_button")}
                     </Button>
                 </Stack>

src/lib/loadOutline.ts

@@ -63,33 +63,52 @@ async function loadOutline(url_str: string):Promise<OpmlData> {
 
     retVal.messages.push("Fetched url in " + (Date.now() - start) + "ms.");
     retVal.messages.push(
-        `Content length: ${xml_resp.headers.get("Content-Length")}`
+        `Content length (from header): ${xml_resp.headers.get("Content-Length")}`
     );
-    const contentType = xml_resp.headers.get("Content-Type");
+    let contentType = xml_resp.headers.get("Content-Type");
     retVal.messages.push(`Content type: ${contentType || "(null)"}`);
     if (!contentType) {
-        retVal.errorCount++;
         retVal.messages.push("No content type provided.");
-        return retVal;
+        contentType = "";
     }
+
+    let isXml:boolean;
     if (
-        !contentType.startsWith("text/xml") &&
-        !contentType.startsWith("application/xml") &&
-        !contentType.startsWith("text/plain")
+        contentType.startsWith("text/xml") ||
+        contentType.startsWith("application/xml") ||
+        contentType.startsWith("text/x-opml")
         ) {
+            isXml = true;
+    } else if (
+        contentType.startsWith("text/plain") ||
+        contentType.startsWith("application/octet-stream") ||
+        contentType == ""
+    ) {
+        isXml = false;
+        retVal.messages.push("Content type is not XML.");
+    } else {
         retVal.errorCount++;
         retVal.messages.push("Invalid content type: " + contentType);
         return retVal;
     }
 
-    const xml_str = await xml_resp.text();
+    let xml_str:string;
+    try {
+        xml_str = await xml_resp.text();
+    } catch (err: unknown) {
+        retVal.errorCount++;
+        retVal.messages.push("Unable to get text: " + errorMessage(err));
+        return retVal;
+    }
 
-    if (contentType.startsWith("text/plain")) {
+    if (isXml == false) {
         if (xml_str.trim().startsWith("<")) {
-            retVal.messages.push("Content type is text/plain but starts with '<'. Parsing as XML.");
+            retVal.messages.push("Content starts with '<'. Attempting to parse as XML.");
         } else {
             retVal.errorCount++;
-            retVal.messages.push("Content type is text/plain and does not start with '<'. Not parsing.");
+            retVal.messages.push(
+                "Content does not start with '<'. Not parsing."
+            );
             return retVal;
         }
     }
@@ -111,17 +130,22 @@ async function loadOutline(url_str: string):Promise<OpmlData> {
         return retVal;
     }
 
-    retVal.messages.push(`Entries: ${retVal.count}`);
-    retVal.messages.push(`Parsing complete in ${Date.now() - start}ms.`);
+    retVal.messages.push(`XML parsing complete in ${Date.now() - start}ms.`);
 
     let xmlTitle = xml_data.opml?.head?.title;
     if (xmlTitle && xmlTitle.indexOf("&") >= 0) {
         xmlTitle = he.decode(xmlTitle);
     }
     retVal.title = xmlTitle || "";
 
+    const outlineStart = Date.now();
     processNode(retVal, retVal.root, xml_data.opml.body.outline as OpmlOutline[]);
 
+    retVal.messages.push(`Entries: ${retVal.count}`);
+    retVal.messages.push(`Outline parsing complete in ${Date.now() - outlineStart}ms.`);
+
+    retVal.messages.push(`Total time: ${Date.now() - start}ms.`);
+
     retVal.success = retVal.errorCount === 0;
 
     return retVal;