simplify html backup converter

stratumauth · Feb 8, 2025 · 749803b · 749803b
1 parent b497248
commit 749803b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/Stratum.Core/src/Converter/HtmlBackupConverter.cs b/Stratum.Core/src/Converter/HtmlBackupConverter.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 using System;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using HtmlAgilityPack;
@@ -21,20 +22,14 @@ public override Task<ConversionResult> ConvertAsync(byte[] data, string password
             var document = new HtmlDocument();
             document.LoadHtml(html);
 
-            var builder = new StringBuilder();
             var nodes = document.DocumentNode.SelectNodes("//code");
 
             if (nodes == null)
             {
                 throw new ArgumentException("No URIs found in file");
             }
 
-            foreach (var node in nodes)
-            {
-                builder.AppendLine(node.InnerText);
-            }
-
-            return Task.FromResult(ConvertText(builder.ToString()));
+            return Task.FromResult(ConvertLines(nodes.Select(n => n.InnerText)));
         }
     }
 }
diff --git a/Stratum.Core/src/Converter/UriListBackupConverter.cs b/Stratum.Core/src/Converter/UriListBackupConverter.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Stratum.Core.Util;
@@ -23,23 +22,22 @@ public UriListBackupConverter(IIconResolver iconResolver) : base(iconResolver)
         public override Task<ConversionResult> ConvertAsync(byte[] data, string password = null)
         {
             var text = Encoding.UTF8.GetString(data);
-            return Task.FromResult(ConvertText(text));
+            var lines = text.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+            return Task.FromResult(ConvertLines(lines));
         }
 
-        protected ConversionResult ConvertText(string text)
+        protected ConversionResult ConvertLines(IEnumerable<string> lines)
         {
-            var lines = text.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-
-            if (!lines.All(l => l.StartsWith("otpauth") || l.StartsWith("motp")))
-            {
-                throw new ArgumentException("Invalid file");
-            }
-
             var authenticators = new List<Authenticator>();
             var failures = new List<ConversionFailure>();
 
             foreach (var line in lines)
             {
+                if (!line.StartsWith("otpauth") && !line.StartsWith("motp"))
+                { 
+                    throw new ArgumentException("Invalid file"); 
+                }
+
                 Authenticator auth;
 
                 try