Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve default device name

Browse Source 
The number returned by platform.version() is only meaningful in a
long-time scenario on Windows. Also make the function clearer.
This commit is contained in:
miruka 2020-03-21 23:39:57 -04:00
parent ae272829c5
commit f54075b7e0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/matrix_client.py
View File

@ -154,19 +154,27 @@ class MatrixClient(nio.AsyncClient):
return response return response
@property @staticmethod
def default_device_name(self) -> str: def default_device_name() -> str:
"""Device name to set at login if the user hasn't set a custom one.""" """Device name to set at login if the user hasn't set a custom one."""
os_ = f" on {platform.system()}".rstrip() os_name = platform.system()
os_ = f"{os_} {platform.release()}".rstrip() if os_ != " on" else ""
return f"{__display_name__}{os_}" if not os_name: # unknown OS
return __display_name__
# On Linux, the kernel version is returned, so for a one-time-set
# device name it would quickly be outdated.
os_ver = platform.release() if os_name == "Windows" else ""
return f"{__display_name__} on {os_name} {os_ver}".rstrip()
async def login(self, password: str, device_name: str = "") -> None: async def login(self, password: str, device_name: str = "") -> None:
"""Login to the server using the account's password.""" """Login to the server using the account's password."""
await super().login(password, device_name or self.default_device_name) await super().login(
password, device_name or self.default_device_name(),
)
asyncio.ensure_future(self._start()) asyncio.ensure_future(self._start())