1

fix discord-less mode

This commit is contained in:
Evan Pratten 2023-12-31 11:42:06 -05:00
parent 9dfadb8eaa
commit 17812efff4

View File

@ -101,16 +101,18 @@ def main() -> int:
# Configure discord presence # Configure discord presence
discord_presence = pypresence.Presence(DISCORD_CLIENT_ID) discord_presence = pypresence.Presence(DISCORD_CLIENT_ID)
discord_presence.connect() if not args.no_presence:
discord_presence.connect()
launch_start = int(time.time()) launch_start = int(time.time())
# Ensure we have wineasio # Ensure we have wineasio
if not (WINEASIO_SRC_PATH / "build64").exists(): if not (WINEASIO_SRC_PATH / "build64").exists():
discord_presence.update( if not args.no_presence:
start=launch_start, discord_presence.update(
large_image=DISCORD_ICON, start=launch_start,
details="Compiling WineASIO...", large_image=DISCORD_ICON,
) details="Compiling WineASIO...",
)
build_wineasio() build_wineasio()
# Figure out the wineprefix # Figure out the wineprefix
@ -120,11 +122,12 @@ def main() -> int:
# Ensure that the bottle has the wineasio dll # Ensure that the bottle has the wineasio dll
if not (wineprefix / ".wineasio-installed").is_file(): if not (wineprefix / ".wineasio-installed").is_file():
logger.info("Registering wineasio") logger.info("Registering wineasio")
discord_presence.update( if not args.no_presence:
start=launch_start, discord_presence.update(
large_image=DISCORD_ICON, start=launch_start,
details="Registering WineASIO with Ableton...", large_image=DISCORD_ICON,
) details="Registering WineASIO with Ableton...",
)
subprocess.check_call( subprocess.check_call(
[WINEASIO_SRC_PATH / "wineasio-register"], [WINEASIO_SRC_PATH / "wineasio-register"],
env={"WINEPREFIX": str(wineprefix)}, env={"WINEPREFIX": str(wineprefix)},
@ -156,18 +159,15 @@ def main() -> int:
) )
# Update the presence message # Update the presence message
discord_presence.update( if not args.no_presence:
start=launch_start, discord_presence.update(
large_image=DISCORD_ICON, start=launch_start,
details="Working on a project", large_image=DISCORD_ICON,
buttons=[ details="Working on a project",
{"label": "Check out my music!", "url": "https://ewpratten.com/music"} buttons=[
], {"label": "Check out my music!", "url": "https://ewpratten.com/music"}
) ],
)
# Immediately cancel the presence if requested
if args.no_presence:
discord_presence.close()
# Launch Ableton via bottles # Launch Ableton via bottles
if not args.dry_run: if not args.dry_run:
@ -176,14 +176,16 @@ def main() -> int:
["bottles-cli", "run", "-b", args.bottle, "-p", args.program], ["bottles-cli", "run", "-b", args.bottle, "-p", args.program],
env=ableton_env, env=ableton_env,
) )
discord_presence.close() if not args.no_presence:
discord_presence.close()
return return_code return return_code
else: else:
logger.info("Dry run, not launching Ableton") logger.info("Dry run, not launching Ableton")
logger.info("Press enter to continue") logger.info("Press enter to continue")
input() input()
discord_presence.close() if not args.no_presence:
discord_presence.close()
return 0 return 0