CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made slight optimizations to get_data and the way the miner gets mac data

Browse Source
This commit is contained in:
UpstreamData
2022-06-03 15:30:09 -06:00
parent 7d61056ea3
commit 8e1803add1
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
miners/_backends/btminer.py
View File

@@ -80,27 +80,30 @@ class BTMiner(BaseMiner):
async def get_mac(self): async def get_mac(self):
mac = "" mac = ""
try: data = await self.api.summary()
data = await self.api.get_miner_info() if data:
if data: if data.get("SUMMARY"):
if "Msg" in data.keys(): if len(data["SUMMARY"]) > 0:
if "mac" in data["Msg"].keys(): _mac = data["SUMMARY"][0].get("MAC")
mac = data["Msg"]["mac"] if _mac:
except APIError: mac = _mac
pass
if mac == "": if mac == "":
data = await self.api.summary() try:
if data: data = await self.api.get_miner_info()
if data.get("SUMMARY"): if data:
if len(data["SUMMARY"]) > 0: if "Msg" in data.keys():
_mac = data["SUMMARY"][0].get("MAC") if "mac" in data["Msg"].keys():
if _mac: mac = data["Msg"]["mac"]
mac = _mac except APIError:
pass
return str(mac).upper() return str(mac).upper()
async def get_data(self): async def get_data(self):
data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3) data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3)
mac = None
try: try:
model = await self.get_model() model = await self.get_model()
except APIError: except APIError:
@@ -115,21 +118,12 @@ class BTMiner(BaseMiner):
hostname = None hostname = None
data.hostname = "Whatsminer" data.hostname = "Whatsminer"
try:
mac = await self.get_mac()
except APIError:
logging.info(f"Failed to get mac: {self}")
mac = None
if model: if model:
data.model = model data.model = model
if hostname: if hostname:
data.hostname = hostname data.hostname = hostname
if mac:
data.mac = mac
miner_data = None miner_data = None
for i in range(DATA_RETRIES): for i in range(DATA_RETRIES):
try: try:
@@ -150,6 +144,9 @@ class BTMiner(BaseMiner):
summary_data = summary.get("SUMMARY") summary_data = summary.get("SUMMARY")
if summary_data: if summary_data:
if len(summary_data) > 0: if len(summary_data) > 0:
if summary_data[0].get("MAC"):
mac = summary_data[0]["MAC"]
data.fan_1 = summary_data[0]["Fan Speed In"] data.fan_1 = summary_data[0]["Fan Speed In"]
data.fan_2 = summary_data[0]["Fan Speed Out"] data.fan_2 = summary_data[0]["Fan Speed Out"]
@@ -233,4 +230,14 @@ class BTMiner(BaseMiner):
if quota: if quota:
data.pool_split = str(quota) data.pool_split = str(quota)
if not mac:
try:
mac = await self.get_mac()
except APIError:
logging.info(f"Failed to get mac: {self}")
mac = None
if mac:
data.mac = mac
return data return data