diff --git a/AdGuard_games_streaming_social_list.txt b/AdGuard_games_streaming_social_list.txt index 1572e0a..2484f05 100644 --- a/AdGuard_games_streaming_social_list.txt +++ b/AdGuard_games_streaming_social_list.txt @@ -339,7 +339,6 @@ sites.google.com/site/unblockedgamesvevo ||b3ta.com^ ||babygames.com^ ||badazzfemales.wordpress.com^ -||baidu.com^ ||baits.io^ ||bakno.com^ ||baknogames.com^ @@ -1819,7 +1818,6 @@ sites.google.com/site/unblockedgamesvevo ||girlsgogames.com^ ||girlsgogames.fr^ ||girlsjeux.com^ -||github.io^ ||giydiroyun.com^ ||gjeux.com^ ||gladiatus.com^ @@ -4690,3 +4688,9 @@ sites.google.com/site/unblockurgames^ ||gulper.io^ ||gamekult.com^ ||antstream.com^ +||arcadrome.com^ +||cg.163.com^ +||heheda.cn^ +||moe.ms^ +||plantsvszombiesfusion.com^ +||wan1234.com^ diff --git a/Domain_list_raw.txt b/Domain_list_raw.txt index 7ca1ac5..2a6270a 100644 --- a/Domain_list_raw.txt +++ b/Domain_list_raw.txt @@ -312,7 +312,6 @@ azeroth.fr b3ta.com babygames.com badazzfemales.wordpress.com -baidu.com baits.io bakno.com baknogames.com @@ -1799,7 +1798,6 @@ girlsgogames.co.uk girlsgogames.com girlsgogames.fr girlsjeux.com -github.io giydiroyun.com gladiatus.com gladiatus.fr @@ -4654,3 +4652,9 @@ poxel.io gulper.io gamekult.com antstream.com +arcadrome.com +cg.163.com +heheda.cn +moe.ms +plantsvszombiesfusion.com +wan1234.com diff --git a/GamesStreamingSocialFilter_Apple.mobileconfig b/GamesStreamingSocialFilter_Apple.mobileconfig index ac7d571..009e47f 100644 --- a/GamesStreamingSocialFilter_Apple.mobileconfig +++ b/GamesStreamingSocialFilter_Apple.mobileconfig @@ -11,7 +11,7 @@ PayloadType Configuration PayloadUUID - B549F4B5-B945-4D8D-9896-6CA35C0EC09A + DF7AC95C-BD11-406A-B9C5-CF0F532C3D7C PayloadVersion 1 PayloadContent @@ -22,13 +22,13 @@ PayloadIdentifier com.gamestreamingsocial.webcontentfilter.filter PayloadUUID - 5C06EB49-4F68-4F68-9A78-A982EABCE431 + 151C9391-FB8B-46EC-BB0E-1509BFF15B75 PayloadVersion 1 PayloadDisplayName Games, Streaming & Social Web Filter ContentFilterUUID - 73AFC9B1-1BCB-4464-9BE8-00D0EB4D5B08 + C22BF5B5-07C3-48FE-A7A1-58C9227DCBB7 FilterType BuiltIn AutoFilterEnabled @@ -663,8 +663,6 @@ http://babygames.com https://badazzfemales.wordpress.com http://badazzfemales.wordpress.com - https://baidu.com - http://baidu.com https://baits.io http://baits.io https://bakno.com @@ -3637,8 +3635,6 @@ http://girlsgogames.fr https://girlsjeux.com http://girlsjeux.com - https://github.io - http://github.io https://giydiroyun.com http://giydiroyun.com https://gladiatus.com @@ -9347,6 +9343,18 @@ http://gamekult.com https://antstream.com http://antstream.com + https://arcadrome.com + http://arcadrome.com + https://cg.163.com + http://cg.163.com + https://heheda.cn + http://heheda.cn + https://moe.ms + http://moe.ms + https://plantsvszombiesfusion.com + http://plantsvszombiesfusion.com + https://wan1234.com + http://wan1234.com diff --git a/check_urls.sh b/check_urls.sh index 75aff14..12dc74e 100755 --- a/check_urls.sh +++ b/check_urls.sh @@ -6,6 +6,28 @@ cd "$(dirname "$0")" input_file="Domain_list_raw.txt" adguard_file="AdGuard_games_streaming_social_list.txt" +delete_exact_line() { + local target="$1" + local file="$2" + local tmp + + tmp=$(mktemp "${TMPDIR:-/tmp}/adguard-filter.XXXXXX") || return 1 + if ! awk -v target="$target" ' + BEGIN { removed = 0 } + $0 == target { removed = 1; next } + { print } + END { exit(removed ? 0 : 2) } + ' "$file" > "$tmp"; then + rm -f "$tmp" + return 1 + fi + + if ! mv "$tmp" "$file"; then + rm -f "$tmp" + return 1 + fi +} + # Vérification des URL while IFS= read -r url; do if [[ -n "$url" ]]; then @@ -15,16 +37,20 @@ while IFS= read -r url; do if [[ $? -ne 0 ]]; then echo "❌ URL invalide : $url" - # Supprimer la ligne de Listing_raw.txt - sed -i '' "\|^${url}$|d" "$input_file" + # Supprimer la ligne de Domain_list_raw.txt + if ! delete_exact_line "$url" "$input_file"; then + echo " Échec de suppression dans $input_file" + exit 1 + fi - # Chercher et supprimer la ligne correspondante dans AdGuard_games_list.txt - matched_line=$(grep -nF "$url" "$adguard_file" | head -1) - if [[ -n "$matched_line" ]]; then - line_num=$(echo "$matched_line" | cut -d: -f1) - line_content=$(echo "$matched_line" | cut -d: -f2-) - sed -i '' "${line_num}d" "$adguard_file" - echo " Supprimé de $adguard_file : $line_content" + # Supprimer la ligne correspondante dans AdGuard_games_streaming_social_list.txt + if grep -qFx "||${url}^" "$adguard_file"; then + if delete_exact_line "||${url}^" "$adguard_file"; then + echo " Supprimé de $adguard_file : ||${url}^" + else + echo " Échec de suppression dans $adguard_file" + exit 1 + fi else echo " URL non trouvée dans $adguard_file" fi @@ -35,4 +61,4 @@ while IFS= read -r url; do done < <(cat "$input_file") echo "" -echo "Vérification terminée." \ No newline at end of file +echo "Vérification terminée." diff --git a/remove_domain.sh b/remove_domain.sh index d57aeff..3c77f4a 100755 --- a/remove_domain.sh +++ b/remove_domain.sh @@ -5,6 +5,28 @@ cd "$(dirname "$0")" listing_file="Domain_list_raw.txt" adguard_file="AdGuard_games_streaming_social_list.txt" +delete_exact_line() { + local target="$1" + local file="$2" + local tmp + + tmp=$(mktemp "${TMPDIR:-/tmp}/adguard-filter.XXXXXX") || return 1 + if ! awk -v target="$target" ' + BEGIN { removed = 0 } + $0 == target { removed = 1; next } + { print } + END { exit(removed ? 0 : 2) } + ' "$file" > "$tmp"; then + rm -f "$tmp" + return 1 + fi + + if ! mv "$tmp" "$file"; then + rm -f "$tmp" + return 1 + fi +} + echo "Entrez le domaine à supprimer :" read -r domain domain=$(echo "$domain" | tr -d '[:space:]') @@ -14,21 +36,26 @@ if [[ -z "$domain" ]]; then exit 1 fi -# Supprimer de Listing_raw.txt -if grep -qF "$domain" "$listing_file"; then - line_num=$(grep -nF "$domain" "$listing_file" | head -1 | cut -d: -f1) - sed -i '' "${line_num}d" "$listing_file" - echo "✅ Supprimé de $listing_file" +# Supprimer de Domain_list_raw.txt +if grep -qFx "$domain" "$listing_file"; then + if delete_exact_line "$domain" "$listing_file"; then + echo "✅ Supprimé de $listing_file" + else + echo "❌ Échec de suppression dans $listing_file" + exit 1 + fi else echo "⚠️ Non trouvé dans $listing_file" fi -# Supprimer de AdGuard_games_list.txt -if grep -qF "$domain" "$adguard_file"; then - line_num=$(grep -nF "$domain" "$adguard_file" | head -1 | cut -d: -f1) - sed -i '' "${line_num}d" "$adguard_file" - echo "✅ Supprimé de $adguard_file" +# Supprimer de AdGuard_games_streaming_social_list.txt +if grep -qFx "||${domain}^" "$adguard_file"; then + if delete_exact_line "||${domain}^" "$adguard_file"; then + echo "✅ Supprimé de $adguard_file" + else + echo "❌ Échec de suppression dans $adguard_file" + exit 1 + fi else echo "⚠️ Non trouvé dans $adguard_file" fi -