atoy3731/adguard-sync
1
1
Fork 0
mirror of https://github.com/atoy3731/adguard-sync.git synced 2024-09-20 06:56:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to handle filters

Browse source
This commit is contained in:
adam.toy 2023-10-12 20:44:26 -04:00
parent 6ec234f244
commit 31f5b434e2
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
2.2
2.3

16
src/custom_rules/__init__.py
View file

@ -2,6 +2,7 @@ import requests
import os
import json
import time
import common
from exceptions import UnauthenticatedError, SystemError
@ -16,7 +17,10 @@ def _get_custom_rules(filtering_status):
custom_rules_array = filtering_status['user_rules']
custom_rules_str = '\n'.join(custom_rules_array)
return custom_rules_str
return {
'array': custom_rules_array,
'string': custom_rules_str
}
def _update_custom_rules(url, cookie, custom_rules):
@ -32,8 +36,12 @@ def _update_custom_rules(url, cookie, custom_rules):
'agh_session': cookie
}
body = {
'rules': custom_rules
}
print(" - Syncing custom rules")
response = requests.post('{}/control/filtering/set_rules'.format(url), cookies=cookies, data=custom_rules)
response = requests.post('{}/control/filtering/set_rules'.format(url), headers=common.REQUEST_HEADERS, cookies=cookies, data=json.dumps(body))
if response.status_code == 403:
raise UnauthenticatedError
@ -52,5 +60,5 @@ def reconcile(primary_filtering_status, secondary_filtering_status, adguard_seco
primary_custom_rules = _get_custom_rules(primary_filtering_status)
secondary_custom_rules = _get_custom_rules(secondary_filtering_status)
if primary_custom_rules != secondary_custom_rules:
_update_custom_rules(adguard_secondary, secondary_cookie, primary_custom_rules)
if primary_custom_rules['string'] != secondary_custom_rules['string']:
_update_custom_rules(adguard_secondary, secondary_cookie, primary_custom_rules['array'])