Skip to content

Commit

Permalink
Add lhie1 rules to auto update config
Browse files Browse the repository at this point in the history
  • Loading branch information
tindy2013 committed Apr 6, 2024
1 parent b82d492 commit fb6a830
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
5 changes: 5 additions & 0 deletions scripts/rules_config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,8 @@ match=Surge/Ruleset/**
url=https://github.com/NobyDa/Script
branch=master
match=Surge/*.list

[lhie1]
url=https://github.com/dler-io/Rules
branch=main
match=Surge/Surge 3/Provider/**
25 changes: 16 additions & 9 deletions scripts/update_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ def update_rules(repo_path: str, save_path: str, matches: list[str], keep_tree:
os.makedirs(save_path, exist_ok=True)
for pattern in matches:
files = glob.glob(os.path.join(repo_path, pattern), recursive=True)
if len(files) == 0:
logging.warn(f"no files found for pattern {pattern}")
continue
for file in files:
if os.path.isdir(file):
continue
Expand Down Expand Up @@ -68,15 +71,19 @@ def main():
else:
logging.info(f"repo {repo_path} exists")

if commit is not None:
logging.info(f"checking out to commit {commit}")
r.git.checkout(commit)
elif branch is not None:
logging.info(f"checking out to branch {branch}")
r.git.checkout(branch)
else:
logging.info(f"checking out to default branch")
r.active_branch.checkout()
try:
if commit is not None:
logging.info(f"checking out to commit {commit}")
r.git.checkout(commit)
elif branch is not None:
logging.info(f"checking out to branch {branch}")
r.git.checkout(branch)
else:
logging.info(f"checking out to default branch")
r.active_branch.checkout()
except Exception as e:
logging.error(f"checkout failed {e}")
continue

update_rules(repo_path, save_path, matches, keep_tree)

Expand Down

0 comments on commit fb6a830

Please sign in to comment.