From 084c246ef0cab329fe981732089277fa8398800b Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 5 Nov 2024 17:49:28 +0100
Subject: fw-addr-lists: simplify looping lines

With `:deserialize` the **record** separator is always a new line. The
property `delimiter=` is a **field** reparator, so you can parse a lines
into an array.

We do not want (or need) that, so use new line as field separator. This
will result in an array with just one element, and we use that.

Also convert the data to line feed explicitly, just to be sure.
---
 fw-addr-lists.rsc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 4675e3a..a9513d8 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -65,7 +65,7 @@
 
       :for I from=1 to=5 do={
         :if ($Data = false) do={
-          :set Data [ $FetchHuge $ScriptName ($List->"url") $CheckCertificate ];
+          :set Data [ :tolf [ $FetchHuge $ScriptName ($List->"url") $CheckCertificate ] ];
           :if ($Data = false) do={
             :if ($I < 5) do={
               $LogPrint debug $ScriptName ("Failed downloading for list '" . $FwListName . \
@@ -86,8 +86,8 @@
             "B for list '" . $FwListName . "' from: " . $List->"url");
       }
 
-      :while ([ :len $Data ] != 0) do={
-        :local Line [ :pick $Data 0 [ :find $Data "\n" ] ];
+      :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={
+        :set Line ($Line->0);
         :local Address;
         :if ([ :pick $Line 0 1 ] = "{") do={
           :set Address [ :tostr ([ :deserialize from=json $Line ]->"cidr") ];
@@ -109,7 +109,6 @@
             :error true;
           }
         } on-error={ }
-        :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
       }
     }
 
-- 
cgit v1.2.3-70-g09d2