Update SFLB to 3.0.14

* Fix AG conversion issues
FiltersHeroes · Feb 9, 2024 · a619b29 · a619b29
1 parent af877e1
commit a619b29
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ jobs:
         include:
           - dfile: "SFLB"
             imname: "sflb"
-            version: "3.0.13"
+            version: "3.0.14"
           - dfile: "ED"
             imname: "expired_domains"
             version: "1"
@@ -77,10 +77,10 @@ jobs:
         include:
           - dfile: "KAD"
             imname: "kad"
-            version: "3.0.13"
+            version: "3.0.14"
           - dfile: "RTM"
             imname: "rtm"
-            version: "3.0.13"
+            version: "3.0.14"
     needs: docker_sflb_ed
     steps:
       - name: Check out the repo

diff --git a/Dockerfile_SFLB b/Dockerfile_SFLB
@@ -3,7 +3,7 @@ FROM python:3-slim
 # make Apt non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-ENV SFLB_tag="SFLB-3.0.13"
+ENV SFLB_tag="SFLB-3.0.14"
 ENV SFLB_LOCALES_PATH="/usr/share/locale"
 ENV FOP_tag="FOP-3.32"
 

diff --git a/scripts/SFLB.py b/scripts/SFLB.py
@@ -43,7 +43,7 @@
     FOP = None
 
 # Version number
-SCRIPT_VERSION = "3.0.13"
+SCRIPT_VERSION = "3.0.14"
 
 # Parse arguments
 parser = argparse.ArgumentParser()
@@ -534,11 +534,17 @@ def main(pathToFinalLists, forced, saveChangedFN):
                                             if "##+js" in lineC:
                                                 funcArgs = lineC.split(
                                                     "##+js(")[1].strip().replace(')', '').split(", ")
-                                                for arg in funcArgs:
-                                                    lineC = lineC.replace(
+                                                search_words = re.search(DOMAIN_PAT, lineC)
+                                                domain = search_words.group(1)
+                                                lineC = f"{domain}#%#//scriptlet("
+                                                for i, arg in enumerate(funcArgs):
+                                                    arg = arg.replace(
                                                         arg, f"'{arg}'", 1)
-                                                lineC = lineC.replace(
-                                                    "##+js", "#%#//scriptlet")
+                                                    if i == len(funcArgs) - 1:
+                                                        lineC += f"{arg})"
+                                                    else:
+                                                        lineC += f"{arg}, "
+                                                lineC += "\n"
                                             elif ":remove-attr" or ":remove-class" or "##^" in lineC:
                                                 search_words = re.search(
                                                     DOMAIN_PAT, lineC)