onyx_online/vban-cmd-python
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/vban-cmd-python.git synced 2024-11-15 17:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

_conn_from_toml filepaths added.

Browse Source
This commit is contained in:
onyx-and-iris 2023-06-25 13:58:19 +01:00
parent fc324fecc4
commit 174d95d08d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vban_cmd/vbancmd.py
View File

@ -63,8 +63,8 @@ class VbanCmd(metaclass=ABCMeta):
def get_filepath(): def get_filepath():
filepaths = [ filepaths = [
Path.cwd() / "vban.toml", Path.cwd() / "vban.toml",
Path.home() / "vban.toml",
Path.home() / ".config" / "vban-cmd" / "vban.toml", Path.home() / ".config" / "vban-cmd" / "vban.toml",
Path.home() / "Documents" / "Voicemeeter" / "vban.toml",
] ]
for filepath in filepaths: for filepath in filepaths:
if filepath.exists(): if filepath.exists():
@ -73,7 +73,9 @@ class VbanCmd(metaclass=ABCMeta):
if filepath := get_filepath(): if filepath := get_filepath():
with open(filepath, "rb") as f: with open(filepath, "rb") as f:
conn = tomllib.load(f) conn = tomllib.load(f)
assert "ip" in conn["connection"], "please provide ip, by kwarg or config" assert (
"ip" in conn["connection"]
), "please provide ip, by kwarg or config"
return conn["connection"] return conn["connection"]
else: else:
raise VBANCMDError("no ip provided and no vban.toml located.") raise VBANCMDError("no ip provided and no vban.toml located.")
@ -110,8 +112,9 @@ class VbanCmd(metaclass=ABCMeta):
self.packet_request.header + cmd.encode(), self.packet_request.header + cmd.encode(),
(socket.gethostbyname(self.ip), self.port), (socket.gethostbyname(self.ip), self.port),
) )
count = int.from_bytes(self.packet_request.framecounter, "little") + 1 self.packet_request.framecounter = (
self.packet_request.framecounter = count.to_bytes(4, "little") int.from_bytes(self.packet_request.framecounter, "little") + 1
).to_bytes(4, "little")
if param: if param:
self.cache[f"{id_}.{param}"] = val self.cache[f"{id_}.{param}"] = val
@ -122,8 +125,9 @@ class VbanCmd(metaclass=ABCMeta):
self.packet_request.header + cmd.encode(), self.packet_request.header + cmd.encode(),
(socket.gethostbyname(self.ip), self.port), (socket.gethostbyname(self.ip), self.port),
) )
count = int.from_bytes(self.packet_request.framecounter, "little") + 1 self.packet_request.framecounter = (
self.packet_request.framecounter = count.to_bytes(4, "little") int.from_bytes(self.packet_request.framecounter, "little") + 1
).to_bytes(4, "little")
time.sleep(self.DELAY) time.sleep(self.DELAY)
@property @property