Use regular expressions for rule-check
This commit is contained in:
parent
ea36f55fbd
commit
64b7d41bee
@ -23,6 +23,7 @@ import json
|
|||||||
import hashlib
|
import hashlib
|
||||||
import platform
|
import platform
|
||||||
import urllib.request
|
import urllib.request
|
||||||
|
import re
|
||||||
|
|
||||||
def download(url,decode = "utf-8"):
|
def download(url,decode = "utf-8"):
|
||||||
request = urllib.request.Request(url,headers={"User-Agent":"Mozilla/5.0"})
|
request = urllib.request.Request(url,headers={"User-Agent":"Mozilla/5.0"})
|
||||||
@ -118,11 +119,11 @@ def checkRules(ruleList):
|
|||||||
for rule in ruleList:
|
for rule in ruleList:
|
||||||
if "os" in rule:
|
if "os" in rule:
|
||||||
if "name" in rule["os"]:
|
if "name" in rule["os"]:
|
||||||
if rule["os"]["name"] == "osx": rule["os"]["name"] = "macos"
|
rule["os"]["name"] = rule["os"]["name"].replace("osx","macos")
|
||||||
if lv["osName"] != rule["os"]["name"]: continue
|
if not re.search(rule["os"]["name"],lv["osName"]): continue
|
||||||
|
|
||||||
if "arch" in rule["os"]:
|
if "arch" in rule["os"]:
|
||||||
if lv["jvmArch"] != rule["os"]["arch"]: continue
|
if not re.search(rule["os"]["arch"],lv["jvmArch"]): continue
|
||||||
|
|
||||||
if "version" in rule["os"]: continue
|
if "version" in rule["os"]: continue
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user