[ci] auto-format

This commit is contained in:
brostosjoined 2023-07-16 20:58:09 +00:00 committed by github-actions[bot]
parent b2d010ce10
commit 538f266096

View file

@ -24,7 +24,7 @@ import threading
import shutil import shutil
import babase import babase
import _babase import _babase
import bascenev1 as bs import bascenev1 as bs
import bascenev1lib import bascenev1lib
import bauiv1 as bui import bauiv1 as bui
@ -216,23 +216,22 @@ if not ANDROID:
pass pass
get_module() get_module()
#Updating pypresence # Updating pypresence
try: try:
from pypresence import PipeClosed, DiscordError, DiscordNotFound from pypresence import PipeClosed, DiscordError, DiscordNotFound
except ImportError: except ImportError:
shutil.rmtree(Path(f"{getcwd()}/ba_data/python/pypresence")) shutil.rmtree(Path(f"{getcwd()}/ba_data/python/pypresence"))
get_module() get_module()
from pypresence.utils import get_event_loop from pypresence.utils import get_event_loop
import pypresence import pypresence
import socket import socket
DEBUG = True DEBUG = True
_last_server_addr = 'localhost' _last_server_addr = 'localhost'
_last_server_port = 43210 _last_server_port = 43210
def print_error(err: str, include_exception: bool = False) -> None: def print_error(err: str, include_exception: bool = False) -> None:
if DEBUG: if DEBUG:
if include_exception: if include_exception:
@ -263,8 +262,8 @@ if not ANDROID:
old_connect(*args, **kwargs) old_connect(*args, **kwargs)
c = kwargs.get("address") or args[0] c = kwargs.get("address") or args[0]
_last_server_port = kwargs.get("port") or args[1] _last_server_port = kwargs.get("port") or args[1]
bs.connect_to_party = new_connect bs.connect_to_party = new_connect
start_time = time.time() start_time = time.time()
@ -287,10 +286,10 @@ if not ANDROID:
self._last_secret_update_time: float = 0 self._last_secret_update_time: float = 0
self._last_connect_time: float = 0 self._last_connect_time: float = 0
self.should_close = False self.should_close = False
@staticmethod @staticmethod
def is_discord_running(): def is_discord_running():
for i in range(6463,6473): for i in range(6463, 6473):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(0.01) s.settimeout(0.01)
try: try:
@ -298,11 +297,11 @@ if not ANDROID:
s.close() s.close()
if (conn == 0): if (conn == 0):
s.close() s.close()
return(True) return (True)
except: except:
s.close() s.close()
return(False) return (False)
def _generate_join_secret(self): def _generate_join_secret(self):
# resp = requests.get('https://legacy.ballistica.net/bsAccessCheck').text # resp = requests.get('https://legacy.ballistica.net/bsAccessCheck').text
connection_info = bs.get_connection_to_host_info() connection_info = bs.get_connection_to_host_info()
@ -359,7 +358,7 @@ if not ANDROID:
self._subscribe("ACTIVITY_JOIN") self._subscribe("ACTIVITY_JOIN")
self._subscribe("ACTIVITY_JOIN_REQUEST") self._subscribe("ACTIVITY_JOIN_REQUEST")
# def _update_presence(self) -> None: # def _update_presence(self) -> None:
# self._last_update_time = time.time() # self._last_update_time = time.time()
# try: # try:
# self._do_update_presence() # self._do_update_presence()
@ -368,7 +367,6 @@ if not ANDROID:
# self._reconnect() # self._reconnect()
# except Exception: # except Exception:
# print_error("failed to update presence", include_exception= True) # print_error("failed to update presence", include_exception= True)
def _reconnect(self) -> None: def _reconnect(self) -> None:
self.rpc.connect() self.rpc.connect()
@ -445,7 +443,7 @@ if not ANDROID:
def _connect_to_party(self, hostname, port) -> None: def _connect_to_party(self, hostname, port) -> None:
babase.pushcall( babase.pushcall(
babase.Call(bs.connect_to_party, hostname, port), from_other_thread=True babase.Call(bs.connect_to_party, hostname, port), from_other_thread=True
) )
def on_join_request(self, username, uid, discriminator, avatar) -> None: def on_join_request(self, username, uid, discriminator, avatar) -> None:
del uid # unused del uid # unused
@ -473,10 +471,7 @@ class Discordlogin(PopupWindow):
self.path = Path(f"{getcwd()}/token.txt") self.path = Path(f"{getcwd()}/token.txt")
bg_color = (0.5, 0.4, 0.6) bg_color = (0.5, 0.4, 0.6)
log_btn_colour = (0.10, 0.95, 0.10) if not self.path.exists() else (1.00, 0.15, 0.15) log_btn_colour = (0.10, 0.95, 0.10) if not self.path.exists() else (1.00, 0.15, 0.15)
log_txt = "LOG IN" if not self.path.exists() else "LOG OUT" log_txt = "LOG IN" if not self.path.exists() else "LOG OUT"
# creates our _root_widget # creates our _root_widget
PopupWindow.__init__(self, PopupWindow.__init__(self,
@ -485,7 +480,6 @@ class Discordlogin(PopupWindow):
scale=(2.1 if _uiscale is babase.UIScale.SMALL else 1.5 scale=(2.1 if _uiscale is babase.UIScale.SMALL else 1.5
if _uiscale is babase.UIScale.MEDIUM else 1.0), if _uiscale is babase.UIScale.MEDIUM else 1.0),
bg_color=bg_color) bg_color=bg_color)
self._cancel_button = bui.buttonwidget( self._cancel_button = bui.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
@ -498,44 +492,38 @@ class Discordlogin(PopupWindow):
autoselect=True, autoselect=True,
icon=bui.gettexture('crossOut'), icon=bui.gettexture('crossOut'),
iconscale=1.2) iconscale=1.2)
bui.imagewidget(parent=self.root_widget,
position=(180, self._height - 55),
size=(32 * s, 32 * s),
texture=bui.gettexture("discordLogo"),
color=(10 - 0.32, 10 - 0.39, 10 - 0.96))
bui.imagewidget(parent=self.root_widget,
position=(180, self._height - 55),
size=(32 * s, 32 * s),
texture=bui.gettexture("discordLogo"),
color=(10 - 0.32, 10 - 0.39, 10 - 0.96))
self.email_widget = bui.textwidget(parent=self.root_widget, self.email_widget = bui.textwidget(parent=self.root_widget,
text="Email/Phone Number", text="Email/Phone Number",
size=(400, 70), size=(400, 70),
position=(50, 180), position=(50, 180),
h_align='left', h_align='left',
v_align='center', v_align='center',
editable=True, editable=True,
scale=0.8, scale=0.8,
autoselect=True, autoselect=True,
maxwidth=220) maxwidth=220)
self.password_widget = bui.textwidget(parent=self.root_widget, self.password_widget = bui.textwidget(parent=self.root_widget,
text="Password", text="Password",
size=(400, 70), size=(400, 70),
position=(50, 120), position=(50, 120),
h_align='left', h_align='left',
v_align='center', v_align='center',
editable=True, editable=True,
scale=0.8, scale=0.8,
autoselect=True, autoselect=True,
maxwidth=220) maxwidth=220)
bui.containerwidget(edit=self.root_widget, bui.containerwidget(edit=self.root_widget,
cancel_button=self._cancel_button) cancel_button=self._cancel_button)
bui.textwidget( bui.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(265, self._height - 37), position=(265, self._height - 37),
@ -546,7 +534,7 @@ class Discordlogin(PopupWindow):
text="Discord", text="Discord",
maxwidth=200, maxwidth=200,
color=(0.80, 0.80, 0.80)) color=(0.80, 0.80, 0.80))
bui.textwidget( bui.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(265, self._height - 78), position=(265, self._height - 78),
@ -557,8 +545,7 @@ class Discordlogin(PopupWindow):
text="💀Use at your own risk💀\ndiscord account might get terminated⚠", text="💀Use at your own risk💀\ndiscord account might get terminated⚠",
maxwidth=200, maxwidth=200,
color=(1.00, 0.15, 0.15)) color=(1.00, 0.15, 0.15))
self._login_button = bui.buttonwidget( self._login_button = bui.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
position=(120, 65), position=(120, 65),
@ -623,8 +610,10 @@ class Discordlogin(PopupWindow):
self.on_bascenev1libup_cancel() self.on_bascenev1libup_cancel()
ws.close() ws.close()
run_once = False run_once = False
def get_once_asset(): def get_once_asset():
global run_once global run_once
if run_once: if run_once:
@ -652,6 +641,7 @@ def get_once_asset():
pass pass
run_once = True run_once = True
def get_class(): def get_class():
if ANDROID: if ANDROID:
return PresenceUpdate() return PresenceUpdate()
@ -672,7 +662,7 @@ class DiscordRP(babase.Plugin):
def on_app_running(self) -> None: def on_app_running(self) -> None:
if not ANDROID: if not ANDROID:
self.rpc_thread.start() self.rpc_thread.start()
self.update_timer = bs.AppTimer( self.update_timer = bs.AppTimer(
1, bs.WeakCall(self.update_status), repeat=True 1, bs.WeakCall(self.update_status), repeat=True
) )
@ -703,7 +693,7 @@ class DiscordRP(babase.Plugin):
act = bs.get_foreground_host_activity() act = bs.get_foreground_host_activity()
if isinstance(act, bs.GameActivity): if isinstance(act, bs.GameActivity):
return act.name return act.name
this = "Lobby" this = "Lobby"
name: str | None = ( name: str | None = (
act.__class__.__name__.replace("Activity", "") act.__class__.__name__.replace("Activity", "")
@ -784,7 +774,7 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.state = servername[slice(19)] self.rpc_thread.state = servername[slice(19)]
if connection_info == {}: if connection_info == {}:
self.rpc_thread.details = "Local" #! replace with something like ballistica github cause self.rpc_thread.details = "Local" # ! replace with something like ballistica github cause
self.rpc_thread.state = self._get_current_activity_name() self.rpc_thread.state = self._get_current_activity_name()
self.rpc_thread.party_size = max(1, len(roster)) self.rpc_thread.party_size = max(1, len(roster))
self.rpc_thread.party_max = max(1, bs.get_public_party_max_size()) self.rpc_thread.party_max = max(1, bs.get_public_party_max_size())
@ -797,7 +787,7 @@ class DiscordRP(babase.Plugin):
bs.get_foreground_host_session() bs.get_foreground_host_session()
.__class__.__name__.replace("MainMenuSession", "") .__class__.__name__.replace("MainMenuSession", "")
.replace("EndSession", "") .replace("EndSession", "")
.replace("FreeForAllSession", ": FFA") #! for session use small image key .replace("FreeForAllSession", ": FFA") # ! for session use small image key
.replace("DualTeamSession", ": Teams") .replace("DualTeamSession", ": Teams")
.replace("CoopSession", ": Coop") .replace("CoopSession", ": Coop")
) )
@ -870,4 +860,3 @@ class DiscordRP(babase.Plugin):
) )
if ANDROID and Path(f"{getcwd()}/token.txt").exists(): if ANDROID and Path(f"{getcwd()}/token.txt").exists():
self.rpc_thread.presence() self.rpc_thread.presence()