Fitgirl repacks bugfix and new kmspico wildcard rule + "optimize" the…

… script a little bit
fmhy · Jul 10, 2024 · 2c28656 · 2c28656
1 parent 56c512b
commit 2c28656
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/build.py b/build.py
@@ -46,11 +46,9 @@ def generate_blocklist(header_file, sitelist_file, output_file, format, filterli
           domains_lines[i] = line.replace("\n", '')
           domains_lines[i] = ('||' + domains_lines[i] + '^' + "\n")
         elif format == 'hosts':
-          domains_lines[i] = line.replace("\n", '')
-          domains_lines[i] = ('0.0.0.0 ' + domains_lines[i] + "\n")
+          domains_lines[i] = ('0.0.0.0 ' + domains_lines[i])
         elif format == 'wildcard_domains':
-          domains_lines[i] = line.replace("\n", '')
-          domains_lines[i] = ('*.' + domains_lines[i] + "\n")
+          domains_lines[i] = ('*.' + domains_lines[i])
       if line.startswith('!'):
         if format == 'hosts' or format == 'domains' or format == 'wildcard_domains':
           domains_lines[i] = line.replace('!', '#')

diff --git a/filterlist-abp.txt b/filterlist-abp.txt
@@ -1,7 +1,7 @@
 [Adblock Plus]
 ! Title: FMHY Unsafe sites filterlist
 ! Description: Blocks sites in the fmhy unsafe sites filterlists
-! Last modified: 30 Jun 2024 12:26 UTC
+! Last modified: 10 Jul 2024 08:48 UTC
 ! Homepage: https://github.com/WindowsAurora/FMHYFilterlist
 ! License: https://github.com/WindowsAurora/FMHYFilterlist/blob/main/LICENSE
 ! Issues: https://github.com/WindowsAurora/FMHYFilterlist/issues

diff --git a/filterlist-domains.txt b/filterlist-domains.txt
@@ -1,6 +1,6 @@
 # Title: FMHY Unsafe sites filterlist
 # Description: Blocks sites in the fmhy unsafe sites filterlists
-# Last modified: 30 Jun 2024 12:26 UTC
+# Last modified: 10 Jul 2024 08:48 UTC
 # Homepage: https://github.com/WindowsAurora/FMHYFilterlist
 # License: https://github.com/WindowsAurora/FMHYFilterlist/blob/main/LICENSE
 # Issues: https://github.com/WindowsAurora/FMHYFilterlist/issues

diff --git a/filterlist-hosts.txt b/filterlist-hosts.txt
@@ -1,6 +1,6 @@
 # Title: FMHY Unsafe sites filterlist
 # Description: Blocks sites in the fmhy unsafe sites filterlists
-# Last modified: 30 Jun 2024 12:26 UTC
+# Last modified: 10 Jul 2024 08:48 UTC
 # Homepage: https://github.com/WindowsAurora/FMHYFilterlist
 # License: https://github.com/WindowsAurora/FMHYFilterlist/blob/main/LICENSE
 # Issues: https://github.com/WindowsAurora/FMHYFilterlist/issues
@@ -278,4 +278,4 @@
 0.0.0.0 officialkmspico.download
 0.0.0.0 officialkmspico.net
 0.0.0.0 officials-kmspico.com
-0.0.0.0 oficial-kmspico.com
+0.0.0.0 oficial-kmspico.com
diff --git a/filterlist-wildcard-domains.txt b/filterlist-wildcard-domains.txt
@@ -1,6 +1,6 @@
 # Title: FMHY Unsafe sites filterlist
 # Description: Blocks sites in the fmhy unsafe sites filterlists
-# Last modified: 30 Jun 2024 12:26 UTC
+# Last modified: 10 Jul 2024 08:48 UTC
 # Homepage: https://github.com/WindowsAurora/FMHYFilterlist
 # License: https://github.com/WindowsAurora/FMHYFilterlist/blob/main/LICENSE
 # Issues: https://github.com/WindowsAurora/FMHYFilterlist/issues
@@ -278,4 +278,4 @@
 *.officialkmspico.download
 *.officialkmspico.net
 *.officials-kmspico.com
-*.oficial-kmspico.com
+*.oficial-kmspico.com
diff --git a/filterlist.txt b/filterlist.txt
@@ -1,10 +1,10 @@
 ! Title: FMHY Unsafe sites filterlist
 ! Description: Blocks sites in the fmhy unsafe sites filterlists
-! Last modified: 30 Jun 2024 12:26 UTC
+! Last modified: 10 Jul 2024 08:48 UTC
 ! Homepage: https://github.com/WindowsAurora/FMHYFilterlist
 ! License: https://github.com/WindowsAurora/FMHYFilterlist/blob/main/LICENSE
 ! Issues: https://github.com/WindowsAurora/FMHYFilterlist/issues
-! Entries: 286
+! Entries: 287
 ! Format: ublock
 
 ! Unsafe game sites
@@ -284,7 +284,8 @@
 ||massgrav.*^$all,domain=~massgrave.dev
 ||massgraves.*^$all,domain=~massgrave.dev
 ||*kmspico*.*^$all,domain=~forums.mydigitallife.net
-||f*tgirl*repack*.*^$all,domain=~fitgirl-repacks.site
+||*kms-pico*.*^$all,domain=~forums.mydigitallife.net
+||fitgirl*repack*.*^$all,domain=~fitgirl-repacks.site
 ||steamunlocked.*^$all
 ||igg-games.*^$all
 ||igggames.*^$all

diff --git a/filters-ublock-only.txt b/filters-ublock-only.txt
@@ -3,7 +3,8 @@
 ||massgrav.*^$all,domain=~massgrave.dev
 ||massgraves.*^$all,domain=~massgrave.dev
 ||*kmspico*.*^$all,domain=~forums.mydigitallife.net
-||f*tgirl*repack*.*^$all,domain=~fitgirl-repacks.site
+||*kms-pico*.*^$all,domain=~forums.mydigitallife.net
+||fitgirl*repack*.*^$all,domain=~fitgirl-repacks.site
 ||steamunlocked.*^$all
 ||igg-games.*^$all
 ||igggames.*^$all