From 25eb1b5343ccbde8c0b57cd2e75ff3d16f091c1f Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 10 Jun 2023 12:26:10 -0700 Subject: [PATCH] tidying --- .efrocachemap | 32 +++++++++---------- src/assets/ba_data/python/babase/__init__.py | 10 +++++- src/assets/ba_data/python/bauiv1/__init__.py | 18 +++-------- .../ba_data/python/bauiv1/_subsystem.py | 5 ++- tools/efrotools/code.py | 3 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 5e23a598..02eef2d7 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4080,18 +4080,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/58/55/8451262689d989ea20afb41de14c", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4f/52/dce0af89103a5a03d1bb5782e7d0", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/78/64/c34c3f8fb8bce1e08da4438b3350", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/b6/fa/92015a413d12c56019881a7cc8d0", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/13/2a/fb167b1965bf3ca42119752d6ee2", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/14/fb/35f54fb4b97377263f6305bd45c1", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/45/3a/374b60bebda4ebb2607a6dad427b", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1c/9a/0254de072276e6b91ae6263a85d1", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7b/7b/b41669c7b97755276ab1cbdcb92f", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f3/20/0fb5b4493d18890f0125fd74d93f", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/44/8f/77ce1cdbe24402790934d8456cf6", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f2/7b/7efa84c6410a671cf97586614669", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/be/81/552739f4966b4735834c5a63c52a", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/38/a3/cb7f11f0b08bc8a3905e6e75acc3", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f6/6e/657e14ff3c06d29ad2541647b191", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/65/58/e4c21e72430cfe1919b7cefe1b5c", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/ce/c9/7c8dce24b9ee035bcfc731935af0", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a8/05/30192dddefd40c643ff6956dbe0a", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/64/ea/8673849197bdd895127c8a7f1eaa", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/81/92/588ad98e7d2239c7c93ce7c12513", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/57/99/d59f41ae43a3fcb78c5938fb5400", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a4/93/ffd30c21a736ffa4c444affeb880", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ed/58/2b7bc79d98a4c317d8b8edf959b7", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/fd/89/44e2ebc1017c94053d3df1f6cb8a", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/38/d7/7110069365b22bee424f36e1bf5a", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/6c/89/1c44605fe89b5faa9b1061455838", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/58/12/59092d28e6e8e1923dfff8d7e5de", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/a0/a2a78934c1193505f3d62989a152", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/67/56/ea651dddf9502c0513f29fb1a8c0", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ee/a7/9eca8b6ecde1a38ded30f6c88431", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/31/db/e2a33e48dd2835c282c51fd96b3a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/1a/e8/0e4291696a603d5146d7a96f4b93", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/36/2f/102a2e269781a638cc92cbdd6962", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/a5/e7/a3f7431f2c785c6a262485d5a3af", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/e6/ad/77c78647c43bfb91f899e91eedc6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d5/01/06663a9b6e38ca0c20b71caf8c88", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2b/bb/b099d9d81af6f086d60478365c77", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/dd/f9/bd44a01e2a9ea3e7b8447fe9ba14", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/10/da/f0e257288f791617e39964e3574b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a6/a0/8af0b0f7dcd39a4344b6c80a5337", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/a4/f9/783d551d07a180edf4890d0179a7", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/11/b6/c7b7b6d06f88b16f0658b250779c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/de/d7/cfcd914aca8ce6965c5909cbefc4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/df/84/2e43399b6e5f1a2d7cdcb2e4b34c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/24/dc/c65be65095e292f0e4e04ad71c8a", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/ea/6a/6a4721b144e5e297b542d2a0eea2", diff --git a/src/assets/ba_data/python/babase/__init__.py b/src/assets/ba_data/python/babase/__init__.py index 2eda82dd..f942ea79 100644 --- a/src/assets/ba_data/python/babase/__init__.py +++ b/src/assets/ba_data/python/babase/__init__.py @@ -59,6 +59,7 @@ from _babase import ( get_display_resolution, ) +from babase._login import LoginAdapter from babase._appconfig import commit_app_config from babase._appintent import AppIntent, AppIntentDefault, AppIntentExec from babase._appmode import AppMode @@ -95,7 +96,11 @@ from babase._error import ( from babase._language import Lstr, LanguageSubsystem from babase._appconfig import AppConfig -from babase._apputils import is_browser_likely_available, garbage_collect +from babase._apputils import ( + is_browser_likely_available, + garbage_collect, + get_remote_app_name, +) from babase._general import ( DisplayTime, AppTime, @@ -219,6 +224,9 @@ __all__ = [ 'add_clean_frame_callback', 'get_max_graphics_quality', 'get_display_resolution', + 'LoginAdapter', + 'get_remote_app_name', + 'is_browser_likely_available', ] # We want stuff to show up as babase.Foo instead of babase._sub.Foo. diff --git a/src/assets/ba_data/python/bauiv1/__init__.py b/src/assets/ba_data/python/bauiv1/__init__.py index 3b649dd7..159540b1 100644 --- a/src/assets/ba_data/python/bauiv1/__init__.py +++ b/src/assets/ba_data/python/bauiv1/__init__.py @@ -17,8 +17,6 @@ from __future__ import annotations import logging from efro.util import set_canonical_module_names - - from babase import ( get_display_resolution, get_max_graphics_quality, @@ -75,20 +73,15 @@ from babase import ( get_ip_address_type, getclass, get_type_name, -) -from babase._apputils import get_remote_app_name, is_browser_likely_available -from babase._login import LoginAdapter - - -from babase._error import NotFoundError - -from babase._mgen.enums import ( Permission, UIScale, SpecialChar, + NotFoundError, + timestring, + LoginAdapter, + get_remote_app_name, + is_browser_likely_available, ) -from babase._text import timestring - from _bauiv1 import ( uibounds, set_party_window_open, @@ -121,7 +114,6 @@ from _bauiv1 import ( from bauiv1._uitypes import Window, uicleanupcheck from bauiv1._subsystem import UIV1Subsystem - __all__ = [ 'lock_all_input', 'unlock_all_input', diff --git a/src/assets/ba_data/python/bauiv1/_subsystem.py b/src/assets/ba_data/python/bauiv1/_subsystem.py index dd90b437..8349d83a 100644 --- a/src/assets/ba_data/python/bauiv1/_subsystem.py +++ b/src/assets/ba_data/python/bauiv1/_subsystem.py @@ -4,6 +4,7 @@ from __future__ import annotations +import logging from typing import TYPE_CHECKING import babase @@ -121,9 +122,7 @@ class UIV1Subsystem(babase.AppSubsystem): frameinfo = getframeinfo(frame) frameline = f'{frameinfo.filename} {frameinfo.lineno}' except Exception: - from babase._error import print_exception - - print_exception('Error calcing line for set_main_menu_window') + logging.exception('Error calcing line for set_main_menu_window') # With our legacy main-menu system, the caller is responsible for # clearing out the old main menu window when assigning the new. diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index b25b7022..c848a9bf 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -127,7 +127,8 @@ def check_cpplint(projroot: Path, full: bool) -> None: if dirtyfiles: print( f'{Clr.BLU}CppLint checking' - f' {len(dirtyfiles)} file(s)...{Clr.RST}' + f' {len(dirtyfiles)} file(s)...{Clr.RST}', + flush=True, ) disabled_filters: list[str] = [