From 32a267f9a8eea41eabb6486b3925583aee158559 Mon Sep 17 00:00:00 2001
From: gSpot <gspot.x2f@gmail.com>
Date: Mon, 13 Feb 2023 01:13:43 +0300
Subject: [PATCH] Fixed parsers

---
 .../files/usr/libexec/ruantiblock/ruab_parser.lua      | 10 +++++++++-
 .../files/usr/libexec/ruantiblock/ruab_parser.py       |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua b/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua
index 5b76e7c..595f503 100755
--- a/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua
+++ b/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua
@@ -55,6 +55,12 @@ local Config = Class(nil, {
         ["BLLIST_STRIP_WWW"] = true,
         ["NFT_TABLE"] = true,
         ["NFT_TABLE_DNSMASQ"] = true,
+        ["NFTSET_CIDR"] = true,
+        ["NFTSET_IP"] = true,
+        ["NFTSET_DNSMASQ"] = true,
+        ["NFTSET_CIDR_USER"] = true,
+        ["NFTSET_IP_USER"] = true,
+        ["NFTSET_DNSMASQ_USER"] = true,
         ["NFTSET_CIDR_CFG"] = true,
         ["NFTSET_IP_CFG"] = true,
         ["NFTSET_DNSMASQ"] = true,
@@ -389,6 +395,9 @@ end
 
 function BlackListParser:write_ipset_config()
     local file_handler = assert(io.open(self.IP_DATA_FILE, "w"), "Could not open nftset config")
+    for _, v in ipairs({ self.NFTSET_CIDR, self.NFTSET_IP, self.NFTSET_CIDR_USER, self.NFTSET_IP_USER }) do
+        file_handler:write(string.format("flush set %s %s\n", self.NFT_TABLE, v))
+    end
     file_handler:write(
         string.format("table %s {\n%s", self.NFT_TABLE, self.NFTSET_IP_CFG)
     )
@@ -609,7 +618,6 @@ local Ra = Class(BlackListParser, {
 function Ra:download_config(url, file)
     local ret_val = false
     self.current_file_handler = assert(io.open(file, "w"), "Could not open file")
-    --self.current_file_handler:setvbuf("no")
     if self:get_http_data(url) then
         ret_val = true
     end
diff --git a/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py b/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py
index fc1dc44..ef2e945 100755
--- a/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py
+++ b/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py
@@ -39,6 +39,12 @@ class Config:
         "BLLIST_STRIP_WWW",
         "NFT_TABLE",
         "NFT_TABLE_DNSMASQ",
+        "NFTSET_CIDR",
+        "NFTSET_IP",
+        "NFTSET_DNSMASQ",
+        "NFTSET_CIDR_USER",
+        "NFTSET_IP_USER",
+        "NFTSET_DNSMASQ_USER",
         "NFTSET_CIDR_CFG",
         "NFTSET_IP_CFG",
         "NFTSET_DNSMASQ",
@@ -497,6 +503,9 @@ class WriteConfigFiles(Config):
 
     def write_ipset_config(self, ip_set, cidr_set):
         with open(self.IP_DATA_FILE, "wt", buffering=self.write_buffer) as file_handler:
+            for i in (self.NFTSET_CIDR, self.NFTSET_IP,
+                      self.NFTSET_CIDR_USER, self.NFTSET_IP_USER):
+                file_handler.write("flush set {} {}\n".format(self.NFT_TABLE, i))
             file_handler.write(
                 "table {} {{\n{}".format(self.NFT_TABLE, self.NFTSET_IP_CFG)
             )