From e243c5e6717243714df2a41f86403df19469b4b6 Mon Sep 17 00:00:00 2001
From: itdoginfo <koalav42@gmail.com>
Date: Tue, 28 Jan 2025 17:00:32 +0300
Subject: [PATCH] Added srs for subnets
---
.github/workflows/create-lists.yml | 2 +-
convert.py | 37 +++++++++++++++++++++---------
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/create-lists.yml b/.github/workflows/create-lists.yml
index c0a29c1..90a07b3 100644
--- a/.github/workflows/create-lists.yml
+++ b/.github/workflows/create-lists.yml
@@ -30,7 +30,7 @@ jobs:
-v ${{ github.workspace }}/Categories:/app/Categories \
-v ${{ github.workspace }}/Services:/app/Services \
-v ${{ github.workspace }}/SRS:/app/SRS \
- itdoginfo/compilesrs:0.1.2
+ itdoginfo/compilesrs:0.1.3
- name: Check Russia/inside-dnsmasq-ipset
uses: itdoginfo/dnsmasq-action@0.1
diff --git a/convert.py b/convert.py
index 24c6752..8232698 100755
--- a/convert.py
+++ b/convert.py
@@ -17,6 +17,8 @@ rusDomainsOutsideOut='Russia/outside'
uaDomainsSrc='src/Ukraine-domains-inside.lst'
uaDomainsOut='Ukraine/inside'
DiscordSubnets = 'Subnets/IPv4/Discord.lst'
+MetaSubnets = 'Subnets/IPv4/Meta.lst'
+TwitterSubnets = 'Subnets/IPv4/Twitter.lst'
def raw(src, out):
domains = set()
@@ -265,16 +267,27 @@ def generate_srs_subnets(input_file, output_json_directory='JSON', compiled_outp
if subnet:
subnets.append(subnet)
- data = {
- "version": 2,
- "rules": [
- {
- "network": ["udp"],
- "ip_cidr": subnets,
- "port_range": ["50000:65535"]
- }
- ]
- }
+ if input_file == "Subnets/IPv4/Discord.lst":
+ data = {
+ "version": 2,
+ "rules": [
+ {
+ "network": ["udp"],
+ "ip_cidr": subnets,
+ "port_range": ["50000:65535"]
+ }
+ ]
+ }
+
+ else:
+ data = {
+ "version": 2,
+ "rules": [
+ {
+ "ip_cidr": subnets
+ }
+ ]
+ }
filename = os.path.splitext(os.path.basename(input_file))[0]
output_file_path = os.path.join(output_json_directory, f"{filename}-subnets.json")
@@ -347,4 +360,6 @@ if __name__ == '__main__':
generate_srs_for_categories(directories)
# Sing-box subnets
- generate_srs_subnets(DiscordSubnets)
\ No newline at end of file
+ generate_srs_subnets(DiscordSubnets)
+ generate_srs_subnets(TwitterSubnets)
+ generate_srs_subnets(MetaSubnets)
\ No newline at end of file