mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
移除多余空行并
This commit is contained in:
parent
4a3339de15
commit
2f2b9b925c
@ -133,7 +133,6 @@ def getmodels(platforms=None):
|
|||||||
req = session.get(url, timeout=10, verify=False)
|
req = session.get(url, timeout=10, verify=False)
|
||||||
req.encoding = "utf-8"
|
req.encoding = "utf-8"
|
||||||
p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
|
p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
|
||||||
|
|
||||||
data = p.findall(req.text)
|
data = p.findall(req.text)
|
||||||
for item in data:
|
for item in data:
|
||||||
if not "DSM" in item[1]:
|
if not "DSM" in item[1]:
|
||||||
|
@ -429,7 +429,7 @@ function connectwlanif() {
|
|||||||
kill -9 "$(cat /var/run/wpa_supplicant.pid.${1})"
|
kill -9 "$(cat /var/run/wpa_supplicant.pid.${1})"
|
||||||
rm -f "/var/run/wpa_supplicant.pid.${1}"
|
rm -f "/var/run/wpa_supplicant.pid.${1}"
|
||||||
fi
|
fi
|
||||||
wpa_supplicant -i "${1}" -c "${CONF}" -B -P "/var/run/wpa_supplicant.pid.${1}" >/dev/null 2>&1
|
wpa_supplicant -i "${1}" -c "${CONF}" -qq -B -P "/var/run/wpa_supplicant.pid.${1}" >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,6 @@ def getmodels(workpath, jsonpath, xlsxpath):
|
|||||||
req = session.get(url, timeout=10, verify=False)
|
req = session.get(url, timeout=10, verify=False)
|
||||||
req.encoding = "utf-8"
|
req.encoding = "utf-8"
|
||||||
p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
|
p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
|
||||||
|
|
||||||
data = p.findall(req.text)
|
data = p.findall(req.text)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
click.echo(f"Error: {e}")
|
click.echo(f"Error: {e}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user