mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
Merge pull request #797 from ynput/enhancement/add-username-to-tray-info
Tray: Add username to info
This commit is contained in:
commit
83ebaa3fa3
1 changed files with 13 additions and 6 deletions
|
|
@ -3,12 +3,11 @@ import sys
|
|||
import time
|
||||
import collections
|
||||
import atexit
|
||||
import json
|
||||
import platform
|
||||
|
||||
from aiohttp.web_response import Response
|
||||
import ayon_api
|
||||
from qtpy import QtCore, QtGui, QtWidgets
|
||||
from aiohttp.web import Response, json_response, Request
|
||||
|
||||
from ayon_core import resources, style
|
||||
from ayon_core.lib import (
|
||||
|
|
@ -91,6 +90,10 @@ class TrayManager:
|
|||
self._services_submenu = None
|
||||
self._start_time = time.time()
|
||||
|
||||
# Cache AYON username used in process
|
||||
# - it can change only by changing ayon_api global connection
|
||||
# should be safe for tray application to cache the value only once
|
||||
self._cached_username = None
|
||||
self._closing = False
|
||||
try:
|
||||
set_tray_server_url(
|
||||
|
|
@ -143,7 +146,7 @@ class TrayManager:
|
|||
self._addons_manager.initialize(tray_menu)
|
||||
|
||||
self._addons_manager.add_route(
|
||||
"GET", "/tray", self._get_web_tray_info
|
||||
"GET", "/tray", self._web_get_tray_info
|
||||
)
|
||||
|
||||
admin_submenu = ITrayAction.admin_submenu(tray_menu)
|
||||
|
|
@ -274,8 +277,12 @@ class TrayManager:
|
|||
|
||||
return item
|
||||
|
||||
async def _get_web_tray_info(self, request):
|
||||
return Response(text=json.dumps({
|
||||
async def _web_get_tray_info(self, _request: Request) -> Response:
|
||||
if self._cached_username is None:
|
||||
self._cached_username = ayon_api.get_user()["name"]
|
||||
|
||||
return json_response({
|
||||
"username": self._cached_username,
|
||||
"bundle": os.getenv("AYON_BUNDLE_NAME"),
|
||||
"dev_mode": is_dev_mode_enabled(),
|
||||
"staging_mode": is_staging_enabled(),
|
||||
|
|
@ -285,7 +292,7 @@ class TrayManager:
|
|||
},
|
||||
"installer_version": os.getenv("AYON_VERSION"),
|
||||
"running_time": time.time() - self._start_time,
|
||||
}))
|
||||
})
|
||||
|
||||
def _on_update_check_timer(self):
|
||||
try:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue